[jboss-svn-commits] JBL Code SVN: r15511 - in labs/jbosslabs/trunk/portal-extensions: configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 2 08:54:41 EDT 2007
Author: szimano
Date: 2007-10-02 08:54:41 -0400 (Tue, 02 Oct 2007)
New Revision: 15511
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-api-1.1.5.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-api-1.2.0.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-impl-1.1.5.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-impl-1.2.0.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/tomahawk-1.1.6.jar
Modified:
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
Log:
JSF action problem solved + wiki 1.1.5 change
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-api-1.1.5.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-api-1.1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-api-1.2.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-api-1.2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-impl-1.1.5.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-impl-1.1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-impl-1.2.0.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/myfaces-impl-1.2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/tomahawk-1.1.6.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/myfaces/jars/tomahawk-1.1.6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml 2007-10-02 12:03:57 UTC (rev 15510)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml 2007-10-02 12:54:41 UTC (rev 15511)
@@ -712,8 +712,8 @@
optional-attribute-name="DynamicLoginConfig"
proxy-type="attribute">portal:service=JAASLoginModule</depends>
</mbean>
-
- <!-- Command factories -->
+
+ <!-- Command factories -->
<mbean
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
name="portal:commandFactory=Delegating"
@@ -854,9 +854,9 @@
optional-attribute-name="DelegateFactory"
proxy-type="attribute">portal:commandFactory=Ajax</depends>
</mbean>
+
+ <!-- LABS command factories -->
- <!-- LABS command factories -->
-
<mbean
code="org.jboss.labs.mapper.command.MainCF"
name="portal:commandFactory=LabsMain"
@@ -1093,7 +1093,7 @@
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
</mbean>
-
+
<!-- The federating portlet invoker -->
<mbean
code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml 2007-10-02 12:03:57 UTC (rev 15510)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml 2007-10-02 12:54:41 UTC (rev 15511)
@@ -7,30 +7,30 @@
<!-- Default war-project goals -->
<goal name="all">
- <!-- <attainGoal name="prj-all" /> -->
+ <attainGoal name="prj-all" />
</goal>
<goal name="build">
-<!--
+
<ant:copy tofile="src/web/WEB-INF/portlet.xml" file="src/web/WEB-INF/portlet.template.xml" overwrite="true"/>
<ant:replace file="src/web/WEB-INF/portlet.xml" propertyFile="kosmos.properties">
<ant:replacefilter token="#{kosmos.server.address}" property="kosmos.server.address"/>
</ant:replace>
<attainGoal name="prj-war-build" />
--->
+
</goal>
<goal name="deploy">
-<!--
+
<attainGoal name="prj-war-deploy" />
<ant:copy todir="${local.deploy.dir}" file="../binaries/maven-repo-addons/hessian/jars/hessian-3.0.13.jar" overwrite="false"/>
<ant:copy todir="${local.deploy.dir}" file="../binaries/maven-repo-addons/kosmos/jars/kosmos-portlet.jar" overwrite="false"/>
--->
+
</goal>
<goal name="clean">
- <!-- <attainGoal name="prj-clean" /> -->
+ <attainGoal name="prj-clean" />
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2007-10-02 12:03:57 UTC (rev 15510)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2007-10-02 12:54:41 UTC (rev 15511)
@@ -126,7 +126,7 @@
int lastSlash = rest.lastIndexOf('/');
if (lastSlash != -1) {
String lastToken = rest.substring(lastSlash + 1);
- if (!lastToken.contains(".") && !lastToken.equals("")) {
+ if (lastToken.contains(".") && !lastToken.equals("")) {
sendRedirect(invocation, parser.getFullPath() + "/");
return null;
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-10-02 12:03:57 UTC (rev 15510)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-10-02 12:54:41 UTC (rev 15511)
@@ -158,17 +158,23 @@
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>tomahawk</artifactId>
- <version>1.1.3</version>
+ <version>1.1.6</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-10-02 12:03:57 UTC (rev 15510)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-10-02 12:54:41 UTC (rev 15511)
@@ -167,6 +167,10 @@
facesContext.release();
handleExceptionFromLifecycle(e);
}
+ finally
+ {
+ saveRequestAttributes(request);
+ }
}
private void processAttachments(ActionRequest request,
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-10-02 12:03:57 UTC (rev 15510)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-10-02 12:54:41 UTC (rev 15511)
@@ -4,6 +4,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <context-param>
+ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<!-- <context-param>
<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
<param-value>com.sun.facelets.FaceletViewHandler</param-value>
More information about the jboss-svn-commits
mailing list