Seam SVN: r7650 - maven-plugins/trunk/seam-jdocbook-style/src/main/css/css.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-20 09:40:48 -0400 (Thu, 20 Mar 2008)
New Revision: 7650
Modified:
maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
Log:
various fixes
Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-20 09:48:00 UTC (rev 7649)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-20 13:40:48 UTC (rev 7650)
@@ -179,4 +179,11 @@
.releaseinfo {
color: #576C74;
font-size: 150%;
+}
+
+PRE.JSP {
+ LINE-HEIGHT: 8px
+}
+PRE.XHTML {
+ LINE-HEIGHT: 8px
}
\ No newline at end of file
18 years, 1 month
Seam SVN: r7649 - branches/Seam_1_2_1_AP/lib.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-20 05:48:00 -0400 (Thu, 20 Mar 2008)
New Revision: 7649
Removed:
branches/Seam_1_2_1_AP/lib/richfaces-3.0.1-SNAPSHOT.jar
Log:
JBPAPP-636 - libraries ajax4jsf-1.1.1.jar and richfaces-3.0.1.jar were upgraded to the stable release versions from SNAPSHOT versions
Deleted: branches/Seam_1_2_1_AP/lib/richfaces-3.0.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
18 years, 1 month
Seam SVN: r7648 - branches/Seam_1_2_1_AP/lib.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-20 05:47:45 -0400 (Thu, 20 Mar 2008)
New Revision: 7648
Removed:
branches/Seam_1_2_1_AP/lib/ajax4jsf-1.1.1-SNAPSHOT.jar
Log:
JBPAPP-636 - libraries ajax4jsf-1.1.1.jar and richfaces-3.0.1.jar were upgraded to the stable release versions from SNAPSHOT versions
Deleted: branches/Seam_1_2_1_AP/lib/ajax4jsf-1.1.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
18 years, 1 month
Seam SVN: r7647 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-03-19 19:43:10 -0400 (Wed, 19 Mar 2008)
New Revision: 7647
Removed:
trunk/src/main/org/jboss/seam/identity-management-2.1.xsd
Log:
not required
Deleted: trunk/src/main/org/jboss/seam/identity-management-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/identity-management-2.1.xsd 2008-03-19 23:42:45 UTC (rev 7646)
+++ trunk/src/main/org/jboss/seam/identity-management-2.1.xsd 2008-03-19 23:43:10 UTC (rev 7647)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- targetNamespace="http://jboss.com/products/seam/security/management" xmlns:identity-management="http://jboss.com/products/seam/security/management"
- xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified">
- <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.1.xsd"/>
-
- <xs:element name="jpa-identity-store">
- <xs:complexType mixed="true">
- <xs:attributeGroup ref="components:attlist.component"/>
- <xs:attributeGroup ref="security:attlist.jpa-identity-store"/>
- </xs:complexType>
- </xs:element>
-
- <xs:attributeGroup name="attlist.jpa-identity-store">
- <xs:attribute name="account-class" />
- </xs:attributeGroup>
-
-</xs:schema>
18 years, 1 month
Seam SVN: r7646 - in trunk/src/main/org/jboss/seam: security/management and 1 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-03-19 19:42:45 -0400 (Wed, 19 Mar 2008)
New Revision: 7646
Added:
trunk/src/main/org/jboss/seam/security/permission/package-info.java
Modified:
trunk/src/main/org/jboss/seam/security-2.1.xsd
trunk/src/main/org/jboss/seam/security/management/package-info.java
trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java
trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java
Log:
jpa permission store, consolidated identity-management namespace with security namespace
Modified: trunk/src/main/org/jboss/seam/security/management/package-info.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/package-info.java 2008-03-19 16:27:23 UTC (rev 7645)
+++ trunk/src/main/org/jboss/seam/security/management/package-info.java 2008-03-19 23:42:45 UTC (rev 7646)
@@ -3,7 +3,7 @@
*
* @see org.jboss.seam.security.management.IdentityManager
*/
-@Namespace(value="http://jboss.com/products/seam/security/management", prefix="org.jboss.seam.security.management")
+@Namespace(value="http://jboss.com/products/seam/security", prefix="org.jboss.seam.security")
@AutoCreate
package org.jboss.seam.security.management;
Modified: trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java 2008-03-19 16:27:23 UTC (rev 7645)
+++ trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java 2008-03-19 23:42:45 UTC (rev 7646)
@@ -6,18 +6,22 @@
import java.io.Serializable;
import java.util.List;
+import org.jboss.seam.Component;
import org.jboss.seam.Seam;
+import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
import org.jboss.seam.security.Identity;
import org.jboss.seam.security.permission.AccountPermission.AccountType;
/**
- * Resolves permissions dynamically assigned in a persistent store, such as a
- * database, for example.
+ * Resolves dynamically-assigned permissions kept in a persistent store, such as a
+ * database.
*
* @author Shane Bryzak
*/
@@ -28,8 +32,32 @@
@Startup
public class DynamicPermissionResolver implements PermissionResolver, Serializable
{
+ private static final String DEFAULT_PERMISSION_STORE_NAME = "permissionStore";
+
private PermissionStore permissionStore;
+ private static final LogProvider log = Logging.getLogProvider(DynamicPermissionResolver.class);
+
+ @Create
+ public void create()
+ {
+ initPermissionStore();
+ }
+
+ protected void initPermissionStore()
+ {
+ if (permissionStore == null)
+ {
+ permissionStore = (PermissionStore) Component.getInstance(DEFAULT_PERMISSION_STORE_NAME, true);
+ }
+
+ if (permissionStore == null)
+ {
+ log.warn("no permission store available - please install a PermissionStore with the name '" +
+ DEFAULT_PERMISSION_STORE_NAME + "' if dynamic permissions are required.");
+ }
+ }
+
public PermissionStore getPermissionStore()
{
return permissionStore;
Modified: trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java 2008-03-19 16:27:23 UTC (rev 7645)
+++ trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java 2008-03-19 23:42:45 UTC (rev 7646)
@@ -4,6 +4,9 @@
import java.util.List;
+import javax.persistence.EntityManager;
+
+import org.jboss.seam.Component;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.security.permission.AccountPermission.AccountType;
@@ -17,26 +20,82 @@
@BypassInterceptors
public class JPAPermissionStore implements PermissionStore
{
+ private String entityManagerName = "entityManager";
+
+ private Class<? extends AccountPermission> permissionClass;
+
public boolean grantPermission(String target, String action, String account,
AccountType accountType)
{
+ try
+ {
+ if (permissionClass == null)
+ {
+ throw new RuntimeException("Could not grant permission, permissionClass not set");
+ }
+
+ AccountPermission permission = permissionClass.newInstance();
+ permission.setTarget(target);
+ permission.setAction(action);
+ permission.setAccount(account);
+ permission.setAccountType(accountType);
+
+ getEntityManager().persist(permission);
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException("Could not grant permission", ex);
+ }
+ }
+
+ public boolean revokePermission(String target, String action,
+ String account, AccountType accountType)
+ {
return false;
- }
+ }
public List<AccountPermission> listPermissions(String target, String action)
{
- return null;
+ return getEntityManager().createQuery(
+ "from " + permissionClass.getName() +
+ " where target = :target and action = :action")
+ .setParameter("target", target)
+ .setParameter("action", action)
+ .getResultList();
}
public List<AccountPermission> listPermissions(String target)
{
- return null;
+ return getEntityManager().createQuery(
+ "from " + permissionClass.getName() + " where target = :target")
+ .setParameter("target", target)
+ .getResultList();
}
- public boolean revokePermission(String target, String action,
- String account, AccountType accountType)
+ private EntityManager getEntityManager()
{
- return false;
+ return (EntityManager) Component.getInstance(entityManagerName);
}
-
+
+ public String getEntityManagerName()
+ {
+ return entityManagerName;
+ }
+
+ public void setEntityManagerName(String name)
+ {
+ this.entityManagerName = name;
+ }
+
+ public Class getPermissionClass()
+ {
+ return permissionClass;
+ }
+
+ public void setPermissionClass(Class permissionClass)
+ {
+ this.permissionClass = permissionClass;
+ }
}
Added: trunk/src/main/org/jboss/seam/security/permission/package-info.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/package-info.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/package-info.java 2008-03-19 23:42:45 UTC (rev 7646)
@@ -0,0 +1,11 @@
+/**
+ * Seam Security Permissions
+ *
+ * @see org.jboss.seam.security.permission.PermissionManager
+ */
+@Namespace(value="http://jboss.com/products/seam/security", prefix="org.jboss.seam.security")
+@AutoCreate
+package org.jboss.seam.security.permission;
+
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.Namespace;
Modified: trunk/src/main/org/jboss/seam/security-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/security-2.1.xsd 2008-03-19 16:27:23 UTC (rev 7645)
+++ trunk/src/main/org/jboss/seam/security-2.1.xsd 2008-03-19 23:42:45 UTC (rev 7646)
@@ -28,6 +28,17 @@
<xs:attributeGroup name="attlist.faces-security-events">
<xs:attribute name="cookie-max-age"/>
- </xs:attributeGroup>
+ </xs:attributeGroup>
+ <xs:element name="jpa-identity-store">
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component"/>
+ <xs:attributeGroup ref="security:attlist.jpa-identity-store"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:attributeGroup name="attlist.jpa-identity-store">
+ <xs:attribute name="account-class" />
+ </xs:attributeGroup>
+
</xs:schema>
18 years, 1 month
Seam SVN: r7645 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-19 12:27:23 -0400 (Wed, 19 Mar 2008)
New Revision: 7645
Modified:
branches/Seam_2_0/build/ci.build.xml
Log:
Deploy with correct extension
Modified: branches/Seam_2_0/build/ci.build.xml
===================================================================
--- branches/Seam_2_0/build/ci.build.xml 2008-03-19 16:23:17 UTC (rev 7644)
+++ branches/Seam_2_0/build/ci.build.xml 2008-03-19 16:27:23 UTC (rev 7645)
@@ -2,8 +2,8 @@
<!-- Continuous integration related targets -->
<project name="Seam2 Continuous Integration Support" basedir="." xmlns:artifact="urn:maven-artifact-ant">
- <property name="qualifier" value="-SNAPSHOT"/>
-
+ <property name="qualifier" value="-SNAPSHOT" />
+
<property file="default.build.properties" />
<property file="build.properties" />
@@ -12,47 +12,47 @@
<property name="doc.ref.dir" value="${seam.dir}/doc/Seam_Reference_Guide" />
<import file="common.build.xml" />
-
+
<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
- <target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
+ <target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
<deploySnapshotPom pom="${root.pom}" />
<deploySnapshotPom pom="${parent.pom}" />
<deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" />
- <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar"/>
- <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar"/>
- <deploySnapshot pom="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar"/>
- <deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar"/>
- <deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar"/>
- <deploySnapshot pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/>
- <deploySnapshot pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/>
- <deploySnapshot pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/>
+ <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar" />
+ <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar" />
+ <deploySnapshot pom="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar" />
+ <deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar" />
+ <deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar" />
+ <deploySnapshot pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar" />
+ <deploySnapshot pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar" />
+ <deploySnapshot pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar" />
</target>
<target name="tests">
<build target="cleanall" />
- <build target="coverageall" testngjvmargs="-Dfoo"/>
+ <build target="coverageall" testngjvmargs="-Dfoo" />
<build target="copytestoutput" />
<build target="testreport" />
</target>
-
- <target name="tests-java16">
- <build target="cleanall" />
- <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions">
- <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1">
- <exclusion groupId="javax.xml.stream" artifactId="stax-api" />
- <exclusion groupId="javax.activation" artifactId="activation" />
- </dependency>
- </artifact:dependencies>
- <copy todir="${endorsed.dir}">
- <fileset refid="endorsed.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten" />
- </copy>
- <build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
- <build target="copytestoutput" />
- <build target="testreport" />
- </target>
+ <target name="tests-java16">
+ <build target="cleanall" />
+ <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions">
+ <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1">
+ <exclusion groupId="javax.xml.stream" artifactId="stax-api" />
+ <exclusion groupId="javax.activation" artifactId="activation" />
+ </dependency>
+ </artifact:dependencies>
+ <copy todir="${endorsed.dir}">
+ <fileset refid="endorsed.fileset" />
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten" />
+ </copy>
+ <build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true" />
+ <build target="copytestoutput" />
+ <build target="testreport" />
+ </target>
+
<target name="snapshot">
<build target="cleanall" />
<build target="dist" />
@@ -62,62 +62,66 @@
</properties>
</build>
<ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <property name="qualifier" value="-SNAPSHOT"/>
+ <property name="qualifier" value="-SNAPSHOT" />
</ant>
<ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <property name="qualifier" value="-SNAPSHOT"/>
+ <property name="qualifier" value="-SNAPSHOT" />
</ant>
<ant target="deployDocumentation" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <property name="qualifier" value="-SNAPSHOT"/>
+ <property name="qualifier" value="-SNAPSHOT" />
</ant>
<ant target="tests" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <property name="qualifier" value="-SNAPSHOT"/>
+ <property name="qualifier" value="-SNAPSHOT" />
</ant>
</target>
-
+
<target name="deployExamplesSnapshot" depends="initdav">
- <deployExample name="booking" repositoryId="snapshots.jboss.org"/>
- <deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org"/>
- <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org"/>
+ <deployExample name="booking" repositoryId="snapshots.jboss.org" />
+ <deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" />
+ <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org" />
</target>
-
+
<target name="deployDocumentation" depends="initdav, initpoms">
- <deploy pom="${docs.pom}" jar="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" unique="false" repositoryId="snapshots.jboss.org"/>
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}">
+ <pom file="${docs.pom}" />
+ <remoteRepository refId="snapshots.jboss.org" />
+ <attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
+ </artifact:deploy>
</target>
<macrodef name="build">
<attribute name="target" />
- <attribute name="testngjvmargs" default="" />
+ <attribute name="testngjvmargs" default="" />
<element name="properties" optional="true" />
<sequential>
<ant antfile="${seam.dir}/build.xml" target="@{target}" inheritall="false" inheritrefs="false" dir="../">
<property name="dist.location" value="${dist.location}" />
<property name="qualifier" value="-SNAPSHOT" />
<property name="quietclean" value="true" />
- <property name="testng.jvmargs" value="@{testngjvmargs}" />
+ <property name="testng.jvmargs" value="@{testngjvmargs}" />
<properties />
</ant>
</sequential>
</macrodef>
- <macrodef name="deploySnapshotPom">
- <attribute name="pom" />
- <sequential>
- <artifact:deploy uniqueVersion="true">
- <pom file="@{pom}" />
- <remoteRepository refid="snapshots.jboss.org" />
- </artifact:deploy>
- </sequential>
- </macrodef>
+ <macrodef name="deploySnapshotPom">
+ <attribute name="pom" />
+ <sequential>
+ <artifact:deploy uniqueVersion="true">
+ <pom file="@{pom}" />
+ <remoteRepository refid="snapshots.jboss.org" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
<macrodef name="deploySnapshot">
<attribute name="pom" />
<attribute name="jar" />
- <attribute name="srcjar" />
+ <attribute name="srcjar" />
<sequential>
<artifact:deploy file="@{jar}" uniqueVersion="true">
<pom file="@{pom}" />
- <attach file="@{srcjar}" classifier="sources" />
+ <attach file="@{srcjar}" classifier="sources" />
<remoteRepository refid="snapshots.jboss.org" />
</artifact:deploy>
</sequential>
18 years, 1 month
Seam SVN: r7644 - branches/Seam_2_0/doc/Seam_Reference_Guide/common.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-19 12:23:17 -0400 (Wed, 19 Mar 2008)
New Revision: 7644
Removed:
branches/Seam_2_0/doc/Seam_Reference_Guide/common/Version_Info.xml
Log:
oops
Deleted: branches/Seam_2_0/doc/Seam_Reference_Guide/common/Version_Info.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/common/Version_Info.xml 2008-03-19 16:16:49 UTC (rev 7643)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/common/Version_Info.xml 2008-03-19 16:23:17 UTC (rev 7644)
@@ -1,3 +0,0 @@
-
- <releaseinfo>2.0.2-SNAPSHOT</releaseinfo>
-
\ No newline at end of file
18 years, 1 month
Seam SVN: r7643 - maven-plugins/trunk/seam-jdocbook-style.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-19 12:16:49 -0400 (Wed, 19 Mar 2008)
New Revision: 7643
Modified:
maven-plugins/trunk/seam-jdocbook-style/
Log:
ignores
Property changes on: maven-plugins/trunk/seam-jdocbook-style
___________________________________________________________________
Name: svn:ignore
- .project
+ .project
target
18 years, 1 month
Seam SVN: r7642 - in maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss: seam and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-19 12:16:24 -0400 (Wed, 19 Mar 2008)
New Revision: 7642
Modified:
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl
Log:
Make PDF use sfwk theme, full version info, clean up title page
Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl 2008-03-19 16:15:47 UTC (rev 7641)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl 2008-03-19 16:16:24 UTC (rev 7642)
@@ -1030,6 +1030,8 @@
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/issuenum"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/issuenum"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="issuenum"/>
+
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
<xsl:choose>
<xsl:when test="bookinfo/subtitle">
@@ -1055,22 +1057,6 @@
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/invpartnumber"/>
<xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/invpartnumber"/>
</fo:block>
- <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'isbn'"/>
- </xsl:call-template>
- <xsl:text>: </xsl:text>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/isbn"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/isbn"/>
- </fo:block>
- <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'pubdate'"/>
- </xsl:call-template>
- <xsl:text>: </xsl:text>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
- </fo:block>
</xsl:template>
<xsl:template name="book.titlepage.verso">
@@ -1086,17 +1072,6 @@
</xsl:template>
<xsl:template name="book.titlepage3.recto">
- <xsl:choose>
- <xsl:when test="bookinfo/title">
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
- </xsl:when>
- <xsl:when test="info/title">
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/>
- </xsl:when>
- <xsl:when test="title">
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/>
- </xsl:when>
- </xsl:choose>
<xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
<xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/>
Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-03-19 16:15:47 UTC (rev 7641)
+++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-03-19 16:16:24 UTC (rev 7642)
@@ -1,101 +1,163 @@
<?xml version='1.0'?>
-
+
<!--
- Copyright 2007 Red Hat, Inc.
- License: GPL
- Author: Pete Muir
+ Copyright 2007 Red Hat, Inc.
+ License: LGPL
+ Author: Pete Muir
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- exclude-result-prefixes="#default">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ exclude-result-prefixes="#default">
<!-- Needs MPJDOCBOOK-8 -->
<!-- <xsl:import href="classpath:/xslt/org/jboss/main-pdf.xsl"/>-->
<xsl:import href="../main-pdf.xsl" />
-
- <xsl:param name="use.extensions">1</xsl:param>
- <!-- Place callout marks at this column in annotated areas -->
-
- <!--###################################################
- Callouts
- ################################################### -->
+ <xsl:param name="use.extensions">1</xsl:param>
- <!-- We want to use callouts... -->
- <xsl:param name="callout.extensions">1</xsl:param>
+ <!-- Place callout marks at this column in annotated areas -->
- <!-- Place callout bullets at this column in programmlisting.-->
- <xsl:param name="callout.defaultcolumn">80</xsl:param>
+ <!--###################################################
+ Callouts
+ ################################################### -->
- <!--
- No, don't use crappy graphics for the callout bullets. This setting
- enables some weird Unicode rendering for some fancy bullet points
- in callouts. By default, this can only count to 10 and produces
- strange results if you ever have more than 10 callouts for one
- programlisting. We will fix that next.
- -->
- <xsl:param name="callout.graphics">0</xsl:param>
+ <!-- We want to use callouts... -->
+ <xsl:param name="callout.extensions">1</xsl:param>
- <!--
- Again, fun with DocBook XSL: The callout bullets are rendered in
- two places: In the programlisting itself and in the list below
- the listing, with the actual callout text. The rendering in the
- programlisting is some XSL transformer extension (e.g. a Saxon
- extension), so we can't change that without messing with the
- extensions. We only can turn it off by setting this limit to
- zero, then, a simple bracket style like "(3)" and "(4)" will
- be used in the programlisting.
- -->
- <xsl:param name="callout.unicode.number.limit" select="'0'"></xsl:param>
+ <!-- Place callout bullets at this column in programmlisting.-->
+ <xsl:param name="callout.defaultcolumn">80</xsl:param>
- <!--
- The callout bullets in the actual callout list will be rendered
- with an XSL FO template. The default template is broken: limited to 10
- nice looking Unicode bullet points and then it doesn't print anything,
- the fallback doesn't work. We implement our own template, which is not
- as complicated, more ugly, but works. As always, function is more
- important than form.
- -->
- <xsl:template name="callout-bug" >
- <xsl:param name="conum" select='1'/>
- <fo:inline
- color="black"
- padding-top="0.1em"
- padding-bottom="0.1em"
- padding-start="0.2em"
- padding-end="0.2em"
- baseline-shift="0.1em"
- font-family="{$monospace.font.family}"
- font-weight="bold"
- font-size="75%">
- <xsl:text>(</xsl:text>
- <xsl:value-of select="$conum"/>
- <xsl:text>)</xsl:text>
- </fo:inline>
+ <!--
+ No, don't use crappy graphics for the callout bullets. This setting
+ enables some weird Unicode rendering for some fancy bullet points
+ in callouts. By default, this can only count to 10 and produces
+ strange results if you ever have more than 10 callouts for one
+ programlisting. We will fix that next.
+ -->
+ <xsl:param name="callout.graphics">0</xsl:param>
- </xsl:template>
-
- <!-- Correct placement of titles for figures and examples. -->
- <xsl:param name="formal.title.placement">
- figure after
- example before
- equation before
- table before
- procedure before
- </xsl:param>
-
- <!-- Prevent blank pages in output -->
- <xsl:template name="book.titlepage.before.verso">
- </xsl:template>
- <xsl:template name="book.titlepage.verso">
- </xsl:template>
- <xsl:template name="book.titlepage.separator">
- </xsl:template>
-
-
-
+ <!--
+ Again, fun with DocBook XSL: The callout bullets are rendered in
+ two places: In the programlisting itself and in the list below
+ the listing, with the actual callout text. The rendering in the
+ programlisting is some XSL transformer extension (e.g. a Saxon
+ extension), so we can't change that without messing with the
+ extensions. We only can turn it off by setting this limit to
+ zero, then, a simple bracket style like "(3)" and "(4)" will
+ be used in the programlisting.
+ -->
+ <xsl:param name="callout.unicode.number.limit" select="'0'"></xsl:param>
+ <!--
+ The callout bullets in the actual callout list will be rendered
+ with an XSL FO template. The default template is broken: limited to 10
+ nice looking Unicode bullet points and then it doesn't print anything,
+ the fallback doesn't work. We implement our own template, which is not
+ as complicated, more ugly, but works. As always, function is more
+ important than form.
+ -->
+ <xsl:template name="callout-bug">
+ <xsl:param name="conum" select='1' />
+ <fo:inline color="black" padding-top="0.1em" padding-bottom="0.1em"
+ padding-start="0.2em" padding-end="0.2em" baseline-shift="0.1em"
+ font-family="{$monospace.font.family}" font-weight="bold"
+ font-size="75%">
+ <xsl:text>(</xsl:text>
+ <xsl:value-of select="$conum" />
+ <xsl:text>)</xsl:text>
+ </fo:inline>
+
+ </xsl:template>
+
+ <!-- Correct placement of titles for figures and examples. -->
+ <xsl:param name="formal.title.placement">
+ figure after example before equation before table before procedure before
+ </xsl:param>
+
+ <!-- Prevent blank pages in output -->
+ <xsl:template name="book.titlepage.before.verso"></xsl:template>
+ <xsl:template name="book.titlepage.verso"></xsl:template>
+ <xsl:template name="book.titlepage.separator"></xsl:template>
+
+ <xsl:template name="book.titlepage.recto">
+ <xsl:choose>
+ <xsl:when test="bookinfo/title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="bookinfo/title" />
+ </xsl:when>
+ <xsl:when test="info/title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="info/title" />
+ </xsl:when>
+ <xsl:when test="title">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="title" />
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="bookinfo/issuenum" />
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="info/issuenum" />
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="issuenum" />
+
+
+
+ <xsl:choose>
+ <xsl:when test="bookinfo/subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="bookinfo/subtitle" />
+ </xsl:when>
+ <xsl:when test="info/subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="info/subtitle" />
+ </xsl:when>
+ <xsl:when test="subtitle">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="subtitle" />
+ </xsl:when>
+ </xsl:choose>
+
+ <fo:block xsl:use-attribute-sets="book.titlepage.recto.style"
+ font-size="14pt" space-before="15.552pt">
+ <xsl:apply-templates mode="book.titlepage.recto.auto.mode"
+ select="bookinfo/releaseinfo" />
+ </fo:block>
+
+ </xsl:template>
+
+ <xsl:template name="book.titlepage3.recto">
+
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="bookinfo/authorgroup" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="info/authorgroup" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="bookinfo/author" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="info/author" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="bookinfo/othercredit" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="info/othercredit" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="bookinfo/copyright" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="info/copyright" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="bookinfo/legalnotice" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="info/legalnotice" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="bookinfo/publisher" />
+ <xsl:apply-templates mode="book.titlepage.verso.auto.mode"
+ select="info/publisher" />
+ </xsl:template>
+
+ <xsl:param name="title.color">#576C74</xsl:param>
+
+
</xsl:stylesheet>
18 years, 1 month
Seam SVN: r7641 - maven-plugins/trunk/seam-jdocbook-style/src/main/css/css.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-19 12:15:47 -0400 (Wed, 19 Mar 2008)
New Revision: 7641
Modified:
maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
Log:
Use sfwk colours
Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css
===================================================================
--- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-19 15:04:32 UTC (rev 7640)
+++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-19 16:15:47 UTC (rev 7641)
@@ -20,15 +20,19 @@
}
a {
- text-decoration: none;
+ text-decoration: none;
}
h1 {
font-size: 150%;
}
+h1,h2,h3,h4,h5,h6 {
+ color: #576C74;
+}
+
.title {
- color: #4A5D75;
+ color: #576C74;
background-image: none;
font-size: 175%
}
@@ -169,10 +173,10 @@
}
.author h3 {
- margin: 0px;
+ margin: 0px;
}
.releaseinfo {
- color: #4A5D75;
+ color: #576C74;
font-size: 150%;
}
\ No newline at end of file
18 years, 1 month