Seam SVN: r8511 - in maven-plugins/tags: seam-docbook-xslt_1_1_0_BETA3 and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-28 08:44:02 -0400 (Mon, 28 Jul 2008)
New Revision: 8511
Added:
maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/
maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/pom.xml
Removed:
maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/pom.xml
Log:
[maven-release-plugin] copy for tag seam-docbook-xslt_1_1_0_BETA3
Copied: maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3 (from rev 8508, maven-plugins/trunk/seam-docbook-xslt)
Deleted: maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/pom.xml
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/pom.xml 2008-07-28 12:17:11 UTC (rev 8508)
+++ maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/pom.xml 2008-07-28 12:44:02 UTC (rev 8511)
@@ -1,91 +0,0 @@
-<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>org.jboss.seam</groupId>
- <artifactId>seam-docbook-xslt</artifactId>
- <packaging>jar</packaging>
- <version>1.1.0-SNAPSHOT</version>
-
- <name>SeamFramework.org DocBook XSLT</name>
- <description>
- The main project to transform DocBook XML into XHTML and other formats for
- SeamFramework.org Documentation.
- </description>
- <url>http://www.seamframework.org</url>
-
- <scm>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/maven-plugins/trunk</developerConnection>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/maven-plugins/trunk</connection>
- <url>http://fisheye.jboss.org/browse/Seam/maven-plugins/trunk</url>
- </scm>
-
- <contributors>
- <contributor>
- <name>Pete Muir</name>
- </contributor>
- <contributor>
- <name>Mark Newton</name>
- </contributor>
- </contributors>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0.Beta1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <distributionManagement>
- <repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers are available -->
- <id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
- </repository>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- </distributionManagement>
-
-</project>
Copied: maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/pom.xml (from rev 8510, maven-plugins/trunk/seam-docbook-xslt/pom.xml)
===================================================================
--- maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/pom.xml (rev 0)
+++ maven-plugins/tags/seam-docbook-xslt_1_1_0_BETA3/pom.xml 2008-07-28 12:44:02 UTC (rev 8511)
@@ -0,0 +1,91 @@
+<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>org.jboss.seam</groupId>
+ <artifactId>seam-docbook-xslt</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1.0.BETA3</version>
+
+ <name>SeamFramework.org DocBook XSLT</name>
+ <description>
+ The main project to transform DocBook XML into XHTML and other formats for
+ SeamFramework.org Documentation.
+ </description>
+ <url>http://www.seamframework.org</url>
+
+ <scm>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/maven-plugins/tags/seam-docbook-...</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/maven-plugins/tags/seam-docbo...</connection>
+ <url>http://fisheye.jboss.org/browse/Seam/maven-plugins/tags/seam-docbook-xslt...</url>
+ </scm>
+
+ <contributors>
+ <contributor>
+ <name>Pete Muir</name>
+ </contributor>
+ <contributor>
+ <name>Mark Newton</name>
+ </contributor>
+ </contributors>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
15 years, 9 months
Seam SVN: r8509 - maven-plugins/trunk/seam-docbook-xslt.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-28 08:36:34 -0400 (Mon, 28 Jul 2008)
New Revision: 8509
Modified:
maven-plugins/trunk/seam-docbook-xslt/pom.xml
Log:
upgrade to released jbossorg plugins
Modified: maven-plugins/trunk/seam-docbook-xslt/pom.xml
===================================================================
--- maven-plugins/trunk/seam-docbook-xslt/pom.xml 2008-07-28 12:17:11 UTC (rev 8508)
+++ maven-plugins/trunk/seam-docbook-xslt/pom.xml 2008-07-28 12:36:34 UTC (rev 8509)
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0.Beta1</version>
+ <version>1.1.0</version>
</dependency>
</dependencies>
</dependencyManagement>
15 years, 9 months
Seam SVN: r8508 - trunk/src/mail/org/jboss/seam/mail/ui and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-28 08:17:11 -0400 (Mon, 28 Jul 2008)
New Revision: 8508
Modified:
branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java
trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java
Log:
JBSEAM-3083, fix actual bug
Modified: branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java
===================================================================
--- branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:14:28 UTC (rev 8507)
+++ branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:17:11 UTC (rev 8508)
@@ -228,7 +228,7 @@
{
if (urlBase == null)
{
- return urlBase;
+ return getString("urlBase");
}
else
{
Modified: trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java
===================================================================
--- trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:14:28 UTC (rev 8507)
+++ trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:17:11 UTC (rev 8508)
@@ -253,7 +253,7 @@
{
if (urlBase == null)
{
- return urlBase;
+ return getString("urlBase");
}
else
{
15 years, 9 months
Seam SVN: r8507 - trunk/src/mail/org/jboss/seam/mail/ui and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-28 08:14:28 -0400 (Mon, 28 Jul 2008)
New Revision: 8507
Modified:
branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java
trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java
Log:
Revert r8358, r8359, JBSEAM-3083
Modified: branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java
===================================================================
--- branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:07:03 UTC (rev 8506)
+++ branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:14:28 UTC (rev 8507)
@@ -84,8 +84,8 @@
@Override
public void encodeBegin(FacesContext context) throws IOException
{
- String contextPathOverride = getUrlBase();
- MailFacesContextImpl.start(contextPathOverride == null ? context.getExternalContext().getRequestContextPath() : contextPathOverride);
+ MailFacesContextImpl.start(getUrlBase()
+ + context.getExternalContext().getRequestContextPath() == null ? "" : context.getExternalContext().getRequestContextPath());
mimeMessage = null;
try
{
@@ -228,7 +228,7 @@
{
if (urlBase == null)
{
- return getString("urlBase");
+ return urlBase;
}
else
{
Modified: trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java
===================================================================
--- trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:07:03 UTC (rev 8506)
+++ trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java 2008-07-28 12:14:28 UTC (rev 8507)
@@ -109,8 +109,8 @@
@Override
public void encodeBegin(FacesContext context) throws IOException
{
- String contextPathOverride = getUrlBase();
- MailFacesContextImpl.start(contextPathOverride == null ? context.getExternalContext().getRequestContextPath() : contextPathOverride);
+ MailFacesContextImpl.start(getUrlBase()
+ + context.getExternalContext().getRequestContextPath() == null ? "" : context.getExternalContext().getRequestContextPath());
mimeMessage = null;
try
{
@@ -253,7 +253,7 @@
{
if (urlBase == null)
{
- return getString("urlBase");
+ return urlBase;
}
else
{
15 years, 9 months
Seam SVN: r8506 - in trunk: build and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-28 08:07:03 -0400 (Mon, 28 Jul 2008)
New Revision: 8506
Removed:
trunk/build/jbas5.pom.xml
trunk/src/interop/jbas5/
Modified:
trunk/build.xml
trunk/build/build.xml
trunk/build/ci.build.xml
trunk/build/common.build.xml
Log:
Remove the jbas5 integration code, this is now going to be hosted in the as svn repo
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-07-28 08:00:02 UTC (rev 8505)
+++ trunk/build/build.xml 2008-07-28 12:07:03 UTC (rev 8506)
@@ -47,7 +47,6 @@
<deployWithSources pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/>
<deployWithSources pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/>
<deployWithSources pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/>
- <deployWithSources pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/interop/jboss-seam-jbas5-sources.jar"/>
<deployWithSources pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/interop/jboss-seam-jul-sources.jar"/>
<deployWithSources pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-resteasy-sources.jar"/>
<deployExample name="booking" repositoryId="offline.repository.jboss.org"/>
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-07-28 08:00:02 UTC (rev 8505)
+++ trunk/build/ci.build.xml 2008-07-28 12:07:03 UTC (rev 8506)
@@ -23,7 +23,6 @@
<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="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/>
<deploySnapshot pom="${wicket.pom}" jar="${lib.dir}/jboss-seam-wicket.jar" srcjar="${lib.dir}/src/jboss-seam-wicket-sources.jar"/>
<deploySnapshot pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" srcjar="${lib.dir}/src/jboss-seam-resteasy-sources.jar"/>
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-07-28 08:00:02 UTC (rev 8505)
+++ trunk/build/common.build.xml 2008-07-28 12:07:03 UTC (rev 8506)
@@ -100,7 +100,6 @@
<pomfile name="core.wls.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam-wls-compatible" />
<pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" />
<pomfile name="wicket.pom" value="${build.dir}/wicket.pom.xml" />
- <pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" />
<pomfile name="jul.pom" value="${build.dir}/jul.pom.xml" />
<pomfile name="resteasy.pom" value="${build.dir}/resteasy.pom.xml" />
<pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" />
@@ -213,7 +212,6 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
- <propertyref name="jbas5.pom" />
<propertyref name="wicket.pom" />
<propertyref name="testng.jvmargs"/>
<propertyref name="maven.settings.xml" />
@@ -249,8 +247,7 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
- <propertyref name="wicket.pom" />
- <propertyref name="jbas5.pom" />
+ <propertyref name="wicket.pom" />
<propertyref name="testng.jvmargs"/>
</propertyset>
</ant>
@@ -284,7 +281,6 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
- <propertyref name="jbas5.pom" />
<propertyref name="wicket.pom" />
<propertyref name="testng.jvmargs"/>
<propertyref name="maven.settings.xml" />
@@ -348,7 +344,6 @@
<outputDependencyReport module="ioc" />
<outputDependencyReport module="wicket" />
<outputDependencyReport module="resteasy" />
- <outputDependencyReport module="jbas5" />
<outputDependencyReport module="jul" />
<echo>Dependency Report written to ${seam.dir}/dependency-report.txt</echo>
</target>
Deleted: trunk/build/jbas5.pom.xml
===================================================================
--- trunk/build/jbas5.pom.xml 2008-07-28 08:00:02 UTC (rev 8505)
+++ trunk/build/jbas5.pom.xml 2008-07-28 12:07:03 UTC (rev 8506)
@@ -1,31 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jbas5</artifactId>
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>parent</artifactId>
- <version>@seam.version@</version>
- </parent>
- <description>Seam integration with JBoss AS 5</description>
-
- <!-- See parent pom for notes on how to declare dependencies -->
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-07-28 08:00:02 UTC (rev 8505)
+++ trunk/build.xml 2008-07-28 12:07:03 UTC (rev 8506)
@@ -19,7 +19,6 @@
<property name="classes.mail.dir" value="${classes.dir}/mailclasses" />
<property name="classes.debug.dir" value="${classes.dir}/debugclasses" />
<property name="classes.wicket.dir" value="${classes.dir}/wicketclasses" />
- <property name="classes.jbas5.dir" value="${classes.dir}/jbas5classes" />
<property name="classes.jul.dir" value="${classes.dir}/julclasses" />
<property name="classes.resteasy.dir" value="${classes.dir}/resteasyclasses" />
<property name="classes.remoting.dir" value="${classes.dir}/remotingclasses" />
@@ -38,7 +37,6 @@
<property name="src.mail.dir" value="src/mail" />
<property name="src.debug.dir" value="src/debug" />
<property name="src.wicket.dir" value="src/wicket" />
- <property name="src.jbas5.dir" value="src/interop/jbas5" />
<property name="src.jul.dir" value="src/interop/jul" />
<property name="src.resteasy.dir" value="src/resteasy" />
<property name="src.gen.dir" value="src/gen" />
@@ -72,7 +70,6 @@
<property name="dist.src.mail.dir" value="${dist.dir}/src/mail" />
<property name="dist.src.debug.dir" value="${dist.dir}/src/debug" />
<property name="dist.src.wicket.dir" value="${dist.dir}/src/wicket" />
- <property name="dist.src.jbas5.dir" value="${dist.dir}/src/interop/jbas5" />
<property name="dist.src.jul.dir" value="${dist.dir}/src/interop/jul" />
<property name="dist.src.resteasy.dir" value="${dist.dir}/src/resteasy" />
<property name="dist.src.gen.dir" value="${dist.dir}/src/gen" />
@@ -160,7 +157,7 @@
<delete dir="${lib.dir}" quiet="${quietclean}" />
</target>
- <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarjbas5,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
+ <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
<target name="select-compiler">
<available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
@@ -280,20 +277,6 @@
<archive classesdir="${classes.wicket.dir}" module="jboss-seam-wicket" pom="${wicket.pom}" srcdir="${src.wicket.dir}"/>
</target>
- <!-- ########################### JBAS5 TARGETS ###########################-->
-
- <target name="initjbas5" depends="init, jarcore">
- <init classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" modulename="jbas5" pom="${jbas5.pom}" />
- </target>
-
- <target name="compilejbas5" depends="initjbas5, select-compiler">
- <compile classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" classpath="compile.jbas5.path" />
- </target>
-
- <target name="jarjbas5" depends="compilejbas5" description="Build the distribution .jar file for the JBAS5 integration package">
- <archive classesdir="${classes.jbas5.dir}" module="jboss-seam-jbas5" pom="${jbas5.pom}" srcdir="${src.jbas5.dir}" outputdir="${lib.dir}/interop" />
- </target>
-
<!-- ########################### JUL TARGETS ###########################-->
<target name="initjul" depends="init, jarcore">
@@ -486,7 +469,6 @@
<copysource destdir="${dist.src.mail.dir}" srcdir="${src.mail.dir}" />
<copysource destdir="${dist.src.debug.dir}" srcdir="${src.debug.dir}" />
<copysource destdir="${dist.src.wicket.dir}" srcdir="${src.wicket.dir}" />
- <copysource destdir="${dist.src.jbas5.dir}" srcdir="${src.jbas5.dir}" />
<copysource destdir="${dist.src.jul.dir}" srcdir="${src.jul.dir}" />
<copysource destdir="${dist.src.resteasy.dir}" srcdir="${src.resteasy.dir}" />
<copysource destdir="${dist.src.gen.dir}" srcdir="${src.gen.dir}" />
@@ -995,7 +977,6 @@
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
<propertyref name="wicket.pom" />
- <propertyref name="jbas5.pom" />
<propertyref name="resteasy.pom" />
<propertyref name="testng.jvmargs"/>
</propertyset>
@@ -1007,7 +988,6 @@
<dependenciesWithSources id="core" scope="compile" pom="${core.pom}" />
<dependenciesWithSources id="debug" scope="compile" pom="${debug.pom}" />
<dependenciesWithSources id="wicket" scope="compile" pom="${wicket.pom}" />
- <dependenciesWithSources id="jbas5" scope="compile" pom="${jbas5.pom}" />
<dependenciesWithSources id="jul" scope="compile" pom="${jul.pom}" />
<dependenciesWithSources id="resteasy" scope="compile" pom="${resteasy.pom}" />
<dependenciesWithSources id="gen" scope="compile" pom="${gen.pom}" />
@@ -1027,7 +1007,6 @@
<dependencies id="core" scope="compile" pom="${core.pom}" />
<dependencies id="debug" scope="compile" pom="${debug.pom}" />
<dependencies id="wicket" scope="compile" pom="${wicket.pom}" />
- <dependencies id="jbas5" scope="compile" pom="${jbas5.pom}" />
<dependencies id="jul" scope="compile" pom="${jul.pom}" />
<dependencies id="resteasy" scope="compile" pom="${resteasy.pom}" />
<dependencies id="gen" scope="compile" pom="${gen.pom}" />
@@ -1045,7 +1024,6 @@
<path refid="compile.pdf.path" />
<path refid="compile.remoting.path" />
<path refid="compile.ui.path" />
- <path refid="compile.jbas5.path" />
<path refid="compile.jul.path" />
<path refid="compile.resteasy.path" />
<path refid="compile.wicket.path" />
15 years, 9 months
Seam SVN: r8505 - in trunk: src/resteasy/org/jboss/seam/resteasy and 1 other directory.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-07-28 04:00:02 -0400 (Mon, 28 Jul 2008)
New Revision: 8505
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Webservices.xml
trunk/src/resteasy/org/jboss/seam/resteasy/reasteasy-2.1.xsd
Log:
Completed docs of RESTEasy integration
Modified: trunk/doc/Seam_Reference_Guide/en-US/Webservices.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Webservices.xml 2008-07-28 04:58:58 UTC (rev 8504)
+++ trunk/doc/Seam_Reference_Guide/en-US/Webservices.xml 2008-07-28 08:00:02 UTC (rev 8505)
@@ -202,66 +202,240 @@
<title>RESTful HTTP webservices with RESTEasy</title>
<para>
- Seam integrates the RESTEasy implementation of the JAX-RS specification (JSR 311). You can decided how
- "deep" the integration into your Seam application is going to be: From simple integration of configuration
- and bootstrap, serving the requests with the built-in Seam resource servlet, writing resources as
- Seam components, and integration with conversations and the Seam CRUD Application Framework.
+ Seam integrates the RESTEasy implementation of the JAX-RS specification (JSR 311). You can decide how
+ "deep" the integration into your Seam application is going to be:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Seamless integration of RESTEasy bootstrap and configuration, automatic detection of resources
+ and providers.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Serving HTTP/REST requests with the SeamResourceServlet, no external servlet or configuration in
+ web.xml required.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Writing resources as Seam components, with full Seam lifecycle management and interception (bijection).
+ </para>
+ </listitem>
+ </itemizedlist>
+
<sect2>
- <title>RESTEasy bootstrap and request handling</title>
+ <title>RESTEasy configuration and request serving</title>
<para>
- First, get the RESTEasy libraries and the <literal>jaxrs-api.jar</literal>, deploy it with the
- other libraries of your application. Also deploy the integration library, <tt>jboss-seam-resteasy.jar</tt>
+ First, get the RESTEasy libraries and the <literal>jaxrs-api.jar</literal>, deploy them with the
+ other libraries of your application. Also deploy the integration library,
+ <literal>jboss-seam-resteasy.jar</literal>
</para>
<para>
On startup, all classes annotated <literal>@javax.ws.rs.Path</literal> will be discovered automatically
- and registered as HTTP resources. Seam will serve any HTTP request automatically under the URL basepath
- you mapped the <literal>SeamResourceServlet</literal> at in <tt>web.xml</tt>. Most of the time and if you
- follow this documentation, this would be <literal>/seam/resource</literal>.
- The hardcoded full path of your RESTful resources is therefore <literal>/seam/resource/rest</literal>.
+ and registered as HTTP resources. Seam automatically accepts and serves HTTP requests with its built-in
+ <literal>SeamResourceServlet</literal>. The URI of a resource is build as follows:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The URI starts with the pattern mapped in <literal>web.xml</literal> for the
+ <literal>SeamResourceServlet</literal>, e.g <literal>/seam/resource</literal> if you follow
+ the common examples. Change this setting to expose your RESTful resources under a different base.
+ Note that this is a global change and other Seam resources (e.g. <literal>s:graphicImage</literal>)
+ are then also served under that base path.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The RESTEasy integration for Seam then appends a configurable string to the base path, by default
+ this is <literal>/rest</literal>. Hence, the full base path of your resources would e.g. be
+ <literal>/seam/resource/rest</literal>. We recommend that you change this string in your application,
+ you could for example add a version number to prepare for a future REST API upgrade of your services
+ (old clients would keep the old URI base): <literal>/seam/resource/restv1</literal>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Finally, the actual resource is available under the defined <literal>@Path</literal>, e.g. a resource
+ mapped with <literal>@Path("/customer")</literal> would be available under
+ <literal>/seam/resource/rest/customer</literal>.
+ </para>
+ </listitem>
+ </itemizedlist>
+
<para>
- The following resource would serve a representation under
- <literal>http://your.hostname/seam/resource/reset/item/123</literal>:
+ As an example, the following resource definition would return a plaintext representation for any
+ GET requests using the URI <literal>http://your.hostname/seam/resource/rest/customer/123</literal>:
</para>
- <programlisting role="JAVA"><![CDATA[@Path("/item")
-public class ItemResource {
+ <programlisting role="JAVA"><![CDATA[@Path("/customer")
+public class MyCustomerResource {
@GET
- @Path("/item/{itemId}")
+ @Path("/{customerId}")
@ProduceMime("text/plain")
- public String getItem(@PathParam("itemId") int itemId) {
+ public String getCustomer(@PathParam("customerId") int id) {
return ...;
}
+
}]]></programlisting>
<para>
- TODO: This is not true, today you need @Path("/seam/resource/rest/item") on the resource class, we need
- to implement some base-path mapping there.
+ No additional configuration is required, you do not have to edit <literal>web.xml</literal> or any
+ other setting if these defauls are acceptable. However, you can configure RESTEasy in your Seam application.
+ First import the <literal>resteasy</literal> namespace into your XML configuration file header:
</para>
+ <programlisting role="XML"><![CDATA[<components
+ xmlns="http://jboss.com/products/seam/components"
+ xmlns:resteasy="http://jboss.com/products/seam/resteasy"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ http://jboss.com/products/seam/resteasy
+ http://jboss.com/products/seam/resteasy-2.1.xsd
+ http://jboss.com/products/seam/components
+ http://jboss.com/products/seam/components-2.1.xsd">]]></programlisting>
+
<para>
- You can configure the <literal>/seam/resource</literal> part by specifying a new mapping in web.xml
- for the <tt>SeamResourceServlet</tt>. Note that this also changes the URI path for all other resources
- you want to serve with this servlet! You can not change the <literal>/rest</literal> segement of the path,
- unless you subclass and override the <literal>ResteasyResourceAdapter.getResourcePath()</literal> method.
+ You can then change the <literal>/rest</literal> prefix as mentioned earlier:
</para>
+ <programlisting role="XML"><![CDATA[<resteasy:application-config resource-path-prefix="/restv1"/>]]></programlisting>
+
<para>
- TODO: TBC...
+ The full base path to your resources is now <literal>/seam/resource/restv1/{resource}</literal> - note
+ that your <literal>@Path</literal> definitions and mappings do NOT change. This is an application-wide
+ switch usually used for versioning of the HTTP API.
</para>
+ <para>
+ You can disable stripping of the base path if you'd like to map the full path in your resources:
+ </para>
+
+ <programlisting role="XML"><![CDATA[<resteasy:application-config strip-seam-resource-path="false"/>]]></programlisting>
+
+ <para>
+ The path of a resource is now mapped with e.g.
+ <literal>@Path("/seam/resource/rest/customer")</literal>. We do not recommend disabling this feature,
+ as your resource class mappings are then bound to a particular deployment scenario.
+ </para>
+
+ <para>
+ Seam will scan your classpath for any deployed <literal>@javax.ws.rs.Path</literal> resources and any
+ <literal>@javax.ws.rs.ext.Provider</literal> classes. You can disable scanning and configure these
+ classes manually:
+ </para>
+
+ <programlisting role="XML"><![CDATA[<resteasy:application-config
+ scan-providers="false"
+ scan-resources="false"
+ use-builtin-providers="true">
+
+ <resteasy:resource-class-names>
+ <value>org.foo.MyCustomerResource</value>
+ <value>org.foo.MyOrderResource</value>
+ </resteasy:resource-class-names>
+
+ <resteasy:provider-class-names>
+ <value>org.foo.MyFancyProvider</value>
+ </resteasy:provider-class-names>
+
+ </resteasy:application-config>]]></programlisting>
+
+ <para>
+ The <literal>use-built-in-providers</literal> switch enables (default) or disables the RESTEasy built-in
+ providers. We recommend you leave them enabled, as they provide plaintext, JSON, and JAXB marshalling
+ out of the box.
+ </para>
+
+ <para>
+ Finally, you can configure media type and language URI extensions:
+ </para>
+
+ <programlisting role="XML"><![CDATA[<resteasy:application-config>
+
+ <resteasy:media-type-mappings>
+ <key>txt</key><value>text/plain</value>
+ </resteasy:media-type-mappings>
+
+ <resteasy:language-mappings>
+ <key>deutsch</key><value>de-DE</value>
+ </resteasy:language-mappings>
+
+</resteasy:application-config>]]></programlisting>
+
+ <para>
+ This definition would map the URI suffix of <literal>.txt.deutsch</literal> to
+ additional <literal>Accept</literal> and <literal>Accept-Language</literal> header values
+ <literal>text/plain</literal> and <literal>de-DE</literal>.
+ </para>
+
</sect2>
-<!--
- <programlisting role="JAVA"><![CDATA[
-]]></programlisting>
--->
+ <sect2>
+ <title>Resources and providers as Seam components</title>
+
+ <para>
+ Any resource and provider instances are managed by RESTEasy by default. That means a resource class
+ will be instantiated by RESTEasy and serve a single request, after which it will be destroyed. This is
+ the default JAX-RS lifecycle. Providers are instantiated once for the whole application and are
+ effectively singletons and supposed to be stateless.
+ </para>
+
+ <para>
+ You can write resources and providers as Seam components and benefit from the richer lifecycle management
+ of Seam, and interception for bijection, security, and so on. Simply make your resource class a
+ Seam component:
+ </para>
+
+ <programlisting role="JAVA"><![CDATA[@Name("customerResource")
+@Path("/customer")
+public class MyCustomerResource {
+
+ @In
+ CustomerDAO customerDAO;
+
+ @GET
+ @Path("/{customerId}")
+ @ProduceMime("text/plain")
+ public String getCustomer(@PathParam("customerId") int id) {
+ return customerDAO.find(id).getName();
+ }
+
+}]]></programlisting>
+
+ <para>
+ An instance of <literal>customerResource</literal> is now handled by Seam when a request hits the
+ server. This is a Seam JavaBean component that is <literal>EVENT</literal>-scoped, hence no different
+ than the default JAX-RS lifecycle. However, you get full Seam injection support and all other Seam
+ components and contexts are available to you. Currently also supported are <literal>SESSION</literal>,
+ <literal>APPLICATION</literal>, and <literal>STATELESS</literal> resource components. Remember that any
+ HTTP request has to transmit a valid session identifier (cookie, URI path parameter) for correct handling
+ of the server-side session context.
+ </para>
+
+ <para>
+ Conversation-scoped resource components and mapping of conversations is currently not supported but will
+ be available soon.
+ </para>
+
+ <para>
+ Provider classes can also be Seam components, they must be <literal>APPLICATION</literal>-scoped
+ or <literal>STATELESS</literal>.
+ </para>
+
+ <para>
+ Resources and providers can be EJBs or JavaBeans, like any other Seam component.
+ </para>
+
+ </sect2>
+
</sect1>
</chapter>
Modified: trunk/src/resteasy/org/jboss/seam/resteasy/reasteasy-2.1.xsd
===================================================================
--- trunk/src/resteasy/org/jboss/seam/resteasy/reasteasy-2.1.xsd 2008-07-28 04:58:58 UTC (rev 8504)
+++ trunk/src/resteasy/org/jboss/seam/resteasy/reasteasy-2.1.xsd 2008-07-28 08:00:02 UTC (rev 8505)
@@ -29,6 +29,22 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element minOccurs="0" maxOccurs="1"
+ name="media-type-mappings" type="components:multiValuedProperty">
+ <xs:annotation>
+ <xs:documentation>
+ Maps media type URI extensions to Accept header, see RESTEasy documentation and JAX-RS (JSR 311).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element minOccurs="0" maxOccurs="1"
+ name="language-mappings" type="components:multiValuedProperty">
+ <xs:annotation>
+ <xs:documentation>
+ Maps language URI extension to Accept header, see RESTEasy documentation and JAX-RS (JSR 311).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
<xs:attributeGroup ref="components:attlist.component"/>
<xs:attributeGroup ref="pdf:attlist.application-config"/>
15 years, 9 months
Seam SVN: r8504 - in trunk/examples/wiki: src/plugin/org/jboss/seam/wiki/plugin/basic/i18n and 2 other directories.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-07-28 00:58:58 -0400 (Mon, 28 Jul 2008)
New Revision: 8504
Added:
trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/OnlineMembersPreferences.java
Modified:
trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/i18n/messages_basic_en.properties
trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/templates/onlineMembers.xhtml
trunk/examples/wiki/view/includes/onlineMembers.xhtml
Log:
Online members plugin now configurable
Copied: trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/OnlineMembersPreferences.java (from rev 8455, trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/DirMenuPreferences.java)
===================================================================
--- trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/OnlineMembersPreferences.java (rev 0)
+++ trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/OnlineMembersPreferences.java 2008-07-28 04:58:58 UTC (rev 8504)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.seam.wiki.plugin.basic;
+
+import org.hibernate.validator.Range;
+import org.jboss.seam.wiki.preferences.PreferenceVisibility;
+import org.jboss.seam.wiki.preferences.annotations.PreferenceProperty;
+import org.jboss.seam.wiki.preferences.annotations.Preferences;
+
+import java.io.Serializable;
+
+@Preferences(
+ name = "OnlineMembers",
+ description = "#{messages['basic.onlineMembers.preferences.description']}",
+ mappedTo = "basic.onlineMembers"
+)
+public class OnlineMembersPreferences implements Serializable {
+
+ @PreferenceProperty(
+ description = "#{messages['basic.onlineMembers.preferences.property.membersPerRow']}",
+ visibility = {PreferenceVisibility.INSTANCE},
+ editorIncludeName = "NumberRange"
+ )
+ @Range(min = 1l, max = 50l)
+ private Long membersPerRow;
+
+ public Long getMembersPerRow() {
+ return membersPerRow;
+ }
+}
\ No newline at end of file
Modified: trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/i18n/messages_basic_en.properties
===================================================================
--- trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/i18n/messages_basic_en.properties 2008-07-27 20:36:39 UTC (rev 8503)
+++ trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/i18n/messages_basic_en.properties 2008-07-28 04:58:58 UTC (rev 8504)
@@ -84,6 +84,8 @@
basic.onlineMembers.label=Online Members
basic.onlineMembers.description=Display all currently online members and their portrait
+basic.onlineMembers.preferences.description=Plugin: Online Members
+basic.onlineMembers.preferences.property.membersPerRow=Member icons per row
basic.userSummary.label=User Summary
basic.userSummary.description=Display a summary of a users statistics
Modified: trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/templates/onlineMembers.xhtml
===================================================================
--- trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/templates/onlineMembers.xhtml 2008-07-27 20:36:39 UTC (rev 8503)
+++ trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/basic/templates/onlineMembers.xhtml 2008-07-28 04:58:58 UTC (rev 8504)
@@ -11,16 +11,14 @@
<s:div styleClass="boxHeader">
<h:outputText value="#{messages['lacewiki.label.userList.OnlineMembers']}"/>
- <!-- TODO: make configurable
- #{messages['lacewiki.label.userList.InTheLast']}
- #{wikiInit.authenticatedSessionTimeoutMinutes}
- #{messages['lacewiki.label.userList.Minutes']}"/>
- -->
</s:div>
<div class="boxContent">
- <ui:include src="/includes/onlineMembers.xhtml"/>
+ <ui:include src="/includes/onlineMembers.xhtml">
+ <ui:param name="membersPerRow"
+ value="#{preferences.get('OnlineMembers', currentMacro).membersPerRow}"/>
+ </ui:include>
</div>
Modified: trunk/examples/wiki/view/includes/onlineMembers.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/onlineMembers.xhtml 2008-07-27 20:36:39 UTC (rev 8503)
+++ trunk/examples/wiki/view/includes/onlineMembers.xhtml 2008-07-28 04:58:58 UTC (rev 8504)
@@ -6,7 +6,8 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:s="http://jboss.com/products/seam/taglib">
- <h:panelGrid columns="8" rendered="#{not empty wikiHttpSessionManager.onlineMembers}"
+ <h:panelGrid columns="#{not empty membersPerRow ? membersPerRow : '8'}"
+ rendered="#{not empty wikiHttpSessionManager.onlineMembers}"
columnClasses="alignBottom alignCenter minorPadding"
style="margin-left:auto;margin-right:auto;">
<c:forEach var="ou" items="#{wikiHttpSessionManager.onlineMembers}">
15 years, 9 months
Seam SVN: r8502 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-27 15:18:10 -0400 (Sun, 27 Jul 2008)
New Revision: 8502
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Security.xml
Log:
Add code highlighting
Modified: trunk/doc/Seam_Reference_Guide/en-US/Security.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Security.xml 2008-07-27 19:00:13 UTC (rev 8501)
+++ trunk/doc/Seam_Reference_Guide/en-US/Security.xml 2008-07-27 19:18:10 UTC (rev 8502)
@@ -145,24 +145,21 @@
@In Identity identity;
public boolean authenticate() {
- try
- {
+ try {
User user = (User) entityManager.createQuery(
"from User where username = :username and password = :password")
.setParameter("username", credentials.getUsername())
.setParameter("password", credentials.getPassword())
.getSingleResult();
- if (user.getRoles() != null)
- {
+ if (user.getRoles() != null) {
for (UserRole mr : user.getRoles())
identity.addRole(mr.getName());
}
return true;
}
- catch (NoResultException ex)
- {
+ catch (NoResultException ex) {
return false;
}
@@ -178,15 +175,17 @@
authentication method returns <literal>false</literal> to indicate the authentication failed.
</para>
- <note>
- When writing an authenticator method, it is important that it is kept minimal and free from
- any side-effects. This is because there is no guarantee as to how many times the authenticator
- method will be called by the security API, and as such it may be invoked multiple times during
- a single request. Because of this, any special code that should execute upon a successful or
- failed authentication should be written by implementing an event observer. See the section on
- Security Events further down in this chapter for more information about which events are
- raised by Seam Security.
- </note>
+ <tip>
+ <para>
+ When writing an authenticator method, it is important that it is kept minimal and free from
+ any side-effects. This is because there is no guarantee as to how many times the authenticator
+ method will be called by the security API, and as such it may be invoked multiple times during
+ a single request. Because of this, any special code that should execute upon a successful or
+ failed authentication should be written by implementing an event observer. See the section on
+ Security Events further down in this chapter for more information about which events are
+ raised by Seam Security.
+ </para>
+ </tip>
<sect3>
<title>Identity.addRole()</title>
@@ -317,8 +316,7 @@
automatically upon returning to the site, without having to provide a password.
</para>
- <note>
- <title>IMPORTANT NOTE</title>
+ <warning>
<para>
Automatic client authentication with a persistent cookie stored on the client machine is dangerous.
While convenient for users, any cross-site scripting security hole in your website would have dramatically more
@@ -345,7 +343,7 @@
practice and should not be used. Cookies that "remember" only the users login name, and fill out the login form with
that username as a convenience, are not an issue.
</para>
- </note>
+ </warning>
<para>
To enable the remember me feature for the default (safe, username only) mode, no special configuration is required.
@@ -353,7 +351,7 @@
example:
</para>
- <programlisting><![CDATA[ <div>
+ <programlisting role="XHTML"><![CDATA[ <div>
<h:outputLabel for="name" value="User name"/>
<h:inputText id="name" value="#{credentials.username}"/>
</div>
@@ -384,7 +382,7 @@
structure that you may use:
</para>
- <programlisting><![CDATA[@Entity
+ <programlisting role="JAVA"><![CDATA[@Entity
public class AuthenticationToken implements Serializable {
private Integer tokenId;
private String username;
@@ -430,7 +428,7 @@
attribute:
</para>
- <programlisting><![CDATA[
+ <programlisting role="XML"><![CDATA[
<security:jpa-token-store token-class="org.jboss.seam.example.seamspace.AuthenticationToken"/>
]]></programlisting>
@@ -439,7 +437,7 @@
<literal>components.xml</literal> also. Its <literal>mode</literal> should be set to <literal>autoLogin</literal>:
</para>
- <programlisting><![CDATA[ <security:remember-me mode="autoLogin"/>
+ <programlisting role="XML"><![CDATA[ <security:remember-me mode="autoLogin"/>
]]></programlisting>
<para>
@@ -525,10 +523,12 @@
</pages>]]></programlisting>
- <para>
- (This is less of a blunt instrument than the exception handler shown above, but should
- probably be used in conjunction with it.)
- </para>
+ <tip>
+ <para>
+ This is less of a blunt instrument than the exception handler shown above, but should
+ probably be used in conjunction with it.
+ </para>
+ </tip>
<para>
After the user logs in, we want to automatically send them back where they came from, so
@@ -700,7 +700,7 @@
an <literal>LdapIdentityStore</literal> for both user-related and role-related operations:
</para>
- <programlisting><![CDATA[
+ <programlisting role="XML"><![CDATA[
<security:identity-manager identity-store="#{ldapIdentityStore}"/>
]]></programlisting>
@@ -709,7 +709,7 @@
for user-related operations, and <literal>JpaIdentityStore</literal> for role-related operations:
</para>
- <programlisting><![CDATA[
+ <programlisting role="XML"><![CDATA[
<security:identity-manager
identity-store="#{ldapIdentityStore}"
role-identity-store="#{jpaIdentityStore}"/>
@@ -741,7 +741,7 @@
example shows the configuration from <literal>components.xml</literal> in the SeamSpace example:
</para>
- <programlisting><![CDATA[
+ <programlisting role="XML"><![CDATA[
<security:jpa-identity-store
user-class="org.jboss.seam.example.seamspace.MemberAccount"
role-class="org.jboss.seam.example.seamspace.MemberRole"/>
@@ -811,7 +811,7 @@
algorithm to be specified for password hashing. Possible values for <literal>hash</literal> are
<literal>md5</literal> and <literal>sha</literal>. E.g:
- <programlisting><![CDATA[@UserPassword(hash = "md5")
+ <programlisting role="JAVA"><![CDATA[@UserPassword(hash = "md5")
public String getPasswordHash() {
return passwordHash;
}]]></programlisting>
@@ -993,7 +993,7 @@
</imageobject>
</mediaobject>
- <programlisting><![CDATA[@Entity
+ <programlisting role="JAVA"><![CDATA[@Entity
public class User {
private Integer userId;
private String username;
@@ -1053,7 +1053,7 @@
</imageobject>
</mediaobject>
- <programlisting><![CDATA[@Entity
+ <programlisting role="JAVA"><![CDATA[@Entity
public class User {
private Integer userId;
private String username;
@@ -1587,7 +1587,7 @@
<literal>enabled</literal> attribute to false.
</para>
- <programlisting><![CDATA[
+ <programlisting role="XML"><![CDATA[
<security:ldap-identity-store
server-address="directory.mycompany.com"
bind-DN="cn=Manager,dc=mycompany,dc=com"
@@ -1646,13 +1646,13 @@
component as follows:
</para>
- <programlisting><![CDATA[ @In IdentityManager identityManager;]]></programlisting>
+ <programlisting role="JAVA"><![CDATA[ @In IdentityManager identityManager;]]></programlisting>
<para>
or by accessing it through its static <literal>instance()</literal> method:
</para>
- <programlisting><![CDATA[ IdentityManager identityManager = IdentityManager.instance();]]></programlisting>
+ <programlisting role="JAVA"><![CDATA[ IdentityManager identityManager = IdentityManager.instance();]]></programlisting>
<para>
The following table describes <literal>IdentityManager</literal>'s API methods:
@@ -3025,7 +3025,7 @@
To create your own security annotation, you simply need to annotate it with <literal>@PermissionCheck</literal>, for example:
</para>
- <programlisting><![CDATA[@Target({METHOD, PARAMETER})
+ <programlisting role="JAVA"><![CDATA[@Target({METHOD, PARAMETER})
@Documented
@Retention(RUNTIME)
@Inherited
@@ -3702,11 +3702,11 @@
<para>For example, to configure a single entity class to store both user and role permissions:</para>
- <programlisting><![CDATA[ <security:jpa-permission-store user-permission-class="com.acme.model.AccountPermission"/>]]></programlisting>
+ <programlisting role="XML"><![CDATA[ <security:jpa-permission-store user-permission-class="com.acme.model.AccountPermission"/>]]></programlisting>
<para>To configure separate entity classes for storing user and role permissions:</para>
- <programlisting><![CDATA[ <security:jpa-permission-store user-permission-class="com.acme.model.UserPermission"
+ <programlisting role="XML"><![CDATA[ <security:jpa-permission-store user-permission-class="com.acme.model.UserPermission"
role-permission-class="com.acme.model.RolePermission"/>]]></programlisting>
<sect4>
@@ -3840,7 +3840,7 @@
and <literal>role</literal>, the annotation would be written like this:
</para>
- <programlisting><![CDATA[ @PermissionDiscriminator(userValue = "u", roleValue = "r")]]></programlisting>
+ <programlisting role="JAVA"><![CDATA[ @PermissionDiscriminator(userValue = "u", roleValue = "r")]]></programlisting>
</entry>
</row>
@@ -3858,7 +3858,7 @@
inside the SeamSpace example:
</para>
- <programlisting><![CDATA[
+ <programlisting role="JAVA"><![CDATA[
@Entity
public class AccountPermission implements Serializable {
private Integer permissionId;
@@ -4005,7 +4005,7 @@
Here's an example of the above annotations in action. The following class can also be found in the SeamSpace example:
</para>
- <programlisting><![CDATA[@Permissions({
+ <programlisting role="JAVA"><![CDATA[@Permissions({
@Permission(action = "view"),
@Permission(action = "comment")
})
@@ -4036,7 +4036,7 @@
Alternatively, if using bitmasked values for the permission actions, as defined like so:
</para>
- <programlisting><![CDATA[@Permissions({
+ <programlisting role="JAVA"><![CDATA[@Permissions({
@Permission(action = "view", mask = 1),
@Permission(action = "comment", mask = 2)
})
@@ -4069,7 +4069,7 @@
The <literal>IdentifierStrategy</literal> interface is very simple, declaring only two methods:
</para>
- <programlisting><![CDATA[public interface IdentifierStrategy {
+ <programlisting role="JAVA"><![CDATA[public interface IdentifierStrategy {
boolean canIdentify(Class targetClass);
String getIdentifier(Object target);
}]]></programlisting>
@@ -4106,14 +4106,14 @@
be "<literal>customer</literal>":
</para>
- <programlisting><![CDATA[@Identifier(name = "customer")
+ <programlisting role="JAVA"><![CDATA[@Identifier(name = "customer")
public class Customer {]]></programlisting>
<para>
The identifier for the following class will be "<literal>customerAction</literal>":
</para>
- <programlisting><![CDATA[@Name("customerAction")
+ <programlisting role="JAVA"><![CDATA[@Name("customerAction")
public class CustomerAction { ]]></programlisting>
<para>
@@ -4138,14 +4138,14 @@
necessary to explicitly configure the identifier strategy on the entity class itself, for example:
</para>
- <programlisting><![CDATA[@Identifier(value = EntityIdentifierStrategy.class)
+ <programlisting role="JAVA"><![CDATA[@Identifier(value = EntityIdentifierStrategy.class)
public class Customer { ]]></programlisting>
<para>
For an example of the type of identifier values generated, assume we have the following entity class:
</para>
- <programlisting><![CDATA[@Entity
+ <programlisting role="JAVA"><![CDATA[@Entity
public class Customer {
private Integer id;
private String firstName;
@@ -4168,7 +4168,7 @@
with an explicit identifier name, like so:
</para>
- <programlisting><![CDATA[@Entity
+ <programlisting role="JAVA"><![CDATA[@Entity
@Identifier(name = "cust")
public class Customer { ]]></programlisting>
@@ -4203,7 +4203,7 @@
custom permission store, specify the <literal>permission-store</literal> property in components.xml:
</para>
- <programlisting><![CDATA[
+ <programlisting role="XML"><![CDATA[
<security:permission-manager permission-store="#{ldapPermissionStore}"/>
]]></programlisting>
15 years, 9 months
Seam SVN: r8501 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-27 15:00:13 -0400 (Sun, 27 Jul 2008)
New Revision: 8501
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Wicket.xml
Log:
Minor
Modified: trunk/doc/Seam_Reference_Guide/en-US/Wicket.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Wicket.xml 2008-07-27 18:54:48 UTC (rev 8500)
+++ trunk/doc/Seam_Reference_Guide/en-US/Wicket.xml 2008-07-27 19:00:13 UTC (rev 8501)
@@ -112,7 +112,7 @@
For example:
</para>
- <programlisting><![CDATA[@Restrict
+ <programlisting role="JAVA"><![CDATA[@Restrict
public class Main extends WebPage {
...]]></programlisting>
@@ -145,7 +145,7 @@
For example:
</para>
- <programlisting><![CDATA[item.add(new Link("viewHotel") {
+ <programlisting role="JAVA"><![CDATA[item.add(new Link("viewHotel") {
@Override
@Begin
@@ -246,9 +246,9 @@
</para>
<programlisting role="XML"><![CDATA[<components xmlns="http://jboss.com/products/seam/components"
- xmlns:wicket="http://jboss.com/products/seam/wicket"
+ xmlns:wicket="http://jboss.com/products/seam/wicket">
- <wicket:web-application application-class="org.jboss.seam.example.wicket.WicketBookingApplication" />
+ <wicket:web-application application-class="org.jboss.seam.example.wicket.WicketBookingApplication" />
</components]]></programlisting>
<tip>
15 years, 9 months