You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/09/27 02:24:42 UTC
svn commit: r291797 [1/3] - in /portals/jetspeed-2/trunk: ./
applications/jsf-demo-myfaces/ applications/jsf-demo-myfaces/src/webapp/
applications/jsf-demo/
applications/jsf-demo/src/java/org/apache/portals/applications/desktop/resources/
applications/...
Author: sgala
Date: Mon Sep 26 17:24:24 2005
New Revision: 291797
URL: http://svn.apache.org/viewcvs?rev=291797&view=rev
Log:
bump myfaces to 1.1.0, plus changes to ease the movement to portals-bridges of this demo war.
Added:
portals/jetspeed-2/trunk/applications/jsf-demo/src/java/org/apache/portals/applications/desktop/resources/Calendar_es.properties
portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/tld/
portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/tld/myfaces_ext.tld
Modified:
portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml
portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/greeting.jsp (contents, props changed)
portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/index.jsp (props changed)
portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/response.jsp (contents, props changed)
portals/jetspeed-2/trunk/applications/jsf-demo/project.xml
portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp
portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp
portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/greeting.jsp
portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/response.jsp
portals/jetspeed-2/trunk/project.properties
Modified: portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml?rev=291797&r1=291796&r2=291797&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/project.xml Mon Sep 26 17:24:24 2005
@@ -85,9 +85,9 @@
</dependency>
<dependency>
<id>log4j</id>
- <version>1.2.8</version>
+ <version>${log4j.version}</version>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${log4j.include}</war.bundle>
</properties>
</dependency>
@@ -108,10 +108,10 @@
<dependency>
<id>commons-logging</id>
- <version>1.0.3</version>
+ <version>${commons.logging.version}</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/greeting.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/greeting.jsp?rev=291797&r1=291796&r2=291797&view=diff
==============================================================================
Binary files - no diff available.
Propchange: portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/greeting.jsp
('svn:mime-type' removed)
Propchange: portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/index.jsp
('svn:mime-type' removed)
Modified: portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/response.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/response.jsp?rev=291797&r1=291796&r2=291797&view=diff
==============================================================================
Binary files - no diff available.
Propchange: portals/jetspeed-2/trunk/applications/jsf-demo-myfaces/src/webapp/response.jsp
('svn:mime-type' removed)
Modified: portals/jetspeed-2/trunk/applications/jsf-demo/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo/project.xml?rev=291797&r1=291796&r2=291797&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jsf-demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/jsf-demo/project.xml Mon Sep 26 17:24:24 2005
@@ -84,27 +84,34 @@
</dependency>
<dependency>
<id>log4j</id>
- <version>1.2.8</version>
+ <version>${log4j.version}</version>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${log4j.include}</war.bundle>
</properties>
</dependency>
<dependency>
- <id>myfaces:myfaces</id>
+ <id>myfaces:myfaces-jsf-api</id>
<version>${myfaces.version}</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <id>myfaces:myfaces-jsf-api</id>
+ <id>myfaces:myfaces-impl</id>
<version>${myfaces.version}</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
+ <dependency>
+ <id>myfaces:tomahawk</id>
+ <version>${myfaces.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
<dependency>
<id>portals-bridges:portals-bridges-jsf</id>
<version>${portals.bridges.jsf.version}</version>
@@ -115,10 +122,10 @@
<dependency>
<id>commons-logging</id>
- <version>1.0.3</version>
+ <version>${commons.logging.version}</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>${commons.logging.include}</war.bundle>
</properties>
</dependency>
<dependency>
Added: portals/jetspeed-2/trunk/applications/jsf-demo/src/java/org/apache/portals/applications/desktop/resources/Calendar_es.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo/src/java/org/apache/portals/applications/desktop/resources/Calendar_es.properties?rev=291797&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jsf-demo/src/java/org/apache/portals/applications/desktop/resources/Calendar_es.properties (added)
+++ portals/jetspeed-2/trunk/applications/jsf-demo/src/java/org/apache/portals/applications/desktop/resources/Calendar_es.properties Mon Sep 26 17:24:24 2005
@@ -0,0 +1,27 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Id: Calendar_en.properties 188342 2005-02-20 23:00:25Z shinsuke $
+#
+# LOCALIZATION MAINTAINER:
+# Jetspeed Development Team
+
+javax.portlet.title = Portlet de Calendario
+javax.portlet.short-title = Calendario
+javax.portlet.keywords = calendario
+calendar.page = P\u00e1gina de calendario
+calendar.notes = Notas
+add = Guardar
+edit = Editar
+cancel = Cancelar
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org