jsf4portlets-devel Mailing List for JSF 4 Portlets (Page 2)
Status: Alpha
Brought to you by:
alonsoft
Menu
▾
▴
jsf4portlets-devel — Mailing list for development issues discuss
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
(3) |
Aug
(4) |
Sep
(8) |
Oct
(1) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(8) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(4) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(23) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <alo...@us...> - 2010-03-26 16:45:13
|
Revision: 81
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=81&view=rev
Author: alonsoft
Date: 2010-03-26 16:45:06 +0000 (Fri, 26 Mar 2010)
Log Message:
-----------
branding for a new release
Modified Paths:
--------------
branches/jsf4portlets-2.0/pom.xml
branches/jsf4portlets-2.0/src/assembly/bin.xml
branches/jsf4portlets-2.0/src/assembly/src.xml
branches/jsf4portlets-2.0/src/site/site.xml
Modified: branches/jsf4portlets-2.0/pom.xml
===================================================================
--- branches/jsf4portlets-2.0/pom.xml 2010-03-26 16:44:33 UTC (rev 80)
+++ branches/jsf4portlets-2.0/pom.xml 2010-03-26 16:45:06 UTC (rev 81)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2008 A. Alonso Dominguez
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+ Copyright (C) 2010 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,81 +22,82 @@
alo...@us...
-->
-<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>net.sf.jsf4portlets</groupId>
- <artifactId>jsf4portlets-project</artifactId>
- <version>2.0-beta-SNAPSHOT</version>
-
- <packaging>pom</packaging>
-
- <name>JSF 4 Portlets</name>
- <url>http://jsf4portlets.sf.net/</url>
-
- <scm>
- <connection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/branches/jsf4portlets-2.0</connection>
- <developerConnection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/branches/jsf4portlets-2.0</developerConnection>
- <url>http://jsf4portlets.svn.sourceforge.net/viewvc/jsf4portlets/branches/jsf4portlets-2.0</url>
- </scm>
-
- <description>
- JSF 4 Portlets is an implementation of the JSR-301 (JSF Portlet Bridge).
- </description>
-
- <licenses>
- <license>
- <name>Lesser General Public License</name>
- <url>http://www.opensource.org/licenses/lgpl-license.php</url>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <id>alonso</id>
- <name>A. Alonso Dominguez</name>
- <email>alo...@us...</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>-1</timezone>
- </developer>
- </developers>
-
- <mailingLists>
- <mailingList>
- <name>Developer Mailing List</name>
- <subscribe>jsf...@li...</subscribe>
- <unsubscribe>jsf...@li...</unsubscribe>
- </mailingList>
- </mailingLists>
-
- <issueManagement>
- <system>SourceForge.net</system>
- <url>http://sourceforge.net/tracker/?group_id=196120</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>shell.sf.net</id>
- <name>JSF 4 Portlets Website</name>
- <url>scp://shell.sf.net/home/groups/j/js/jsf4portlets/htdocs/web</url>
- </site>
- <repository>
- <id>shell.sf.net</id>
- <name>JSF 4 Portlets Release Repository</name>
- <url>scp://shell.sf.net/home/groups/j/js/jsf4portlets/htdocs/repository/releases</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <snapshotRepository>
- <id>shell.sf.net</id>
- <name>JSF 4 Portlets Snapshot Repository</name>
- <url>scp://shell.sf.net/home/groups/j/js/jsf4portlets/htdocs/repository/snapshots</url>
- <uniqueVersion>true</uniqueVersion>
- <layout>default</layout>
- </snapshotRepository>
- </distributionManagement>
+<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>net.sf.jsf4portlets</groupId>
+ <artifactId>jsf4portlets-project</artifactId>
+ <version>2.0-beta-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+
+ <name>JSF 4 Portlets</name>
+ <url>http://jsf4portlets.sf.net/</url>
+
+ <scm>
+ <connection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/branches/jsf4portlets-2.0</connection>
+ <developerConnection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/branches/jsf4portlets-2.0</developerConnection>
+ <url>http://jsf4portlets.svn.sourceforge.net/viewvc/jsf4portlets/branches/jsf4portlets-2.0</url>
+ </scm>
+
+ <description>
+ JSF 4 Portlets is an implementation of the JSR-301 (Portlet 1.0 Faces Bridge) and
+ JSR-329 (Portlet 2.0 Faces Bridge).
+ </description>
+
+ <licenses>
+ <license>
+ <name>Lesser General Public License</name>
+ <url>http://www.opensource.org/licenses/lgpl-license.php</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <id>alonso</id>
+ <name>A. Alonso Dominguez</name>
+ <email>alo...@us...</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-1</timezone>
+ </developer>
+ </developers>
+
+ <mailingLists>
+ <mailingList>
+ <name>Developer Mailing List</name>
+ <subscribe>jsf...@li...</subscribe>
+ <unsubscribe>jsf...@li...</unsubscribe>
+ </mailingList>
+ </mailingLists>
+ <issueManagement>
+ <system>SourceForge.net</system>
+ <url>http://sourceforge.net/tracker/?group_id=196120</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <site>
+ <id>shell.sf.net</id>
+ <name>JSF 4 Portlets Website</name>
+ <url>scp://shell.sf.net/home/groups/j/js/jsf4portlets/htdocs/web</url>
+ </site>
+ <repository>
+ <id>shell.sf.net</id>
+ <name>JSF 4 Portlets Release Repository</name>
+ <url>scp://shell.sf.net/home/groups/j/js/jsf4portlets/htdocs/repository/releases</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ <snapshotRepository>
+ <id>shell.sf.net</id>
+ <name>JSF 4 Portlets Snapshot Repository</name>
+ <url>scp://shell.sf.net/home/groups/j/js/jsf4portlets/htdocs/repository/snapshots</url>
+ <uniqueVersion>true</uniqueVersion>
+ <layout>default</layout>
+ </snapshotRepository>
+ </distributionManagement>
+
<repositories>
<repository>
<id>maven1-java.net</id>
@@ -110,29 +111,30 @@
<url>http://download.java.net/maven/2</url>
</repository>
</repositories>
-
+
<modules>
<module>jsf4portlets-api</module>
<module>jsf4portlets-impl</module>
- <module>jsf4portlets-ext</module>
+ <module>jsf4portlets-ext</module>
</modules>
+
<organization>
- <name>SourceForge.net</name>
- <url>http://www.sourceforge.net</url>
- </organization>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ <name>SourceForge.net</name>
+ <url>http://www.sourceforge.net</url>
+ </organization>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -141,186 +143,186 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>6.0.13</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>6.1.2</version>
- <scope>provided</scope>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.11</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>com.sun.portal.portletcontainer</groupId>
- <artifactId>container</artifactId>
- <version>${openportal-container.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.portal.portletcontainer</groupId>
- <artifactId>portletcontainer</artifactId>
- <version>${openportal.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.portal.portletcontainer</groupId>
- <artifactId>portletappengine</artifactId>
- <version>${openportal.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.13</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>jsf-extensions</groupId>
- <artifactId>jsf-extensions-run-time</artifactId>
- <version>0.1alpha4</version>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>6.1.2</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.11</version>
<scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.portal.portletcontainer</groupId>
+ <artifactId>container</artifactId>
+ <version>${openportal-container.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.portal.portletcontainer</groupId>
+ <artifactId>portletcontainer</artifactId>
+ <version>${openportal.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.portal.portletcontainer</groupId>
+ <artifactId>portletappengine</artifactId>
+ <version>${openportal.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
+ <groupId>jsf-extensions</groupId>
+ <artifactId>jsf-extensions-run-time</artifactId>
+ <version>0.1alpha4</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>net.sf.jsf4portlets</groupId>
<artifactId>jsf4portlets-api</artifactId>
<version>${pom.version}</version>
@@ -331,12 +333,15 @@
<artifactId>jsf4portlets-impl</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<properties>
<openportal.version>2.0-m4</openportal.version>
<openportal-container.version>1.1-m4</openportal-container.version>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
</project>
Modified: branches/jsf4portlets-2.0/src/assembly/bin.xml
===================================================================
--- branches/jsf4portlets-2.0/src/assembly/bin.xml 2010-03-26 16:44:33 UTC (rev 80)
+++ branches/jsf4portlets-2.0/src/assembly/bin.xml 2010-03-26 16:45:06 UTC (rev 81)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2007 A. Alonso Dominguez
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+ Copyright (C) 2010 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -41,9 +41,9 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<excludes>
- <exclude>net.sf.jsf4portlets:jsf4portlets</exclude>
- <exclude>org.apache.tomcat:*</exclude>
- <exclude>org.mortbay.jetty:jetty-plus</exclude>
+ <exclude>net.sf.jsf4portlets:jsf4portlets</exclude>
+ <exclude>org.apache.tomcat:*</exclude>
+ <exclude>org.mortbay.jetty:jetty-plus</exclude>
</excludes>
</dependencySet>
</dependencySets>
@@ -73,7 +73,7 @@
</fileSet>
<fileSet>
<directory>target/site</directory>
- <outputDirectory>/doc</outputDirectory>
+ <outputDirectory>/doc</outputDirectory>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: branches/jsf4portlets-2.0/src/assembly/src.xml
===================================================================
--- branches/jsf4portlets-2.0/src/assembly/src.xml 2010-03-26 16:44:33 UTC (rev 80)
+++ branches/jsf4portlets-2.0/src/assembly/src.xml 2010-03-26 16:45:06 UTC (rev 81)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2007 A. Alonso Dominguez
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+ Copyright (C) 2010 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: branches/jsf4portlets-2.0/src/site/site.xml
===================================================================
--- branches/jsf4portlets-2.0/src/site/site.xml 2010-03-26 16:44:33 UTC (rev 80)
+++ branches/jsf4portlets-2.0/src/site/site.xml 2010-03-26 16:45:06 UTC (rev 81)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2007 A. Alonso Dominguez
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+ Copyright (C) 2010 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -42,10 +42,10 @@
<links>
<item name="SF Project Page"
href="http://sf.net/projects/jsf4portlets" />
- <item name="JF Project Page"
- href="http://jasperforge.org/plugins/project/project_home.php?group_id=106" />
<item name="JSR-301"
href="http://jcp.org/en/jsr/detail?id=301" />
+ <item name="JSR-329"
+ href="http://jcp.org/en/jsr/detail?id=329" />
</links>
<menu name="Main Menu">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2010-03-26 16:44:39
|
Revision: 80
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=80&view=rev
Author: alonsoft
Date: 2010-03-26 16:44:33 +0000 (Fri, 26 Mar 2010)
Log Message:
-----------
branding for a new release
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/ViewHandlerImpl.java
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/ViewHandlerImpl.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/ViewHandlerImpl.java 2010-03-26 16:43:30 UTC (rev 79)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/ViewHandlerImpl.java 2010-03-26 16:44:33 UTC (rev 80)
@@ -330,9 +330,9 @@
Boolean.TRUE);
// build the view by executing the page
- context.getExternalContext().dispatch(requestURI);
+ extContext.dispatch(requestURI);
- return Boolean.TRUE.equals(context.getExternalContext().getRequestMap()
+ return Boolean.TRUE.equals(extContext.getRequestMap()
.get(BridgeRenderFilter.RESPONSE_COMPLETE));
}
@@ -344,7 +344,8 @@
private void renderAfterViewContent(final FacesContext context)
throws IOException {
- final Object content = context.getExternalContext().getRequestMap().get(Bridge.AFTER_VIEW_CONTENT);
+ final Object content = context.getExternalContext().getRequestMap()
+ .get(Bridge.AFTER_VIEW_CONTENT);
if (content != null) {
final RenderResponse response = (RenderResponse) context
.getExternalContext().getResponse();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2010-03-26 16:43:37
|
Revision: 79
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=79&view=rev
Author: alonsoft
Date: 2010-03-26 16:43:30 +0000 (Fri, 26 Mar 2010)
Log Message:
-----------
branding for a new release
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml
branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/FaceletPortletViewHandler.java
Modified: branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml 2010-03-26 16:43:05 UTC (rev 78)
+++ branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml 2010-03-26 16:43:30 UTC (rev 79)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2008 A. Alonso Dominguez
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+ Copyright (C) 2010 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,82 +22,82 @@
alo...@us...
-->
-<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>
-
- <parent>
- <groupId>net.sf.jsf4portlets</groupId>
- <artifactId>jsf4portlets-project</artifactId>
- <version>2.0-beta-SNAPSHOT</version>
- </parent>
-
- <artifactId>jsf4portlets-ext</artifactId>
- <packaging>jar</packaging>
-
- <name>JSF 4 Portlets Extensions</name>
-
- <description>
- This is the extensions module of JSF 4 Portlets. This module brings some
- additional features to the bridge implementation like Facelets support and more.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- <dependency>
- <artifactId>container</artifactId>
- <groupId>com.sun.portal.portletcontainer</groupId>
- </dependency>
- <dependency>
- <artifactId>portletcontainer</artifactId>
- <groupId>com.sun.portal.portletcontainer</groupId>
- </dependency>
- <dependency>
- <artifactId>portletappengine</artifactId>
- <groupId>com.sun.portal.portletcontainer</groupId>
- </dependency>
+<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>
+
+ <parent>
+ <groupId>net.sf.jsf4portlets</groupId>
+ <artifactId>jsf4portlets-project</artifactId>
+ <version>2.0-beta-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jsf4portlets-ext</artifactId>
+ <packaging>jar</packaging>
+
+ <name>JSF 4 Portlets Extensions</name>
+
+ <description>
+ This is the extensions module of JSF 4 Portlets. This module brings some
+ additional features to the bridge implementation like Facelets support and more.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
<dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </dependency>
+
+ <dependency>
+ <artifactId>container</artifactId>
+ <groupId>com.sun.portal.portletcontainer</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>portletcontainer</artifactId>
+ <groupId>com.sun.portal.portletcontainer</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>portletappengine</artifactId>
+ <groupId>com.sun.portal.portletcontainer</groupId>
+ </dependency>
+
+ <dependency>
<groupId>jsf-extensions</groupId>
<artifactId>jsf-extensions-run-time</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
@@ -107,36 +107,36 @@
<dependency>
<groupId>net.sf.jsf4portlets</groupId>
<artifactId>jsf4portlets-impl</artifactId>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</reporting>
-
+
</project>
Modified: branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/FaceletPortletViewHandler.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/FaceletPortletViewHandler.java 2010-03-26 16:43:05 UTC (rev 78)
+++ branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/FaceletPortletViewHandler.java 2010-03-26 16:43:30 UTC (rev 79)
@@ -36,37 +36,35 @@
public class FaceletPortletViewHandler extends FaceletViewHandler {
- public FaceletPortletViewHandler(final ViewHandler parent) {
- super(parent);
- }
+ public FaceletPortletViewHandler(final ViewHandler parent) {
+ super(parent);
+ }
- @Override
- protected ResponseWriter createResponseWriter(final FacesContext context)
- throws FacesException, IOException {
- final ExternalContext extContext = context.getExternalContext();
- final RenderKit renderKit = context.getRenderKit();
+ @Override
+ protected ResponseWriter createResponseWriter(final FacesContext context)
+ throws FacesException, IOException {
+ final ExternalContext extContext = context.getExternalContext();
+ final RenderKit renderKit = context.getRenderKit();
- final RenderRequest request = (RenderRequest) extContext.getRequest();
- final RenderResponse response = (RenderResponse) extContext
- .getResponse();
+ final RenderRequest request = (RenderRequest) extContext.getRequest();
+ final RenderResponse response = (RenderResponse) extContext.getResponse();
- String contentType = request.getResponseContentType();
- if (contentType == null) {
- contentType = "text/html";
- }
+ String contentType = request.getResponseContentType();
+ if (contentType == null) {
+ contentType = "text/html";
+ }
- String encoding = response.getCharacterEncoding();
- if (encoding == null) {
- encoding = "ISO-8859-1";
- }
+ String encoding = response.getCharacterEncoding();
+ if (encoding == null) {
+ encoding = "ISO-8859-1";
+ }
- ResponseWriter writer = renderKit.createResponseWriter(
- new StringWriter(), contentType, encoding);
- contentType = writer.getContentType();
- response.setContentType(contentType);
+ ResponseWriter writer = renderKit.createResponseWriter(
+ new StringWriter(), contentType, encoding);
+ contentType = writer.getContentType();
+ response.setContentType(contentType);
- writer = writer.cloneWithWriter(response.getWriter());
- return writer;
- }
-
-}
\ No newline at end of file
+ writer = writer.cloneWithWriter(response.getWriter());
+ return writer;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2010-03-26 16:43:11
|
Revision: 78
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=78&view=rev
Author: alonsoft
Date: 2010-03-26 16:43:05 +0000 (Fri, 26 Mar 2010)
Log Message:
-----------
branding for a new release
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml
Modified: branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml 2010-02-19 00:45:52 UTC (rev 77)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml 2010-03-26 16:43:05 UTC (rev 78)
@@ -47,7 +47,7 @@
<configuration>
<archive>
<manifest>
- <addDefaultImplentationEntries>true</addDefaultImplentationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Specification-Title>Portlet 2.0 Bridge for JavaServer Faces 1.2</Specification-Title>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2010-02-19 00:46:02
|
Revision: 77
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=77&view=rev
Author: alonsoft
Date: 2010-02-19 00:45:52 +0000 (Fri, 19 Feb 2010)
Log Message:
-----------
Updating license information
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/META-INF/faces-config.xml
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/LogMessages.properties
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/Messages.properties
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/META-INF/faces-config.xml
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/META-INF/faces-config.xml 2010-02-19 00:42:25 UTC (rev 76)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/META-INF/faces-config.xml 2010-02-19 00:45:52 UTC (rev 77)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2009 A. Alonso Dominguez
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+ Copyright (C) 2010 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/LogMessages.properties
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/LogMessages.properties 2010-02-19 00:42:25 UTC (rev 76)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/LogMessages.properties 2010-02-19 00:45:52 UTC (rev 77)
@@ -1,5 +1,5 @@
-# JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
-# Copyright (C) 2009 A. Alonso Dominguez
+# JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+# Copyright (C) 2010 A. Alonso Dominguez
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/Messages.properties
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/Messages.properties 2010-02-19 00:42:25 UTC (rev 76)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/resources/net/sf/jsf4portlets/Messages.properties 2010-02-19 00:45:52 UTC (rev 77)
@@ -1,5 +1,5 @@
-# JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
-# Copyright (C) 2009 A. Alonso Dominguez
+# JSF 4 Portlets - JSF Portlet Bridge (JSR-301/329)
+# Copyright (C) 2010 A. Alonso Dominguez
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2010-02-18 16:09:42
|
Revision: 74
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=74&view=rev
Author: alonsoft
Date: 2010-02-18 16:09:36 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/jsf4portlets-api/pom.xml
trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
Modified: trunk/jsf4portlets-api/pom.xml
===================================================================
--- trunk/jsf4portlets-api/pom.xml 2010-02-18 16:07:41 UTC (rev 73)
+++ trunk/jsf4portlets-api/pom.xml 2010-02-18 16:09:36 UTC (rev 74)
@@ -1,15 +1,42 @@
-<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">
- <url>http://jsf4portlets.sf.net/web/jsf4portlets-api</url>
+<?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>
+
<parent>
<artifactId>jsf4portlets-project</artifactId>
<groupId>net.sf.jsf4portlets</groupId>
<version>1.0-alpha-3-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>net.sf.jsf4portlets</groupId>
<artifactId>jsf4portlets-api</artifactId>
<name>JSF 4 Portlets API</name>
+ <url>http://jsf4portlets.sf.net/web/jsf4portlets-api</url>
<version>1.0-alpha-3-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Specification-Title>Portlet 1.0 Bridge for JavaServer Faces 1.2</Specification-Title>
+ <Specification-Version>1.0</Specification-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>javax.portlet</groupId>
Modified: trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
===================================================================
--- trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java 2010-02-18 16:07:41 UTC (rev 73)
+++ trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java 2010-02-18 16:09:36 UTC (rev 74)
@@ -273,6 +273,10 @@
return result;
}
+ public Bridge getFacesBridge() {
+ return facesBridge;
+ }
+
/**
* If mode is VIEW, EDIT, or HELP -- defer to the doView, doEdit, doHelp so
* subclasses can override. Otherwise handle mode here if there is a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2010-02-18 16:07:53
|
Revision: 73
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=73&view=rev
Author: alonsoft
Date: 2010-02-18 16:07:41 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/jsf4portlets-impl/pom.xml
trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java
trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java
Removed Paths:
-------------
trunk/jsf4portlets-impl/src/main/java/javax/
Modified: trunk/jsf4portlets-impl/pom.xml
===================================================================
--- trunk/jsf4portlets-impl/pom.xml 2010-02-10 20:59:35 UTC (rev 72)
+++ trunk/jsf4portlets-impl/pom.xml 2010-02-18 16:07:41 UTC (rev 73)
@@ -2,7 +2,7 @@
<!--
JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2008 A. Alonso Dominguez
+ Copyright (C) 2010 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,9 @@
alo...@us...
-->
-<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">
+<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>
<parent>
Modified: trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java
===================================================================
--- trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java 2010-02-10 20:59:35 UTC (rev 72)
+++ trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java 2010-02-18 16:07:41 UTC (rev 73)
@@ -409,8 +409,8 @@
private void fireBeforeRestoreViewEvent(final FacesContext context,
final Lifecycle lifecycle) {
- final PhaseEvent event = new PhaseEvent(context, PhaseId.RESTORE_VIEW,
- lifecycle);
+ final PhaseEvent event = new PhaseEvent(context,
+ PhaseId.RESTORE_VIEW, lifecycle);
for (final PhaseListener listener : lifecycle.getPhaseListeners()) {
listener.beforePhase(event);
}
Modified: trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java
===================================================================
--- trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java 2010-02-10 20:59:35 UTC (rev 72)
+++ trunk/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java 2010-02-18 16:07:41 UTC (rev 73)
@@ -27,7 +27,6 @@
import javax.portlet.RenderRequest;
-
public final class BridgeRenderRequest extends RenderRequestWrapper {
private final Map<String, String[]> actionParams;
@@ -99,10 +98,10 @@
return super.getParameterMap();
} else {
if (combinedParams == null) {
- combinedParams = new LinkedHashMap<String, String[]>(super
- .getParameterMap());
- for (final Map.Entry<String, String[]> entry : actionParams
- .entrySet()) {
+ combinedParams = new LinkedHashMap<String, String[]>(
+ super.getParameterMap());
+ for (final Map.Entry<String, String[]> entry :
+ actionParams.entrySet()) {
final String key = entry.getKey();
if (!combinedParams.containsKey(key)) {
combinedParams.put(key, entry.getValue());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2010-02-10 20:59:46
|
Revision: 72
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=72&view=rev
Author: alonsoft
Date: 2010-02-10 20:59:35 +0000 (Wed, 10 Feb 2010)
Log Message:
-----------
Links added to JasperForge Project and SF's Support pages
Modified Paths:
--------------
branches/jsf4portlets-2.0/src/site/site.xml
Modified: branches/jsf4portlets-2.0/src/site/site.xml
===================================================================
--- branches/jsf4portlets-2.0/src/site/site.xml 2009-06-30 14:48:56 UTC (rev 71)
+++ branches/jsf4portlets-2.0/src/site/site.xml 2010-02-10 20:59:35 UTC (rev 72)
@@ -40,22 +40,27 @@
<body>
<links>
- <item name="SF Project Page" href="http://sf.net/projects/jsf4portlets" />
- <item name="JSR-301" href="http://jcp.org/en/jsr/detail?id=301" />
+ <item name="SF Project Page"
+ href="http://sf.net/projects/jsf4portlets" />
+ <item name="JF Project Page"
+ href="http://jasperforge.org/plugins/project/project_home.php?group_id=106" />
+ <item name="JSR-301"
+ href="http://jcp.org/en/jsr/detail?id=301" />
</links>
<menu name="Main Menu">
<item name="Overview" href="index.html" />
- <item name="Download" href="download.html" />
+ <item name="Download" href="download.html" />
<item name="Getting Started" href="getting_started.html" />
+ <item name="Support" href="http://sourceforge.net/projects/jasperreportjsf/support" />
<item name="License" href="license.html" />
<item name="Release Notes" href="release_notes.html" />
- </menu>
-
- <menu name="Documentation">
- <item name="User Documentation" href="user_docs.html" />
- <item name="Java Docs" href="jsf4portlets/apidocs/index.html" />
</menu>
+
+ <menu name="Documentation">
+ <item name="User Documentation" href="user_docs.html" />
+ <item name="Java Docs" href="jsf4portlets/apidocs/index.html" />
+ </menu>
<menu name="Developer Documentation">
<item name="Maven 2 Repositories" href="repositories.html" />
@@ -65,4 +70,4 @@
<menu ref="reports" />
</body>
-</project>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-06-30 13:18:45
|
Revision: 70
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=70&view=rev
Author: alonsoft
Date: 2009-06-30 12:24:44 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Code formatting and clean up
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/BridgeLifecycleListener.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/BridgeListenersProcessor.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/Configuration.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationFactory.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationWrapper.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfiguration.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfigurationFactory.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/FacesConfigurationProcessor.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ManagedBeanImpl.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/WebappConfigurationProcessor.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/RequestScopeManagerFactory.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/spi/ConfigurationProcessorException.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/ArrayUtil.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/MessagesFactory.java
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/BridgeImpl.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -225,7 +225,7 @@
getLifecycle().execute(context);
- if (eventHandler == null) {
+ if (eventHandler != null) {
logger.log(Level.FINER, "J4P_000078");
final EventNavigationResult result = eventHandler.handleEvent(
context, request.getEvent());
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/BridgeLifecycleListener.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/BridgeLifecycleListener.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/application/BridgeLifecycleListener.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -41,7 +41,7 @@
*
*/
private static final long serialVersionUID = 7029250913211728967L;
-
+
private static final Logger logger = Logger.getLogger(
BridgeLifecycleListener.class.getPackage().getName(),
"net.sf.jsf4portlets.LogMessages");
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/BridgeListenersProcessor.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/BridgeListenersProcessor.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/BridgeListenersProcessor.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -44,66 +44,70 @@
private static final Logger logger = Logger.getLogger(
BridgeListenersProcessor.class.getPackage().getName(),
"net.sf.jsf4portlets.LogMessages");
-
- private static final String BRIDGE_EXT_NAMESPACE =
- "http://jsf4portlets.sf.net/jsfportlet-ext";
-
+
+ private static final String BRIDGE_EXT_NAMESPACE = "http://jsf4portlets.sf.net/jsfportlet-ext";
+
private static final String FACES_CONFIG = "faces-config.xml";
-
+
private static final String TAG_LIFECYCLE = "lifecycle";
private static final String TAG_LIFECYCLE_EXTENSION = "lifecycle-extension";
-
+
private static final String TAG_BRIDGE_LISTENER = "bridge-listener";
private static final String TAG_BRIDGE_LISTENERS = "bridge-listeners";
-
- public boolean acceptsResource(String resourceName) {
+
+ public boolean acceptsResource(final String resourceName) {
return (-1 != resourceName.indexOf(FACES_CONFIG));
}
@SuppressWarnings("unchecked")
- public void process(ExternalContext context, Document facesConfig)
- throws ConfigurationProcessorException {
-
- PortletContext portletContext = (PortletContext) context.getContext();
- RequestScopeManager rsm = RequestScopeManagerFactory.getInstance()
- .getRequestScopeManager(portletContext);
-
- Element listeners = getBridgeListenersElement(facesConfig);
- if(listeners != null) {
- List<Element> list = XmlHelper.getChildElements(listeners,
+ public void process(final ExternalContext context,
+ final Document facesConfig) throws ConfigurationProcessorException {
+
+ final PortletContext portletContext = (PortletContext) context
+ .getContext();
+ final RequestScopeManager rsm = RequestScopeManagerFactory
+ .getInstance().getRequestScopeManager(portletContext);
+
+ final Element listeners = getBridgeListenersElement(facesConfig);
+ if (listeners != null) {
+ final List<Element> list = XmlHelper.getChildElements(listeners,
BRIDGE_EXT_NAMESPACE, TAG_BRIDGE_LISTENER);
RequestScopeListener listener = null;
- for(Element listenerElem : list) {
- String listenerClassName = XmlHelper.getText(listenerElem);
+ for (final Element listenerElem : list) {
+ final String listenerClassName = XmlHelper
+ .getText(listenerElem);
Class<RequestScopeListener> listenerClass;
try {
- listenerClass = (Class<RequestScopeListener>) Util.loadClass(
- listenerClassName, this);
- } catch (ClassNotFoundException e) {
- if(logger.isLoggable(Level.SEVERE)) {
- logger.log(Level.SEVERE, "J4P_000079", listenerClassName);
+ listenerClass = (Class<RequestScopeListener>) Util
+ .loadClass(listenerClassName, this);
+ } catch (final ClassNotFoundException e) {
+ if (logger.isLoggable(Level.SEVERE)) {
+ logger.log(Level.SEVERE, "J4P_000079",
+ listenerClassName);
}
throw new ConfigurationProcessorException(e);
}
-
+
try {
listener = listenerClass.newInstance();
- } catch (Exception e) {
- if(logger.isLoggable(Level.SEVERE)) {
- LogRecord logRecord = new LogRecord(Level.SEVERE, "J4P_000080");
- logRecord.setParameters(new Object[]{ listenerClassName });
+ } catch (final Exception e) {
+ if (logger.isLoggable(Level.SEVERE)) {
+ final LogRecord logRecord = new LogRecord(Level.SEVERE,
+ "J4P_000080");
+ logRecord
+ .setParameters(new Object[] { listenerClassName });
logRecord.setThrown(e);
logger.log(logRecord);
}
throw new ConfigurationProcessorException(e);
- }
-
+ }
+
rsm.addRequestScopeListener(listener);
}
}
}
- private Element getBridgeListenersElement(Document facesConfig) {
+ private Element getBridgeListenersElement(final Document facesConfig) {
final Element application = XmlHelper.getChildElement(facesConfig
.getDocumentElement(), TAG_LIFECYCLE);
if (application == null) {
@@ -117,5 +121,5 @@
return XmlHelper.getChildElement(extension, BRIDGE_EXT_NAMESPACE,
TAG_BRIDGE_LISTENERS);
}
-
+
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/Configuration.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/Configuration.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/Configuration.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -56,7 +56,7 @@
public Map<ParameterKey, String> getParameterMapping();
public boolean isReadOnly();
-
+
public void makeReadOnly();
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationFactory.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationFactory.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationFactory.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -31,14 +31,15 @@
.getPackage().getName();
private static final ConfigurationFactory DEFAULT_FACTORY = new DefaultConfigurationFactory();
-
+
public static ConfigurationFactory getInstance() {
- return FactoryUtil.getFactory(ConfigurationFactory.class, DEFAULT_FACTORY);
+ return FactoryUtil.getFactory(ConfigurationFactory.class,
+ DEFAULT_FACTORY);
}
-
+
public final Configuration getConfiguration(final ExternalContext context) {
- Configuration config = (Configuration) context.getApplicationMap().get(
- CONFIG_INSTANCE_KEY);
+ final Configuration config = (Configuration) context
+ .getApplicationMap().get(CONFIG_INSTANCE_KEY);
if (config == null) {
loadConfiguration(context);
}
@@ -46,6 +47,6 @@
}
protected abstract void loadConfiguration(final ExternalContext context)
- throws BridgeException;
+ throws BridgeException;
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationWrapper.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationWrapper.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ConfigurationWrapper.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -24,23 +24,24 @@
public abstract class ConfigurationWrapper implements Configuration {
- public void addExcludedAttributeName(String attributeName) {
+ public void addExcludedAttributeName(final String attributeName) {
getWrapped().addExcludedAttributeName(attributeName);
}
- public void addFacesMapping(String mapping) {
+ public void addFacesMapping(final String mapping) {
getWrapped().addFacesMapping(mapping);
}
- public void addManagedBean(ManagedBean mb) {
+ public void addManagedBean(final ManagedBean mb) {
getWrapped().addManagedBean(mb);
}
- public void addParameterMapping(ParameterKey paramKey, String expression) {
+ public void addParameterMapping(final ParameterKey paramKey,
+ final String expression) {
getWrapped().addParameterMapping(paramKey, expression);
}
- public boolean containsMapping(String mapping) {
+ public boolean containsMapping(final String mapping) {
return getWrapped().containsMapping(mapping);
}
@@ -60,7 +61,7 @@
return getWrapped().getFacesMappings();
}
- public ManagedBean getManagedBean(String name) {
+ public ManagedBean getManagedBean(final String name) {
return getWrapped().getManagedBean(name);
}
@@ -84,14 +85,14 @@
getWrapped().makeReadOnly();
}
- public void setDefaultFacesMapping(String facesMapping) {
+ public void setDefaultFacesMapping(final String facesMapping) {
getWrapped().setDefaultFacesMapping(facesMapping);
}
- public void setDefaultViewSuffix(String defaultViewSuffix) {
+ public void setDefaultViewSuffix(final String defaultViewSuffix) {
getWrapped().setDefaultViewSuffix(defaultViewSuffix);
}
-
+
protected abstract Configuration getWrapped();
-
+
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfiguration.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfiguration.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfiguration.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -138,5 +138,5 @@
"Configuration is in read-only state.");
}
}
-
+
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfigurationFactory.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfigurationFactory.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/DefaultConfigurationFactory.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -48,7 +48,7 @@
private static final Logger logger = Logger.getLogger(
ConfigurationFactory.class.getPackage().getName(),
"net.sf.jsf4portlets.LogMessages");
-
+
private static final String META_INF = "META-INF";
private static final String WEB_INF = "/WEB-INF";
@@ -58,14 +58,14 @@
+ "/faces-config.xml";
private static final String PORTLET_XML = WEB_INF + "/portlet.xml";
private static final String WEB_XML = WEB_INF + "/web.xml";
-
+
@Override
- protected void loadConfiguration(ExternalContext context)
- throws BridgeException {
+ protected void loadConfiguration(final ExternalContext context)
+ throws BridgeException {
try {
- DefaultConfiguration config = new DefaultConfiguration();
+ final DefaultConfiguration config = new DefaultConfiguration();
context.getApplicationMap().put(CONFIG_INSTANCE_KEY, config);
-
+
if (loadApplicationConfiguration(context)) {
loadClasspathConfiguration(context);
config.makeReadOnly();
@@ -79,13 +79,15 @@
} catch (final SAXException e) {
throw new BridgeException("Error parsing configuration.", e);
} catch (final IOException e) {
- throw new BridgeException("I/O Error while loading configuration.", e);
+ throw new BridgeException("I/O Error while loading configuration.",
+ e);
}
}
private static boolean loadApplicationConfiguration(
final ExternalContext context) throws BridgeException,
- ParserConfigurationException, SAXException, IOException, ConfigurationProcessorException {
+ ParserConfigurationException, SAXException, IOException,
+ ConfigurationProcessorException {
InputStream stream = context.getResourceAsStream(PORTLET_XML);
if (stream == null) {
// Not a portlet application
@@ -141,7 +143,8 @@
}
private static void loadClasspathConfiguration(final ExternalContext context)
- throws IOException, ParserConfigurationException, SAXException, ConfigurationProcessorException {
+ throws IOException, ParserConfigurationException, SAXException,
+ ConfigurationProcessorException {
final ClassLoader classLoader = Util.getClassLoader(context);
final DocumentBuilderFactory builderFactory = createDocumentBuilderFactory(context);
final DocumentBuilder builder = builderFactory.newDocumentBuilder();
@@ -193,5 +196,5 @@
.getInitParameter(BridgeConstants.VALIDATE_CONFIG)));
return factory;
}
-
+
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/FacesConfigurationProcessor.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/FacesConfigurationProcessor.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/FacesConfigurationProcessor.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -33,50 +33,51 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public final class FacesConfigurationProcessor implements ConfigurationProcessor {
+public final class FacesConfigurationProcessor implements
+ ConfigurationProcessor {
private static final Logger logger = Logger.getLogger(
FacesConfigurationProcessor.class.getPackage().getName(),
"net.sf.jsf4portlets.LogMessages");
private static final String BRIDGE_NAMESPACE = "http://jsf4portlets.sf.net/jsfportlet";
-
+
private static final String FACES_CONFIG = "faces-config.xml";
-
+
private static final String TAG_APPLICATION = "application";
private static final String TAG_APPLICATION_EXTENSION = "application-extension";
-
+
private static final String TAG_EXCLUDED_ATTRIBUTE = "excluded-attribute";
private static final String TAG_EXCLUDED_ATTRIBUTES = "excluded-attributes";
-
+
private static final String TAG_MANAGED_BEAN = "managed-bean";
private static final String TAG_MANAGED_BEAN_NAME = "managed-bean-name";
private static final String TAG_MANAGED_BEAN_CLASS = "managed-bean-class";
private static final String TAG_MANAGED_BEAN_SCOPE = "managed-bean-scope";
-
+
private static final String TAG_PUBLIC_PARAMETER_MAPPING = "public-parameter-mapping";
private static final String TAG_PUBLIC_PARAMETER_MAPPINGS = "public-parameter-mappings";
-
+
private static final String TAG_PARAMETER = "parameter";
private static final String TAG_MODEL_EL = "model-el";
-
+
public boolean acceptsResource(final String resourceName) {
return (resourceName.indexOf(FACES_CONFIG) != -1);
}
public void process(final ExternalContext context,
- final Document facesConfig)
- throws ConfigurationProcessorException {
+ final Document facesConfig) throws ConfigurationProcessorException {
final Configuration config = (Configuration) context
- .getApplicationMap().get(ConfigurationFactory.CONFIG_INSTANCE_KEY);
+ .getApplicationMap().get(
+ ConfigurationFactory.CONFIG_INSTANCE_KEY);
final List<Element> managedBeanElems = XmlHelper.getChildElements(
facesConfig.getDocumentElement(), TAG_MANAGED_BEAN);
for (final Element mbe : managedBeanElems) {
final ManagedBeanImpl managedBean = new ManagedBeanImpl();
- managedBean.setName(XmlHelper
- .getChildText(mbe, TAG_MANAGED_BEAN_NAME));
+ managedBean.setName(XmlHelper.getChildText(mbe,
+ TAG_MANAGED_BEAN_NAME));
managedBean.setClassName(XmlHelper.getChildText(mbe,
TAG_MANAGED_BEAN_CLASS));
managedBean.setScope(XmlHelper.getChildText(mbe,
@@ -87,8 +88,9 @@
final Element appExtensionElem = getApplicationExtensionElement(facesConfig);
if (appExtensionElem != null) {
- final Element excludedAttrsElem = XmlHelper.getChildElement(
- appExtensionElem, BRIDGE_NAMESPACE, TAG_EXCLUDED_ATTRIBUTES);
+ final Element excludedAttrsElem = XmlHelper
+ .getChildElement(appExtensionElem, BRIDGE_NAMESPACE,
+ TAG_EXCLUDED_ATTRIBUTES);
if (excludedAttrsElem != null) {
final List<Element> excludedAttrList = XmlHelper
.getChildElements(excludedAttrsElem, BRIDGE_NAMESPACE,
@@ -125,7 +127,8 @@
if (application == null) {
return null;
}
- return XmlHelper.getChildElement(application, TAG_APPLICATION_EXTENSION);
+ return XmlHelper
+ .getChildElement(application, TAG_APPLICATION_EXTENSION);
}
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ManagedBeanImpl.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ManagedBeanImpl.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/ManagedBeanImpl.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -20,8 +20,15 @@
*/
package net.sf.jsf4portlets.config;
-final class ManagedBeanImpl implements ManagedBean {
+import java.io.Serializable;
+final class ManagedBeanImpl implements ManagedBean, Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -7519765464723651983L;
+
private String name;
private String className;
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/WebappConfigurationProcessor.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/WebappConfigurationProcessor.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/config/WebappConfigurationProcessor.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -34,7 +34,8 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public final class WebappConfigurationProcessor implements ConfigurationProcessor {
+public final class WebappConfigurationProcessor implements
+ ConfigurationProcessor {
private static final Logger logger = Logger.getLogger(
WebappConfigurationProcessor.class.getPackage().getName(),
@@ -43,19 +44,19 @@
private static final String FACES_SERVLET = "javax.faces.webapp.FacesServlet";
private static final String WEB_XML = "/WEB-INF/web.xml";
-
+
private static final String TAG_CONTEXT_PARAM = "context-param";
-
+
private static final String TAG_SERVLET = "servlet";
private static final String TAG_SERVLET_CLASS = "servlet-class";
private static final String TAG_SERVLET_NAME = "servlet-name";
private static final String TAG_SERVLET_MAPPING = "servlet-mapping";
-
+
private static final String TAG_PARAM_NAME = "param-name";
private static final String TAG_PARAM_VALUE = "param-value";
-
+
private static final String TAG_URL_PATTERN = "url-pattern";
-
+
public boolean acceptsResource(final String resourceName) {
return (WEB_XML.equals(resourceName));
}
@@ -63,7 +64,8 @@
public void process(final ExternalContext context, final Document webXml)
throws ConfigurationProcessorException {
final Configuration config = (Configuration) context
- .getApplicationMap().get(ConfigurationFactory.CONFIG_INSTANCE_KEY);
+ .getApplicationMap().get(
+ ConfigurationFactory.CONFIG_INSTANCE_KEY);
String facesMapping = null;
String facesServletName = null;
@@ -79,7 +81,8 @@
}
}
if (facesServletName == null) {
- throw new ConfigurationProcessorException("FacesServlet not configured.");
+ throw new ConfigurationProcessorException(
+ "FacesServlet not configured.");
}
final List<Element> servletMappings = XmlHelper.getChildElements(webXml
@@ -90,7 +93,7 @@
if (facesServletName.equals(servletName)) {
facesMapping = XmlHelper.getChildText(mapping, TAG_URL_PATTERN);
assert (facesMapping != null && facesMapping.length() > 0);
-
+
if (config.getDefaultFacesMapping() == null) {
config.setDefaultFacesMapping(facesMapping);
logger.log(Level.CONFIG, "J4P_000063", facesMapping);
@@ -100,7 +103,8 @@
}
}
if (facesMapping == null) {
- throw new ConfigurationProcessorException("FacesServlet not mapped!");
+ throw new ConfigurationProcessorException(
+ "FacesServlet not mapped!");
}
final List<Element> contextParams = XmlHelper.getChildElements(webXml
@@ -109,7 +113,7 @@
final Element paramName = XmlHelper.getChildElement(param,
TAG_PARAM_NAME);
if (ViewHandler.DEFAULT_SUFFIX_PARAM_NAME.equals(paramName)) {
- String defaultViewSuffix = XmlHelper.getChildText(param,
+ final String defaultViewSuffix = XmlHelper.getChildText(param,
TAG_PARAM_VALUE);
assert (defaultViewSuffix != null && defaultViewSuffix.length() > 0);
config.setDefaultViewSuffix(defaultViewSuffix);
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -165,7 +165,7 @@
synchronized (REQUEST_SCOPE_LOCK) {
final RequestScope scope = getPreviousRequestScope(context);
final PortletRequest request = restoreBridgeRequest(context, scope);
-
+
if (PortletPhase.RENDER_PHASE.equals(phase)
|| PortletPhase.RESOURCE_PHASE.equals(phase)) {
if (scope != null) {
@@ -195,8 +195,8 @@
}
logger.log(Level.FINER, "J4P_000018");
- final Configuration config = ConfigurationFactory.getInstance()
- .getConfiguration(extContext);
+ final Configuration config = ConfigurationFactory
+ .getInstance().getConfiguration(extContext);
final Enumeration<String> managedBeanNames = scope
.getManagedBeanNames();
while (managedBeanNames.hasMoreElements()) {
@@ -219,7 +219,7 @@
}
}
}
- } else if(PortletPhase.EVENT_PHASE.equals(phase)) {
+ } else if (PortletPhase.EVENT_PHASE.equals(phase)) {
} else {
throw new IllegalStateException("Unsupported portlet phase: "
+ phase);
@@ -242,20 +242,23 @@
synchronized (REQUEST_SCOPE_LOCK) {
if (PortletPhase.ACTION_PHASE.equals(phase)
|| PortletPhase.EVENT_PHASE.equals(phase)) {
-
- final PortletRequest request = (PortletRequest) extContext.getRequest();
- final StateAwareResponse response = (StateAwareResponse) extContext.getResponse();
-
+
+ final PortletRequest request = (PortletRequest) extContext
+ .getRequest();
+ final StateAwareResponse response = (StateAwareResponse) extContext
+ .getResponse();
+
String scopeId = null;
RequestScope scope = null;
- if(PortletPhase.EVENT_PHASE.equals(phase)) {
+ if (PortletPhase.EVENT_PHASE.equals(phase)) {
scope = getPreviousRequestScope(context);
scopeId = request.getParameter(REQUEST_SCOPE_KEY);
}
- if(PortletPhase.ACTION_PHASE.equals(phase) || (scope == null)) {
+ if (PortletPhase.ACTION_PHASE.equals(phase) || (scope == null)) {
scope = new RequestScope(this);
- if(PortletPhase.ACTION_PHASE.equals(phase)) {
- scopeId = (String) request.getAttribute(REQUEST_SCOPE_KEY);
+ if (PortletPhase.ACTION_PHASE.equals(phase)) {
+ scopeId = (String) request
+ .getAttribute(REQUEST_SCOPE_KEY);
}
}
response.setRenderParameter(REQUEST_SCOPE_KEY, scopeId);
@@ -371,22 +374,26 @@
}
public void expire(final FacesContext context) {
- final PortletPhase phase = Util.getPortletLifecyclePhase(context.getExternalContext());
+ final PortletPhase phase = Util.getPortletLifecyclePhase(context
+ .getExternalContext());
if (PortletPhase.ACTION_PHASE.equals(phase)) {
throw new IllegalStateException(
"RequestScope must be expired during a render.");
}
- final PortletConfig portletConfig = Util.getPortletConfig(context.getExternalContext());
- final PortletSession session = (PortletSession) context.getExternalContext().getSession(false);
- if(session != null) {
+ final PortletConfig portletConfig = Util.getPortletConfig(context
+ .getExternalContext());
+ final PortletSession session = (PortletSession) context
+ .getExternalContext().getSession(false);
+ if (session != null) {
final String scopePrefix = qualifyRequestScopeIdentifier(
portletConfig.getPortletName(), session.getId(), null, null);
final String scopeId = context.getExternalContext()
.getRequestParameterMap().get(REQUEST_SCOPE_KEY);
if (scopeId != null && scopeId.length() > 0) {
releaseRequestScope(scopeId);
- session.removeAttribute(REQUEST_SCOPE_WATCHER + "/" + scopePrefix);
+ session.removeAttribute(REQUEST_SCOPE_WATCHER + "/"
+ + scopePrefix);
}
}
}
@@ -507,11 +514,9 @@
final PortletSession session = (PortletSession) context
.getSession(false);
if (session != null) {
- final PortletConfig portletConfig = Util
- .getPortletConfig(context);
+ final PortletConfig portletConfig = Util.getPortletConfig(context);
final String scopePrefix = qualifyRequestScopeIdentifier(
- portletConfig.getPortletName(), session.getId(), null,
- null);
+ portletConfig.getPortletName(), session.getId(), null, null);
final String watcherKey = REQUEST_SCOPE_WATCHER + "/" + scopePrefix;
RequestScopeBindingListener listener = (RequestScopeBindingListener) session
.getAttribute(watcherKey);
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/RequestScopeManagerFactory.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/RequestScopeManagerFactory.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/RequestScopeManagerFactory.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -27,11 +27,11 @@
public abstract class RequestScopeManagerFactory {
- private static final RequestScopeManagerFactory DEFAULT_FACTORY =
- new DefaultRequestScopeManagerFactory();
+ private static final RequestScopeManagerFactory DEFAULT_FACTORY = new DefaultRequestScopeManagerFactory();
public static final RequestScopeManagerFactory getInstance() {
- return FactoryUtil.getFactory(RequestScopeManagerFactory.class, DEFAULT_FACTORY);
+ return FactoryUtil.getFactory(RequestScopeManagerFactory.class,
+ DEFAULT_FACTORY);
}
public final RequestScopeManager getRequestScopeManager(
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/spi/ConfigurationProcessorException.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/spi/ConfigurationProcessorException.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/spi/ConfigurationProcessorException.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -2,15 +2,21 @@
public class ConfigurationProcessorException extends Exception {
- public ConfigurationProcessorException(String message, Throwable cause) {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4463381029358218922L;
+
+ public ConfigurationProcessorException(final String message,
+ final Throwable cause) {
super(message, cause);
}
- public ConfigurationProcessorException(String message) {
+ public ConfigurationProcessorException(final String message) {
super(message);
}
- public ConfigurationProcessorException(Throwable cause) {
+ public ConfigurationProcessorException(final Throwable cause) {
super(cause);
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/ArrayUtil.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/ArrayUtil.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/ArrayUtil.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -4,33 +4,42 @@
public static boolean equals(final Object[] arr1, final Object[] arr2) {
Boolean equals = nullEquals(arr1, arr2);
- if(equals != null) return equals.booleanValue();
- if(arr1.length != arr2.length) return false;
-
- int length = arr1.length;
- for(int i = 0;i < length;i++) {
+ if (equals != null) {
+ return equals.booleanValue();
+ }
+ if (arr1.length != arr2.length) {
+ return false;
+ }
+
+ final int length = arr1.length;
+ for (int i = 0; i < length; i++) {
equals = nullEquals(arr1[i], arr2[i]);
- if(equals == null) {
- if(!arr1[i].equals(arr2[i])) {
+ if (equals == null) {
+ if (!arr1[i].equals(arr2[i])) {
return false;
}
- } else if(!equals.booleanValue()) {
+ } else if (!equals.booleanValue()) {
return false;
}
}
return true;
}
- private static Boolean nullEquals(Object a, Object b) {
- if(a == null) {
- if(b == null) return true;
- else return false;
+ private static Boolean nullEquals(final Object a, final Object b) {
+ if (a == null) {
+ if (b == null) {
+ return true;
+ } else {
+ return false;
+ }
} else {
- if(b == null) return false;
+ if (b == null) {
+ return false;
+ }
}
return null;
}
-
+
private ArrayUtil() {
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -39,54 +39,56 @@
public final class FactoryUtil {
- private static final Logger logger = Logger.getLogger(
- FactoryUtil.class.getPackage().getName(),
- "net.sf.jsf4portlets.LogMessages");
-
+ private static final Logger logger = Logger.getLogger(FactoryUtil.class
+ .getPackage().getName(), "net.sf.jsf4portlets.LogMessages");
+
private static final String SERVICES_ROOT = "META-INF/services/";
-
- private static Map<ClassLoader, Map<Class<?>, Object>> factoryCacheMap =
- new ConcurrentHashMap<ClassLoader, Map<Class<?>,Object>>();
-
- public static <T> T getFactory(Class<T> factoryClass) {
+
+ private static Map<ClassLoader, Map<Class<?>, Object>> factoryCacheMap = new ConcurrentHashMap<ClassLoader, Map<Class<?>, Object>>();
+
+ public static <T> T getFactory(final Class<T> factoryClass) {
return getFactory(factoryClass, null);
}
-
- public static <T> T getFactory(Class<T> factoryClass, T defaultFactory) {
+
+ public static <T> T getFactory(final Class<T> factoryClass,
+ final T defaultFactory) {
T factoryInstance = null;
-
- ClassLoader classLoader = Util.getClassLoader(null);
+
+ final ClassLoader classLoader = Util.getClassLoader(null);
Map<Class<?>, Object> factoryMap = factoryCacheMap.get(classLoader);
- if(factoryMap == null) {
+ if (factoryMap == null) {
factoryMap = new HashMap<Class<?>, Object>();
factoryCacheMap.put(classLoader, factoryMap);
}
-
- if(!factoryMap.containsKey(factoryClass)) {
- factoryInstance = createFactory(classLoader, factoryClass, defaultFactory);
+
+ if (!factoryMap.containsKey(factoryClass)) {
+ factoryInstance = createFactory(classLoader, factoryClass,
+ defaultFactory);
factoryMap.put(factoryClass, factoryInstance);
}
-
+
return factoryClass.cast(factoryMap.get(factoryClass));
}
-
+
@SuppressWarnings("unchecked")
- private static <T> T createFactory(ClassLoader classLoader, Class<T> factoryClass, T defaultFactory) {
+ private static <T> T createFactory(final ClassLoader classLoader,
+ final Class<T> factoryClass, final T defaultFactory) {
Enumeration<URL> resources;
try {
- resources = classLoader.getResources(SERVICES_ROOT + factoryClass.getName());
+ resources = classLoader.getResources(SERVICES_ROOT
+ + factoryClass.getName());
} catch (final IOException e) {
if (logger.isLoggable(Level.SEVERE)) {
final LogRecord logRecord = new LogRecord(Level.SEVERE,
"J4P_000075");
- logRecord.setParameters(
- new Object[] { factoryClass.getName() });
+ logRecord
+ .setParameters(new Object[] { factoryClass.getName() });
logRecord.setThrown(e);
logger.log(logRecord);
}
return defaultFactory;
}
-
+
InputStream stream = null;
BufferedReader reader = null;
T current = defaultFactory;
@@ -105,30 +107,32 @@
}
continue;
}
-
+
try {
reader = new BufferedReader(new InputStreamReader(stream,
BridgeConstants.DEFAULT_CHARACTER_ENCODING));
} catch (final UnsupportedEncodingException e) {
reader = new BufferedReader(new InputStreamReader(stream));
}
-
+
try {
String line;
T factory;
while ((line = reader.readLine()) != null) {
Class<? extends T> factoryImplClass;
try {
- factoryImplClass = (Class<? extends T>) classLoader.loadClass(line);
+ factoryImplClass = (Class<? extends T>) classLoader
+ .loadClass(line);
} catch (final ClassNotFoundException e) {
if (logger.isLoggable(Level.SEVERE)) {
- logger.log(Level.SEVERE, "J4P_000077",
- new Object[] {
- line, factoryClass.getName() });
+ logger
+ .log(Level.SEVERE, "J4P_000077",
+ new Object[] { line,
+ factoryClass.getName() });
}
continue;
}
-
+
try {
try {
final Constructor<? extends T> constructor = factoryImplClass
@@ -142,8 +146,7 @@
final LogRecord logRecord = new LogRecord(
Level.SEVERE, "J4P_000036");
logRecord.setParameters(new Object[] {
- factoryClass,
- line });
+ factoryClass, line });
logRecord.setThrown(e);
logger.log(logRecord);
}
@@ -179,7 +182,8 @@
}
return current;
}
-
- private FactoryUtil() { }
-
+
+ private FactoryUtil() {
+ }
+
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/MessagesFactory.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/MessagesFactory.java 2009-06-19 08:53:02 UTC (rev 69)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/MessagesFactory.java 2009-06-30 12:24:44 UTC (rev 70)
@@ -32,8 +32,7 @@
public final class MessagesFactory {
- public static final String READ_ONLY_PREFERENCE =
- "javax.portlet.faces.extension.jsf4portlets.READ_ONLY_PREFERENCE";
+ public static final String READ_ONLY_PREFERENCE = "javax.portlet.faces.extension.jsf4portlets.READ_ONLY_PREFERENCE";
private static final String FACES_MESSAGE_BUNDLE = "net.sf.jsf4portlets.Messages";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-06-19 08:53:04
|
Revision: 69
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=69&view=rev
Author: alonsoft
Date: 2009-06-19 08:53:02 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java
branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeResourceRequest.java
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java 2009-05-12 15:31:40 UTC (rev 68)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/scope/DefaultRequestScopeManager.java 2009-06-19 08:53:02 UTC (rev 69)
@@ -507,16 +507,17 @@
final PortletSession session = (PortletSession) context
.getSession(false);
if (session != null) {
+ final PortletConfig portletConfig = Util
+ .getPortletConfig(context);
+ final String scopePrefix = qualifyRequestScopeIdentifier(
+ portletConfig.getPortletName(), session.getId(), null,
+ null);
+ final String watcherKey = REQUEST_SCOPE_WATCHER + "/" + scopePrefix;
RequestScopeBindingListener listener = (RequestScopeBindingListener) session
- .getAttribute(REQUEST_SCOPE_WATCHER);
+ .getAttribute(watcherKey);
if (listener == null) {
- final PortletConfig portletConfig = Util
- .getPortletConfig(context);
- final String scopePrefix = qualifyRequestScopeIdentifier(
- portletConfig.getPortletName(), session.getId(), null,
- null);
listener = new RequestScopeBindingListener(scopePrefix);
- session.setAttribute(REQUEST_SCOPE_WATCHER + "/" + scopePrefix, listener);
+ session.setAttribute(watcherKey, listener);
}
}
}
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java 2009-05-12 15:31:40 UTC (rev 68)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/FactoryUtil.java 2009-06-19 08:53:02 UTC (rev 69)
@@ -1,3 +1,23 @@
+/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
+ * Copyright (C) 2009 A. Alonso Dominguez
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * A. Alonso Dominguez
+ * alo...@us...
+ */
package net.sf.jsf4portlets.util;
import java.io.BufferedReader;
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java 2009-05-12 15:31:40 UTC (rev 68)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeRenderRequest.java 2009-06-19 08:53:02 UTC (rev 69)
@@ -1,3 +1,23 @@
+/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
+ * Copyright (C) 2009 A. Alonso Dominguez
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * A. Alonso Dominguez
+ * alo...@us...
+ */
package net.sf.jsf4portlets.util.wrapper;
import java.util.Map;
Modified: branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeResourceRequest.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeResourceRequest.java 2009-05-12 15:31:40 UTC (rev 68)
+++ branches/jsf4portlets-2.0/jsf4portlets-impl/src/main/java/net/sf/jsf4portlets/util/wrapper/BridgeResourceRequest.java 2009-06-19 08:53:02 UTC (rev 69)
@@ -1,3 +1,23 @@
+/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
+ * Copyright (C) 2009 A. Alonso Dominguez
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * A. Alonso Dominguez
+ * alo...@us...
+ */
package net.sf.jsf4portlets.util.wrapper;
import java.io.BufferedReader;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-12 15:31:53
|
Revision: 68
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=68&view=rev
Author: alonsoft
Date: 2009-05-12 15:31:40 +0000 (Tue, 12 May 2009)
Log Message:
-----------
moving extensions to core implementation
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventPhaseListener.java
Removed Paths:
-------------
branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/config/
branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor
Modified: branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventPhaseListener.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventPhaseListener.java 2009-05-12 15:11:58 UTC (rev 67)
+++ branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventPhaseListener.java 2009-05-12 15:31:40 UTC (rev 68)
@@ -88,7 +88,7 @@
private void broadcastEvent(final FacesContext context,
final PortletEvent event) throws FacesException {
- final Configuration appConf = ConfigurationFactory
+ final Configuration appConf = ConfigurationFactory.getInstance()
.getConfiguration(context.getExternalContext());
for (final ManagedBean managedBean : appConf.getManagedBeans()) {
Class<?> beanClass;
Deleted: branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor 2009-05-12 15:11:58 UTC (rev 67)
+++ branches/jsf4portlets-2.0/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor 2009-05-12 15:31:40 UTC (rev 68)
@@ -1 +0,0 @@
-net.sf.jsf4portlets.ext.config.BridgeListenersProcessor
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-05 10:53:21
|
Revision: 66
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=66&view=rev
Author: alonsoft
Date: 2009-05-05 10:53:13 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Portlet 2.0 Bridge - First approach
Modified Paths:
--------------
branches/jsf4portlets-2.0/pom.xml
Property Changed:
----------------
branches/jsf4portlets-2.0/
Property changes on: branches/jsf4portlets-2.0
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
+ .settings
.classpath
.project
target*
Modified: branches/jsf4portlets-2.0/pom.xml
===================================================================
--- branches/jsf4portlets-2.0/pom.xml 2009-05-05 10:36:59 UTC (rev 65)
+++ branches/jsf4portlets-2.0/pom.xml 2009-05-05 10:53:13 UTC (rev 66)
@@ -27,7 +27,7 @@
<groupId>net.sf.jsf4portlets</groupId>
<artifactId>jsf4portlets-project</artifactId>
- <version>1.0-alpha-3-SNAPSHOT</version>
+ <version>2.0-beta-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -35,9 +35,9 @@
<url>http://jsf4portlets.sf.net/</url>
<scm>
- <connection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/trunk</connection>
- <developerConnection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/trunk</developerConnection>
- <url>http://jsf4portlets.svn.sourceforge.net/viewvc/jsf4portlets/trunk</url>
+ <connection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/branches/jsf4portlets-2.0</connection>
+ <developerConnection>scm:svn:https://jsf4portlets.svn.sourceforge.net/svnroot/jsf4portlets/branches/jsf4portlets-2.0</developerConnection>
+ <url>http://jsf4portlets.svn.sourceforge.net/viewvc/jsf4portlets/branches/jsf4portlets-2.0</url>
</scm>
<description>
@@ -216,7 +216,7 @@
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<scope>provided</scope>
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-05 10:37:08
|
Revision: 65
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=65&view=rev
Author: alonsoft
Date: 2009-05-05 10:36:59 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Portlet 2.0 Bridge - First approach
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml
Modified: branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml 2009-05-05 10:35:41 UTC (rev 64)
+++ branches/jsf4portlets-2.0/jsf4portlets-ext/pom.xml 2009-05-05 10:36:59 UTC (rev 65)
@@ -28,7 +28,7 @@
<parent>
<groupId>net.sf.jsf4portlets</groupId>
<artifactId>jsf4portlets-project</artifactId>
- <version>1.0-alpha-3-SNAPSHOT</version>
+ <version>2.0-beta-SNAPSHOT</version>
</parent>
<artifactId>jsf4portlets-ext</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-05 10:32:09
|
Revision: 63
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=63&view=rev
Author: alonsoft
Date: 2009-05-05 10:32:00 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Portlet 2.0 Bridge - First approach
Modified Paths:
--------------
branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
Added Paths:
-----------
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgeEventHandler.java
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgePublicRenderParameterHandler.java
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/event/
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/event/EventNavigationResult.java
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet2.0_bridge_faces1.2_faces-config-extension.xsd
Removed Paths:
-------------
branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd
Modified: branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml 2009-05-04 13:32:22 UTC (rev 62)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/pom.xml 2009-05-05 10:32:00 UTC (rev 63)
@@ -3,13 +3,12 @@
<parent>
<artifactId>jsf4portlets-project</artifactId>
<groupId>net.sf.jsf4portlets</groupId>
- <version>1.0-alpha-3-SNAPSHOT</version>
+ <version>2.0-beta-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsf4portlets</groupId>
<artifactId>jsf4portlets-api</artifactId>
<name>JSF 4 Portlets API</name>
- <version>1.0-alpha-3-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>javax.portlet</groupId>
Modified: branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java 2009-05-04 13:32:22 UTC (rev 62)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java 2009-05-05 10:32:00 UTC (rev 63)
@@ -22,10 +22,14 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
/**
* The <CODE>Bridge</CODE> interface is used by a portlet to execute a JSF
@@ -84,8 +88,9 @@
* <tt>DEFAULT</tt> indicates the bridge will delegate first and only render
* if the delegatee throws an exception/throwable.
*/
- public static final String RENDER_POLICY = BRIDGE_PACKAGE_PREFIX + "RENDER_POLICY";
-
+ public static final String RENDER_POLICY = BRIDGE_PACKAGE_PREFIX
+ + "RENDER_POLICY";
+
/**
* Context initialization parameter that defines the lifecycle ID used to
* identify the Faces Lifecycle used for this application
@@ -110,6 +115,10 @@
// hence to acquire one must include the portlet name within attribute name:
// BRIDGE_PACKAGE_PREFIX + context.getPortletName() + attributeName
+ public final static String BRIDGE_EVENT_HANDLER = "bridgeEventHandler";
+
+ public final static String BRIDGE_PUBLIC_RENDER_PARAMETER_HANDLER = "bridgePublicRenderParameterHandler";
+
/**
* PortletContext attribute that a portlet must set prior to calling the
* bridge's <tt>init()</tt> method to convey to the bridge the set of
@@ -368,7 +377,7 @@
* executing Faces within
*/
public static enum PortletPhase {
- ACTION_PHASE, RENDER_PHASE
+ ACTION_PHASE, EVENT_PHASE, RENDER_PHASE, RESOURCE_PHASE
}
/**
@@ -471,6 +480,9 @@
throws BridgeDefaultViewNotSpecifiedException,
BridgeUninitializedException, BridgeException;
+ public void doFacesRequest(EventRequest request, EventResponse response)
+ throws BridgeUninitializedException, BridgeException;
+
/**
* Called by the portlet when it wants the bridge to process a render
* request.
@@ -490,6 +502,10 @@
throws BridgeDefaultViewNotSpecifiedException,
BridgeUninitializedException, BridgeException;
+ public void doFacesRequest(ResourceRequest request,
+ ResourceResponse response) throws BridgeUninitializedException,
+ BridgeException;
+
/**
* Called by the portlet to take the bridge out of service. Once out of
* service, the bridge must be reinitialized before processing any further
Added: branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgeEventHandler.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgeEventHandler.java (rev 0)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgeEventHandler.java 2009-05-05 10:32:00 UTC (rev 63)
@@ -0,0 +1,11 @@
+package javax.portlet.faces;
+
+import javax.faces.context.FacesContext;
+import javax.portlet.Event;
+import javax.portlet.faces.event.EventNavigationResult;
+
+public interface BridgeEventHandler {
+
+ public EventNavigationResult handleEvent(FacesContext context, Event event);
+
+}
Added: branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgePublicRenderParameterHandler.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgePublicRenderParameterHandler.java (rev 0)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/BridgePublicRenderParameterHandler.java 2009-05-05 10:32:00 UTC (rev 63)
@@ -0,0 +1,9 @@
+package javax.portlet.faces;
+
+import javax.faces.context.FacesContext;
+
+public interface BridgePublicRenderParameterHandler {
+
+ public void processUpdates(FacesContext context);
+
+}
Modified: branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java 2009-05-04 13:32:22 UTC (rev 62)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java 2009-05-05 10:32:00 UTC (rev 63)
@@ -34,7 +34,10 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
import javax.portlet.GenericPortlet;
+import javax.portlet.MimeResponse;
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
@@ -44,6 +47,8 @@
import javax.portlet.PortletResponse;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
import javax.portlet.WindowState;
/**
@@ -123,7 +128,10 @@
private Class<? extends Bridge> facesBridgeClass = null;
private Bridge facesBridge = null;
+
private Map<String, String> defaultViewIdMap;
+ private BridgeEventHandler eventHandler = null;
+ private BridgePublicRenderParameterHandler publicRenderParamHandler = null;
/**
* Initialize generic faces portlet from portlet.xml
@@ -172,6 +180,21 @@
Bridge.BRIDGE_PACKAGE_PREFIX + getPortletName() + "."
+ Bridge.PRESERVE_ACTION_PARAMS,
preserveActionParameters);
+
+ final BridgeEventHandler eventHandler = getBridgeEventHandler();
+ if (eventHandler != null) {
+ getPortletContext().setAttribute(
+ Bridge.BRIDGE_PACKAGE_PREFIX + getPortletName() + "."
+ + Bridge.BRIDGE_EVENT_HANDLER, eventHandler);
+ }
+
+ final BridgePublicRenderParameterHandler paramHandler = getBridgePublicRenderParameterHandler();
+ if (paramHandler != null) {
+ getPortletContext().setAttribute(
+ Bridge.BRIDGE_PACKAGE_PREFIX + getPortletName() + "."
+ + Bridge.BRIDGE_PUBLIC_RENDER_PARAMETER_HANDLER,
+ paramHandler);
+ }
}
/**
@@ -210,7 +233,49 @@
return bridgeClassName;
}
- @SuppressWarnings("unchecked")
+ public BridgeEventHandler getBridgeEventHandler() {
+ if (eventHandler == null) {
+ final String handlerClassName = getPortletConfig()
+ .getInitParameter(
+ Bridge.BRIDGE_PACKAGE_PREFIX
+ + Bridge.BRIDGE_EVENT_HANDLER);
+ if (handlerClassName != null) {
+ final ClassLoader classLoader = Thread.currentThread()
+ .getContextClassLoader();
+ try {
+ final Class<?> clazz = classLoader
+ .loadClass(handlerClassName);
+ eventHandler = (BridgeEventHandler) clazz.newInstance();
+ } catch (final Exception e) {
+ eventHandler = null;
+ }
+ }
+ }
+ return eventHandler;
+ }
+
+ public BridgePublicRenderParameterHandler getBridgePublicRenderParameterHandler() {
+ if (publicRenderParamHandler == null) {
+ final String handlerClassName = getPortletConfig()
+ .getInitParameter(
+ Bridge.BRIDGE_PACKAGE_PREFIX
+ + Bridge.BRIDGE_PUBLIC_RENDER_PARAMETER_HANDLER);
+ if (handlerClassName != null) {
+ final ClassLoader classLoader = Thread.currentThread()
+ .getContextClassLoader();
+ try {
+ final Class<?> clazz = classLoader
+ .loadClass(handlerClassName);
+ publicRenderParamHandler = (BridgePublicRenderParameterHandler) clazz
+ .newInstance();
+ } catch (final Exception e) {
+ publicRenderParamHandler = null;
+ }
+ }
+ }
+ return publicRenderParamHandler;
+ }
+
public Map<String, String> getDefaultViewIdMap() {
if (defaultViewIdMap == null) {
defaultViewIdMap = new HashMap<String, String>();
@@ -300,6 +365,19 @@
}
@Override
+ public void processEvent(final EventRequest request,
+ final EventResponse response) throws PortletException, IOException {
+ doBridgeDispatch(request, response);
+ }
+
+ @Override
+ public void serveResource(final ResourceRequest request,
+ final ResourceResponse response) throws PortletException,
+ IOException {
+ doBridgeDispatch(request, response);
+ }
+
+ @Override
protected void doEdit(final RenderRequest request,
final RenderResponse response) throws PortletException,
java.io.IOException {
@@ -333,6 +411,37 @@
}
}
+ private void doBridgeDispatch(final ActionRequest request,
+ final ActionResponse response) throws PortletException {
+ // initial Bridge if not already active
+ initBridge();
+ // Push information for Bridge into request attributes
+ setBridgeRequestContext(request);
+ try {
+ facesBridge.doFacesRequest(request, response);
+ } catch (final BridgeException e) {
+ throw new PortletException(
+ "doBridgeDispatch failed: error from Bridge in executing the request",
+ e);
+ }
+ }
+
+ private void doBridgeDispatch(final EventRequest request,
+ final EventResponse response) throws PortletException {
+ // initial Bridge if not already active
+ initBridge();
+ // Push information for Bridge into request attributes
+ setBridgeRequestContext(request);
+
+ try {
+ facesBridge.doFacesRequest(request, response);
+ } catch (final BridgeException e) {
+ throw new PortletException(
+ "doBridgeDispatch failed: error from Bridge in executing the request",
+ e);
+ }
+ }
+
private void doBridgeDispatch(final RenderRequest request,
final RenderResponse response) throws PortletException {
// initial Bridge if not already active
@@ -352,12 +461,15 @@
}
- private void doBridgeDispatch(final ActionRequest request,
- final ActionResponse response) throws PortletException {
+ private void doBridgeDispatch(final ResourceRequest request,
+ final ResourceResponse response) throws PortletException {
// initial Bridge if not already active
initBridge();
// Push information for Bridge into request attributes
setBridgeRequestContext(request);
+
+ setResponseContentType(response, getResponseContentType(request),
+ getResponseCharacterSetEncoding(request));
try {
facesBridge.doFacesRequest(request, response);
} catch (final BridgeException e) {
@@ -365,7 +477,6 @@
"doBridgeDispatch failed: error from Bridge in executing the request",
e);
}
-
}
private boolean doNonFacesDispatch(final RenderRequest request,
@@ -432,7 +543,7 @@
}
}
- private void setResponseContentType(final RenderResponse response,
+ private void setResponseContentType(final MimeResponse response,
final String contentType, final String characterSet) {
if (contentType == null) {
return;
Added: branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/event/EventNavigationResult.java
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/event/EventNavigationResult.java (rev 0)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/src/main/java/javax/portlet/faces/event/EventNavigationResult.java 2009-05-05 10:32:00 UTC (rev 63)
@@ -0,0 +1,35 @@
+package javax.portlet.faces.event;
+
+public class EventNavigationResult {
+
+ private String fromAction = null;
+
+ private String outcome = null;
+
+ public EventNavigationResult() {
+ super();
+ }
+
+ public EventNavigationResult(final String fromAction, final String outcome) {
+ super();
+ this.fromAction = fromAction;
+ this.outcome = outcome;
+ }
+
+ public String getFromAction() {
+ return fromAction;
+ }
+
+ public void setFromAction(final String fromAction) {
+ this.fromAction = fromAction;
+ }
+
+ public String getOutcome() {
+ return outcome;
+ }
+
+ public void setOutcome(final String outcome) {
+ this.outcome = outcome;
+ }
+
+}
Deleted: branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd 2009-05-04 13:32:22 UTC (rev 62)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd 2009-05-05 10:32:00 UTC (rev 63)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2009 A. Alonso Dominguez
-
- This library is free software; you can redistribute it and/or
- modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- A. Alonso Dominguez
- alo...@us...
--->
-
-<xs:schema id="bridge" xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://jsf4portlets.sf.net/jsfportlet"
- attributeFormDefault="unqualified" elementFormDefault="qualified">
-
- <xs:element name="excluded-attributes">
- <xs:annotation>
- <xs:documentation>
- Portlet 1.0 Bridge specific application extension
- intented to collect specific attribute names or
- namespaces that this bridge shouldn't manage
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="excluded-attribute" type="xs:string"
- minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>
- Specific attribute name or namespace that
- shouldn't be managed by this bridge instance.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
-</xs:schema>
\ No newline at end of file
Copied: branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet2.0_bridge_faces1.2_faces-config-extension.xsd (from rev 62, branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd)
===================================================================
--- branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet2.0_bridge_faces1.2_faces-config-extension.xsd (rev 0)
+++ branches/jsf4portlets-2.0/jsf4portlets-api/src/main/resources/META-INF/portlet2.0_bridge_faces1.2_faces-config-extension.xsd 2009-05-05 10:32:00 UTC (rev 63)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
+ Copyright (C) 2009 A. Alonso Dominguez
+
+ This library is free software; you can redistribute it and/or
+ modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ A. Alonso Dominguez
+ alo...@us...
+-->
+
+<xs:schema id="bridge" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://jsf4portlets.sf.net/jsfportlet"
+ targetNamespace="http://jsf4portlets.sf.net/jsfportlet"
+ attributeFormDefault="unqualified" elementFormDefault="qualified">
+
+ <xs:element name="excluded-attributes">
+ <xs:annotation>
+ <xs:documentation>
+ Portlet 1.0 Bridge specific application extension
+ intented to collect specific attribute names or
+ namespaces that this bridge shouldn't manage
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="excluded-attribute" type="xs:string"
+ minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Specific attribute name or namespace that
+ shouldn't be managed by this bridge instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="public-parameter-mappings">
+ <xs:annotation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="public-parameter-mapping" type="tns:parameter-mappingType"
+ minOccurs="0" maxOccurs="unbounded"
+ />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="parameter-mappingType">
+ <xs:sequence>
+ <xs:element name="parameter" type="xs:string" />
+ <xs:element name="model-el" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-04 14:22:20
|
Revision: 62
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=62&view=rev
Author: alonsoft
Date: 2009-05-04 13:32:22 +0000 (Mon, 04 May 2009)
Log Message:
-----------
Branch for portlet 2.0 bridge
Added Paths:
-----------
branches/jsf4portlets-2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-04 13:27:29
|
Revision: 61
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=61&view=rev
Author: alonsoft
Date: 2009-05-04 13:27:28 +0000 (Mon, 04 May 2009)
Log Message:
-----------
Branch for portlet 1.0 bridge
Added Paths:
-----------
branches/jsf4portlets-1.0-beta/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-04 13:21:39
|
Revision: 60
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=60&view=rev
Author: alonsoft
Date: 2009-05-04 13:21:31 +0000 (Mon, 04 May 2009)
Log Message:
-----------
Clean up and package refactory
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-05-04 13:19:07 UTC (rev 59)
+++ trunk/pom.xml 2009-05-04 13:21:31 UTC (rev 60)
@@ -112,10 +112,14 @@
</repositories>
<modules>
- <module>jsf4portlets</module>
- <module>jsf4portlets-ext</module>
- <module>jsf4portlets-api</module>
- </modules>
+ <module>jsf4portlets-api</module>
+ <module>jsf4portlets-impl</module>
+ <module>jsf4portlets-ext</module>
+ </modules>
+ <organization>
+ <name>SourceForge.net</name>
+ <url>http://www.sourceforge.net</url>
+ </organization>
<build>
<defaultGoal>install</defaultGoal>
@@ -307,13 +311,6 @@
<version>0.1alpha4</version>
<scope>compile</scope>
<optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>net.sf.jsf4portlets</groupId>
- <artifactId>jsf4portlets</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
@@ -321,6 +318,19 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.jsf4portlets</groupId>
+ <artifactId>jsf4portlets-api</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsf4portlets</groupId>
+ <artifactId>jsf4portlets-impl</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-05-04 13:19:14
|
Revision: 59
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=59&view=rev
Author: alonsoft
Date: 2009-05-04 13:19:07 +0000 (Mon, 04 May 2009)
Log Message:
-----------
Support for bridge scope listeners added
Modified Paths:
--------------
trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties
Added Paths:
-----------
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/config/
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/config/BridgeListenersProcessor.java
trunk/jsf4portlets-ext/src/main/resources/META-INF/jsf4portlets_faces-config-extension.xsd
trunk/jsf4portlets-ext/src/main/resources/META-INF/services/
trunk/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor
Added: trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/config/BridgeListenersProcessor.java
===================================================================
--- trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/config/BridgeListenersProcessor.java (rev 0)
+++ trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/config/BridgeListenersProcessor.java 2009-05-04 13:19:07 UTC (rev 59)
@@ -0,0 +1,94 @@
+package net.sf.jsf4portlets.ext.config;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+import javax.faces.context.ExternalContext;
+import javax.portlet.PortletContext;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+import net.sf.jsf4portlets.event.RequestScopeListener;
+import net.sf.jsf4portlets.scope.RequestScopeManager;
+import net.sf.jsf4portlets.scope.RequestScopeManagerFactory;
+import net.sf.jsf4portlets.spi.ConfigurationProcessor;
+import net.sf.jsf4portlets.util.Util;
+import net.sf.jsf4portlets.util.XmlHelper;
+
+public class BridgeListenersProcessor implements ConfigurationProcessor {
+
+ private static final Logger logger = Logger.getLogger(
+ BridgeListenersProcessor.class.getPackage().getName(),
+ "net.sf.jsf4portlets.ext.LogMessages");
+
+ private static final String BRIDGE_EXT_NAMESPACE =
+ "http://jsf4portlets.sf.net/jsfportlet-ext";
+
+ public boolean acceptsResource(String resourceName) {
+ return (-1 != resourceName.indexOf("faces-config.xml"));
+ }
+
+ @SuppressWarnings("unchecked")
+ public void process(ExternalContext context, Document facesConfig)
+ throws IOException, SAXException {
+
+ PortletContext portletContext = (PortletContext) context.getContext();
+ RequestScopeManager rsm = RequestScopeManagerFactory.getInstance()
+ .getRequestScopeManager(portletContext);
+
+ Element listeners = getBridgeListenersElement(facesConfig);
+ if(listeners != null) {
+ List<Element> list = XmlHelper.getChildElements(listeners,
+ BRIDGE_EXT_NAMESPACE, "bridge-listener");
+ RequestScopeListener listener = null;
+ for(Element listenerElem : list) {
+ String listenerClassName = XmlHelper.getText(listenerElem);
+ Class<RequestScopeListener> listenerClass;
+ try {
+ listenerClass = (Class<RequestScopeListener>) Util.loadClass(
+ listenerClassName, this);
+ } catch (ClassNotFoundException e) {
+ if(logger.isLoggable(Level.SEVERE)) {
+ logger.log(Level.SEVERE, "J4PE_000004", listenerClassName);
+ }
+ continue;
+ }
+
+ try {
+ listener = listenerClass.newInstance();
+ } catch (Exception e) {
+ if(logger.isLoggable(Level.SEVERE)) {
+ LogRecord logRecord = new LogRecord(Level.SEVERE, "J4PE_000005");
+ logRecord.setParameters(new Object[]{ listenerClassName });
+ logRecord.setThrown(e);
+ logger.log(logRecord);
+ }
+ continue;
+ }
+
+ rsm.addRequestScopeListener(listener);
+ }
+ }
+ }
+
+ private Element getBridgeListenersElement(Document facesConfig) {
+ final Element application = XmlHelper.getChildElement(facesConfig
+ .getDocumentElement(), "lifecycle");
+ if (application == null) {
+ return null;
+ }
+ final Element extension = XmlHelper.getChildElement(application,
+ "lifecycle-extension");
+ if (extension == null) {
+ return null;
+ }
+ return XmlHelper.getChildElement(extension, BRIDGE_EXT_NAMESPACE,
+ "bridge-listeners");
+ }
+
+}
Added: trunk/jsf4portlets-ext/src/main/resources/META-INF/jsf4portlets_faces-config-extension.xsd
===================================================================
--- trunk/jsf4portlets-ext/src/main/resources/META-INF/jsf4portlets_faces-config-extension.xsd (rev 0)
+++ trunk/jsf4portlets-ext/src/main/resources/META-INF/jsf4portlets_faces-config-extension.xsd 2009-05-04 13:19:07 UTC (rev 59)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
+ Copyright (C) 2009 A. Alonso Dominguez
+
+ This library is free software; you can redistribute it and/or
+ modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ A. Alonso Dominguez
+ alo...@us...
+-->
+
+<xs:schema id="bridge-ext" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://jsf4portlets.sf.net/jsfportlet-ext"
+ attributeFormDefault="unqualified" elementFormDefault="qualified">
+
+ <xs:element name="bridge-listeners">
+ <xs:annotation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="bridge-listener" minOccurs="0"
+ maxOccurs="unbounded" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
Added: trunk/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor
===================================================================
--- trunk/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor (rev 0)
+++ trunk/jsf4portlets-ext/src/main/resources/META-INF/services/net.sf.jsf4portlets.spi.ConfigurationProcessor 2009-05-04 13:19:07 UTC (rev 59)
@@ -0,0 +1 @@
+net.sf.jsf4portlets.ext.config.BridgeListenersProcessor
\ No newline at end of file
Modified: trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties
===================================================================
--- trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties 2009-05-04 13:15:41 UTC (rev 58)
+++ trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties 2009-05-04 13:19:07 UTC (rev 59)
@@ -18,5 +18,8 @@
# A. Alonso Dominguez
# alo...@us...
#
-J4PE_000001=J4PE000001: PortletEvent \'{0}\' has been queued for portlet {1}.
-J4PE_000002=J4PE000002: Broadcasting event \'{0}\' to managed bean \"{1}\".
\ No newline at end of file
+J4PE_000001=J4PE000001: PortletEvent \"{0}\" has been queued for portlet {1}.
+J4PE_000002=J4PE000002: Broadcasting event \"{0}\" to managed bean \"{1}\".
+J4PE_000003=J4PE000003: Configuring bridge scope listener: {0}
+J4PE_000004=J4PE000004: Bridge scope listener \"{0}\" not found.
+J4PE_000005=J4PE000005: Error instantiating scope listener: {0}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-04-30 15:24:26
|
Revision: 56
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=56&view=rev
Author: alonsoft
Date: 2009-04-30 15:24:22 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Repaired bugs at spec API
Modified Paths:
--------------
trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java
trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
Added Paths:
-----------
trunk/jsf4portlets-api/src/main/resources/META-INF/
trunk/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd
Modified: trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java
===================================================================
--- trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java 2009-04-30 08:38:37 UTC (rev 55)
+++ trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/Bridge.java 2009-04-30 15:24:22 UTC (rev 56)
@@ -73,6 +73,20 @@
+ "MAX_MANAGED_REQUEST_SCOPES";
/**
+ * Context initialization parameter that defines the policy the bridge uses
+ * for rendering. Parameter value is the string representaiton of one of the
+ * <tt>BridgeRenderPolicy</tt> enum values.
+ * <p>
+ * Allows a portlet to control render delgation. A value of
+ * <tt>ALWAYS_DELEGATE</tt> indicates the bridge doesn't render itself, it
+ * merely delegates. A value of <tt>NEVER_DELEGATE</tt> indicates the bridge
+ * never delegates, rather it always overrides and renders. A value of
+ * <tt>DEFAULT</tt> indicates the bridge will delegate first and only render
+ * if the delegatee throws an exception/throwable.
+ */
+ public static final String RENDER_POLICY = BRIDGE_PACKAGE_PREFIX + "RENDER_POLICY";
+
+ /**
* Context initialization parameter that defines the lifecycle ID used to
* identify the Faces Lifecycle used for this application
*/
@@ -143,20 +157,6 @@
*/
public static final String PRESERVE_ACTION_PARAMS = "preserveActionParams";
- /**
- * Context initialization parameter that defines the policy the bridge uses
- * for rendering. Parameter value is the string representaiton of one of the
- * <tt>BridgeRenderPolicy</tt> enum values.
- * <p>
- * Allows a portlet to control render delgation. A value of
- * <tt>ALWAYS_DELEGATE</tt> indicates the bridge doesn't render itself, it
- * merely delegates. A value of <tt>NEVER_DELEGATE</tt> indicates the bridge
- * never delegates, rather it always overrides and renders. A value of
- * <tt>DEFAULT</tt> indicates the bridge will delegate first and only render
- * if the delegatee throws an exception/throwable.
- */
- public static final String RENDER_POLICY = "renderPolicy";
-
// Following are the names of request attributes set by the bridge during
// its own request/response processing.
Modified: trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java
===================================================================
--- trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java 2009-04-30 08:38:37 UTC (rev 55)
+++ trunk/jsf4portlets-api/src/main/java/javax/portlet/faces/GenericFacesPortlet.java 2009-04-30 15:24:22 UTC (rev 56)
@@ -417,7 +417,7 @@
final String defaultViewId = getDefaultViewIdMap().get(
request.getPortletMode().toString());
- return (defaultViewId != null);
+ return (defaultViewId == null);
}
private void setBridgeRequestContext(final PortletRequest request) {
Copied: trunk/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd (from rev 51, trunk/jsf4portlets-impl/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd)
===================================================================
--- trunk/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd (rev 0)
+++ trunk/jsf4portlets-api/src/main/resources/META-INF/portlet1.0_bridge_faces1.2_faces-config-extension.xsd 2009-04-30 15:24:22 UTC (rev 56)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
+ Copyright (C) 2009 A. Alonso Dominguez
+
+ This library is free software; you can redistribute it and/or
+ modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ A. Alonso Dominguez
+ alo...@us...
+-->
+
+<xs:schema id="bridge" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://jsf4portlets.sf.net/jsfportlet"
+ attributeFormDefault="unqualified" elementFormDefault="qualified">
+
+ <xs:element name="excluded-attributes">
+ <xs:annotation>
+ <xs:documentation>
+ Portlet 1.0 Bridge specific application extension
+ intented to collect specific attribute names or
+ namespaces that this bridge shouldn't manage
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="excluded-attribute" type="xs:string"
+ minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ Specific attribute name or namespace that
+ shouldn't be managed by this bridge instance.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-04-30 08:30:44
|
Revision: 54
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=54&view=rev
Author: alonsoft
Date: 2009-04-30 08:30:41 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Package refactoring
Modified Paths:
--------------
trunk/jsf4portlets-ext/pom.xml
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventFacesPortlet.java
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventPhaseListener.java
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletEvent.java
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletEventHelper.java
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletListener.java
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/FaceletPortletViewHandler.java
trunk/jsf4portlets-ext/src/main/resources/META-INF/faces-config.xml
Added Paths:
-----------
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/
trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/
trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties
Removed Paths:
-------------
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/event/
trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/facelets/
trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ExtLogMessages.properties
Property Changed:
----------------
trunk/jsf4portlets-ext/
Property changes on: trunk/jsf4portlets-ext
___________________________________________________________________
Added: svn:ignore
+ .settings*
target*
.classpath
.project
Modified: trunk/jsf4portlets-ext/pom.xml
===================================================================
--- trunk/jsf4portlets-ext/pom.xml 2009-04-30 07:50:27 UTC (rev 53)
+++ trunk/jsf4portlets-ext/pom.xml 2009-04-30 08:30:41 UTC (rev 54)
@@ -72,11 +72,6 @@
<artifactId>commons-digester</artifactId>
</dependency>
- <dependency>
- <groupId>net.sf.jsf4portlets</groupId>
- <artifactId>jsf4portlets</artifactId>
- </dependency>
-
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
@@ -103,6 +98,15 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.jsf4portlets</groupId>
+ <artifactId>jsf4portlets-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsf4portlets</groupId>
+ <artifactId>jsf4portlets-impl</artifactId>
</dependency>
</dependencies>
Modified: trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventFacesPortlet.java
===================================================================
--- trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/event/EventFacesPortlet.java 2009-04-26 19:19:02 UTC (rev 48)
+++ trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventFacesPortlet.java 2009-04-30 08:30:41 UTC (rev 54)
@@ -1,5 +1,5 @@
/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- * Copyright (C) 2008 A. Alonso Dominguez
+ * Copyright (C) 2009 A. Alonso Dominguez
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,7 @@
* A. Alonso Dominguez
* alo...@us...
*/
-package net.sf.jsf4portlets.event;
+package net.sf.jsf4portlets.ext.event;
import java.util.LinkedList;
import java.util.Queue;
@@ -32,45 +32,45 @@
import com.sun.portal.portletappengine.ipc.EventResponse;
import com.sun.portal.portletappengine.ipc.PortletEventListener;
-public class EventFacesPortlet extends GenericFacesPortlet
-implements PortletEventListener {
+public class EventFacesPortlet extends GenericFacesPortlet implements
+ PortletEventListener {
- protected static final String QUEUED_EVENTS =
- "javax.portlet.faces.extension.jsf4portlets.QUEUED_EVENTS";
+ protected static final String QUEUED_EVENTS = "javax.portlet.faces.extension.jsf4portlets.QUEUED_EVENTS";
- private final Logger logger = Logger.getLogger(
- EventFacesPortlet.class.getPackage().getName(),
- "net.sf.jsf4portlets.ExtLogMessages");
-
- public void handleEvent(EventRequest request, EventResponse response) {
- Queue<PortletEvent> queue = getEventQueue(request);
- PortletEvent event = new PortletEvent(this,
- request.getEventName(), request.getEventData());
+ private static final Logger logger = Logger.getLogger(
+ EventFacesPortlet.class.getPackage().getName(),
+ "net.sf.jsf4portlets.ext.LogMessages");
+
+ public void handleEvent(final EventRequest request,
+ final EventResponse response) {
+ final Queue<PortletEvent> queue = getEventQueue(request);
+ final PortletEvent event = new PortletEvent(this, request
+ .getEventName(), request.getEventData());
queue.add(event);
- if(logger.isLoggable(Level.FINER)) {
- logger.log(Level.FINER, "J4PE_000001", new Object[]{
- event.getEventName(), getPortletName()
- });
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "J4PE_000001", new Object[] {
+ event.getEventName(), getPortletName() });
}
}
-
+
/**
- * Obtains an event queue from the portlet session scope
- * related to the given <code>EventRequest</code>.
+ * Obtains an event queue from the portlet session scope related to the
+ * given <code>EventRequest</code>.
*
- * @param request the <code>EventRequest</code>
+ * @param request
+ * the <code>EventRequest</code>
* @return an event queue
*/
@SuppressWarnings("unchecked")
- private Queue<PortletEvent> getEventQueue(EventRequest request) {
- PortletSession session = request.getPortletSession(true);
+ private Queue<PortletEvent> getEventQueue(final EventRequest request) {
+ final PortletSession session = request.getPortletSession(true);
Queue<PortletEvent> queue = (Queue<PortletEvent>) session
.getAttribute(QUEUED_EVENTS);
- if(queue == null) {
+ if (queue == null) {
queue = new LinkedList<PortletEvent>();
session.setAttribute(QUEUED_EVENTS, queue);
}
return queue;
}
-
+
}
Modified: trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventPhaseListener.java
===================================================================
--- trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/event/EventPhaseListener.java 2009-04-26 19:19:02 UTC (rev 48)
+++ trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/EventPhaseListener.java 2009-04-30 08:30:41 UTC (rev 54)
@@ -1,5 +1,5 @@
/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- * Copyright (C) 2008 A. Alonso Dominguez
+ * Copyright (C) 2009 A. Alonso Dominguez
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,7 @@
* A. Alonso Dominguez
* alo...@us...
*/
-package net.sf.jsf4portlets.event;
+package net.sf.jsf4portlets.ext.event;
import java.util.Queue;
import java.util.logging.Level;
@@ -40,27 +40,32 @@
public class EventPhaseListener implements PhaseListener {
- private final Logger logger = Logger.getLogger(
- EventPhaseListener.class.getPackage().getName(),
- "net.sf.jsf4portlets.ExtLogMessages");
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2824847158416465098L;
+
+ private static final Logger logger = Logger.getLogger(
+ EventPhaseListener.class.getPackage().getName(),
+ "net.sf.jsf4portlets.ext.LogMessages");
- public void afterPhase(PhaseEvent event) {
- if(PhaseId.RESTORE_VIEW.equals(event.getPhaseId())) {
- FacesContext context = event.getFacesContext();
+ public void afterPhase(final PhaseEvent event) {
+ if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId())) {
+ final FacesContext context = event.getFacesContext();
broadcast(context);
-
- context.getExternalContext().getSessionMap()
- .remove(EventFacesPortlet.QUEUED_EVENTS);
+
+ context.getExternalContext().getSessionMap().remove(
+ EventFacesPortlet.QUEUED_EVENTS);
}
}
- public void beforePhase(PhaseEvent event) {
- if(PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) {
- FacesContext context = event.getFacesContext();
+ public void beforePhase(final PhaseEvent event) {
+ if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) {
+ final FacesContext context = event.getFacesContext();
broadcast(context);
-
- context.getExternalContext().getSessionMap()
- .remove(EventFacesPortlet.QUEUED_EVENTS);
+
+ context.getExternalContext().getSessionMap().remove(
+ EventFacesPortlet.QUEUED_EVENTS);
}
}
@@ -69,57 +74,55 @@
}
@SuppressWarnings("unchecked")
- private void broadcast(FacesContext context) {
- Queue<PortletEvent> queue = (Queue<PortletEvent>) context
- .getExternalContext().getSessionMap().get(EventFacesPortlet.QUEUED_EVENTS);
- if(queue != null) {
+ private void broadcast(final FacesContext context) {
+ final Queue<PortletEvent> queue = (Queue<PortletEvent>) context
+ .getExternalContext().getSessionMap().get(
+ EventFacesPortlet.QUEUED_EVENTS);
+ if (queue != null) {
PortletEvent event;
- while(null != (event = queue.poll())) {
+ while (null != (event = queue.poll())) {
broadcastEvent(context, event);
}
}
}
-
- private void broadcastEvent(FacesContext context, PortletEvent event)
- throws FacesException {
- Configuration appConf = ConfigurationFactory
+
+ private void broadcastEvent(final FacesContext context,
+ final PortletEvent event) throws FacesException {
+ final Configuration appConf = ConfigurationFactory
.getConfiguration(context.getExternalContext());
- for(ManagedBean managedBean : appConf.getManagedBeans()) {
+ for (final ManagedBean managedBean : appConf.getManagedBeans()) {
Class<?> beanClass;
try {
beanClass = Util.loadClass(managedBean.getClassName(), this);
- } catch(ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
throw new FacesException(e);
}
-
- if(PortletListener.class.isAssignableFrom(beanClass)) {
- Object bean = resolveManagedBean(context,
- managedBean.getName(), beanClass);
+
+ if (PortletListener.class.isAssignableFrom(beanClass)) {
+ final Object bean = resolveManagedBean(context, managedBean
+ .getName(), beanClass);
assert bean != null;
-
- if(logger.isLoggable(Level.FINER)) {
- logger.log(Level.FINER, "J4PE_000002", new Object[]{
- event.getEventName(), managedBean.getName()
- });
+
+ if (logger.isLoggable(Level.FINER)) {
+ logger.log(Level.FINER, "J4PE_000002", new Object[] {
+ event.getEventName(), managedBean.getName() });
}
((PortletListener) bean).processPortlet(event);
}
}
}
-
- private Object resolveManagedBean(FacesContext context,
- String name, Class<?> beanClass)
- throws FacesException {
- ExpressionFactory ef = context.getApplication()
+
+ private Object resolveManagedBean(final FacesContext context,
+ final String name, final Class<?> beanClass) throws FacesException {
+ final ExpressionFactory ef = context.getApplication()
.getExpressionFactory();
try {
- ValueExpression ve = ef.createValueExpression(
- context.getELContext(), "#{" + name + "}",
- beanClass);
+ final ValueExpression ve = ef.createValueExpression(context
+ .getELContext(), "#{" + name + "}", beanClass);
return beanClass.cast(ve.getValue(context.getELContext()));
- } catch(ELException e) {
+ } catch (final ELException e) {
throw new FacesException(e);
}
}
-
+
}
Modified: trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletEvent.java
===================================================================
--- trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/event/PortletEvent.java 2009-04-26 19:19:02 UTC (rev 48)
+++ trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletEvent.java 2009-04-30 08:30:41 UTC (rev 54)
@@ -1,5 +1,5 @@
/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- * Copyright (C) 2008 A. Alonso Dominguez
+ * Copyright (C) 2009 A. Alonso Dominguez
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,31 +18,36 @@
* A. Alonso Dominguez
* alo...@us...
*/
-package net.sf.jsf4portlets.event;
+package net.sf.jsf4portlets.ext.event;
import java.util.EventObject;
import javax.portlet.Portlet;
/**
- * Representation of the event information received
- * by the portlet and broadcasted to the application
- * managed beans
+ * Representation of the event information received by the portlet and
+ * broadcasted to the application managed beans
*
- * @author A. Alonso Domínguez
- *
+ * @author A. Alonso Dominguez
+ *
*/
public class PortletEvent extends EventObject {
- private String eventName;
- private Object eventData;
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3692617786280095918L;
- public PortletEvent(Portlet source, String eventName, Object eventData) {
+ private final String eventName;
+ private final Object eventData;
+
+ public PortletEvent(final Portlet source, final String eventName,
+ final Object eventData) {
super(source);
this.eventName = eventName;
this.eventData = eventData;
}
-
+
/**
* Obtains the portlet which received the event
*
@@ -62,13 +67,12 @@
}
/**
- * Obtains the object which represents the
- * event data
+ * Obtains the object which represents the event data
*
* @return the event data
*/
public Object getEventData() {
return eventData;
}
-
+
}
Modified: trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletEventHelper.java
===================================================================
--- trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/event/PortletEventHelper.java 2009-04-26 19:19:02 UTC (rev 48)
+++ trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletEventHelper.java 2009-04-30 08:30:41 UTC (rev 54)
@@ -1,5 +1,5 @@
/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- * Copyright (C) 2008 A. Alonso Dominguez
+ * Copyright (C) 2009 A. Alonso Dominguez
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,7 @@
* A. Alonso Dominguez
* alo...@us...
*/
-package net.sf.jsf4portlets.event;
+package net.sf.jsf4portlets.ext.event;
import java.io.Serializable;
@@ -31,29 +31,29 @@
public final class PortletEventHelper {
- private FacesContext context;
-
- public PortletEventHelper(FacesContext context) {
+ private final FacesContext context;
+
+ public PortletEventHelper(final FacesContext context) {
this.context = context;
}
-
- public void fireEvent(String name, Object data)
- throws FacesException {
- if(!(data instanceof Serializable)) {
+
+ public void fireEvent(final String name, final Object data)
+ throws FacesException {
+ if (!(data instanceof Serializable)) {
throw new IllegalArgumentException();
}
-
- PortletRequest request = (PortletRequest) context
- .getExternalContext().getRequest();
- PortletEventBroker broker = new PortletEventBroker(request);
+
+ final PortletRequest request = (PortletRequest) context
+ .getExternalContext().getRequest();
+ final PortletEventBroker broker = new PortletEventBroker(request);
com.sun.portal.portletappengine.ipc.PortletEvent event;
try {
event = broker.createEvent(name);
- } catch(EventNotRegisteredException e) {
+ } catch (final EventNotRegisteredException e) {
throw new FacesException(e);
}
event.setEventData((Serializable) data);
event.fire();
}
-
+
}
Modified: trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletListener.java
===================================================================
--- trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/event/PortletListener.java 2009-04-26 19:19:02 UTC (rev 48)
+++ trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/event/PortletListener.java 2009-04-30 08:30:41 UTC (rev 54)
@@ -1,5 +1,5 @@
/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- * Copyright (C) 2008 A. Alonso Dominguez
+ * Copyright (C) 2009 A. Alonso Dominguez
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,12 +18,12 @@
* A. Alonso Dominguez
* alo...@us...
*/
-package net.sf.jsf4portlets.event;
+package net.sf.jsf4portlets.ext.event;
import java.util.EventListener;
public interface PortletListener extends EventListener {
public void processPortlet(PortletEvent event);
-
+
}
Modified: trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/FaceletPortletViewHandler.java
===================================================================
--- trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/facelets/FaceletPortletViewHandler.java 2009-04-26 19:19:02 UTC (rev 48)
+++ trunk/jsf4portlets-ext/src/main/java/net/sf/jsf4portlets/ext/facelets/FaceletPortletViewHandler.java 2009-04-30 08:30:41 UTC (rev 54)
@@ -1,5 +1,5 @@
/* JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- * Copyright (C) 2008 A. Alonso Dominguez
+ * Copyright (C) 2009 A. Alonso Dominguez
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,15 +18,15 @@
* A. Alonso Dominguez
* alo...@us...
*/
-package net.sf.jsf4portlets.facelets;
+package net.sf.jsf4portlets.ext.facelets;
import java.io.IOException;
import java.io.StringWriter;
import javax.faces.FacesException;
import javax.faces.application.ViewHandler;
+import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.faces.context.ExternalContext;
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
import javax.portlet.RenderRequest;
@@ -35,34 +35,36 @@
import com.sun.facelets.FaceletViewHandler;
public class FaceletPortletViewHandler extends FaceletViewHandler {
-
- public FaceletPortletViewHandler(ViewHandler parent) {
+
+ public FaceletPortletViewHandler(final ViewHandler parent) {
super(parent);
}
-
- protected ResponseWriter createResponseWriter(FacesContext context)
- throws FacesException, IOException {
- ExternalContext extContext = context.getExternalContext();
- RenderKit renderKit = context.getRenderKit();
-
- RenderRequest request = (RenderRequest) extContext.getRequest();
- RenderResponse response = (RenderResponse) extContext.getResponse();
-
+
+ @Override
+ protected ResponseWriter createResponseWriter(final FacesContext context)
+ throws FacesException, IOException {
+ final ExternalContext extContext = context.getExternalContext();
+ final RenderKit renderKit = context.getRenderKit();
+
+ final RenderRequest request = (RenderRequest) extContext.getRequest();
+ final RenderResponse response = (RenderResponse) extContext
+ .getResponse();
+
String contentType = request.getResponseContentType();
- if(contentType == null) {
+ if (contentType == null) {
contentType = "text/html";
}
-
+
String encoding = response.getCharacterEncoding();
- if(encoding == null) {
+ if (encoding == null) {
encoding = "ISO-8859-1";
}
-
+
ResponseWriter writer = renderKit.createResponseWriter(
new StringWriter(), contentType, encoding);
contentType = writer.getContentType();
response.setContentType(contentType);
-
+
writer = writer.cloneWithWriter(response.getWriter());
return writer;
}
Modified: trunk/jsf4portlets-ext/src/main/resources/META-INF/faces-config.xml
===================================================================
--- trunk/jsf4portlets-ext/src/main/resources/META-INF/faces-config.xml 2009-04-30 07:50:27 UTC (rev 53)
+++ trunk/jsf4portlets-ext/src/main/resources/META-INF/faces-config.xml 2009-04-30 08:30:41 UTC (rev 54)
@@ -2,7 +2,7 @@
<!--
JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
- Copyright (C) 2008 A. Alonso Dominguez
+ Copyright (C) 2009 A. Alonso Dominguez
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
<lifecycle>
<phase-listener>
- net.sf.jsf4portlets.event.EventPhaseListener
+ net.sf.jsf4portlets.ext.event.EventPhaseListener
</phase-listener>
</lifecycle>
Deleted: trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ExtLogMessages.properties
===================================================================
--- trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ExtLogMessages.properties 2009-04-30 07:50:27 UTC (rev 53)
+++ trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ExtLogMessages.properties 2009-04-30 08:30:41 UTC (rev 54)
@@ -1,22 +0,0 @@
-# JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
-# Copyright (C) 2008 A. Alonso Dominguez
-#
-# This library is free software; you can redistribute it and/or
-# modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# A. Alonso Dominguez
-# alo...@us...
-#
-J4PE_000001=J4PE000001: PortletEvent \'{0}\' has been queued for portlet {1}.
-J4PE_000002=J4PE000002: Broadcasting event \'{0}\' to managed bean \"{1}\".
\ No newline at end of file
Copied: trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties (from rev 48, trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ExtLogMessages.properties)
===================================================================
--- trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties (rev 0)
+++ trunk/jsf4portlets-ext/src/main/resources/net/sf/jsf4portlets/ext/LogMessages.properties 2009-04-30 08:30:41 UTC (rev 54)
@@ -0,0 +1,22 @@
+# JSF 4 Portlets - JSF Portlet Bridge (JSR-301)
+# Copyright (C) 2009 A. Alonso Dominguez
+#
+# This library is free software; you can redistribute it and/or
+# modify it under 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# A. Alonso Dominguez
+# alo...@us...
+#
+J4PE_000001=J4PE000001: PortletEvent \'{0}\' has been queued for portlet {1}.
+J4PE_000002=J4PE000002: Broadcasting event \'{0}\' to managed bean \"{1}\".
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-04-29 15:58:23
|
Revision: 52
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=52&view=rev
Author: alonsoft
Date: 2009-04-29 15:58:20 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
Removed Paths:
-------------
trunk/jsf4portlets/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2009-04-29 15:50:26
|
Revision: 50
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=50&view=rev
Author: alonsoft
Date: 2009-04-29 15:50:24 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
Changed module name
Added Paths:
-----------
trunk/jsf4portlets-impl/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2008-10-19 13:57:15
|
Revision: 46
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=46&view=rev
Author: alonsoft
Date: 2008-10-19 13:57:13 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
Repairing portal versions
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-10-19 13:53:14 UTC (rev 45)
+++ trunk/pom.xml 2008-10-19 13:57:13 UTC (rev 46)
@@ -281,7 +281,7 @@
<dependency>
<groupId>com.sun.portal.portletcontainer</groupId>
<artifactId>container</artifactId>
- <version>${openportal.version}</version>
+ <version>${openportal-container.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -326,5 +326,6 @@
<properties>
<openportal.version>2.0-m4</openportal.version>
+ <openportal-container.version>1.1-m4</openportal-container.version>
</properties>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2008-10-19 13:53:24
|
Revision: 45
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=45&view=rev
Author: alonsoft
Date: 2008-10-19 13:53:14 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
Updating portlet container versions
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-10-19 13:37:16 UTC (rev 44)
+++ trunk/pom.xml 2008-10-19 13:53:14 UTC (rev 45)
@@ -281,21 +281,21 @@
<dependency>
<groupId>com.sun.portal.portletcontainer</groupId>
<artifactId>container</artifactId>
- <version>1.0</version>
+ <version>${openportal.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.portal.portletcontainer</groupId>
<artifactId>portletcontainer</artifactId>
- <version>1.0</version>
+ <version>${openportal.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.portal.portletcontainer</groupId>
<artifactId>portletappengine</artifactId>
- <version>1.0</version>
+ <version>${openportal.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -324,4 +324,7 @@
</dependencies>
</dependencyManagement>
+ <properties>
+ <openportal.version>2.0-m4</openportal.version>
+ </properties>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <alo...@us...> - 2008-10-19 13:37:26
|
Revision: 44
http://jsf4portlets.svn.sourceforge.net/jsf4portlets/?rev=44&view=rev
Author: alonsoft
Date: 2008-10-19 13:37:16 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
Reparing compilation failures
Modified Paths:
--------------
trunk/jsf4portlets/pom.xml
Modified: trunk/jsf4portlets/pom.xml
===================================================================
--- trunk/jsf4portlets/pom.xml 2008-10-19 13:31:32 UTC (rev 43)
+++ trunk/jsf4portlets/pom.xml 2008-10-19 13:37:16 UTC (rev 44)
@@ -81,6 +81,11 @@
<artifactId>portlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
