JBoss Rich Faces SVN: r17452 - in root: ui/dist/trunk/richfaces-components-api and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-06-01 11:24:43 -0400 (Tue, 01 Jun 2010)
New Revision: 17452
Modified:
root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml
root/ui/dist/trunk/richfaces-components-api/pom.xml
root/ui/dist/trunk/richfaces-components-impl/pom.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
Log:
RF-8713 Adjust richfaces dependences for generated application with proper ones after assembly will be ready
fix dependencies between components modules
Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml
===================================================================
--- root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-01 14:29:28 UTC (rev 17451)
+++ root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-01 15:24:43 UTC (rev 17452)
@@ -6,11 +6,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<name>RichFaces 4 Application</name>
<version>${version}</version>
<packaging>war</packaging>
+
<url>http://jboss.org/richfaces</url>
<repositories>
@@ -90,40 +92,49 @@
</profile>
</profiles>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
- <groupId>org.richfaces.ui.components</groupId>
- <artifactId>core-ui</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.11</version>
- <type>jar</type>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.11</version>
- <type>jar</type>
+ <version>1.5.8</version>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.10</version>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-01 14:29:28 UTC (rev 17451)
+++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-01 15:24:43 UTC (rev 17452)
@@ -80,11 +80,6 @@
<artifactId>${jsf2.impl.artifactid}</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-01 14:29:28 UTC (rev 17451)
+++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-01 15:24:43 UTC (rev 17452)
@@ -58,8 +58,14 @@
<artifactId>richfaces-ui-iteration-impl</artifactId>
</dependency>
- <!-- for javadoc generation -->
+
<dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-api</artifactId>
</dependency>
@@ -82,11 +88,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-01 14:29:28 UTC (rev 17451)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-01 15:24:43 UTC (rev 17452)
@@ -83,6 +83,12 @@
<!-- for javadoc generation -->
<dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-api</artifactId>
</dependency>
@@ -105,11 +111,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
13 years, 11 months
JBoss Rich Faces SVN: r17451 - in root/examples/richfaces-showcase/trunk/src/main/webapp: resources/rich/css and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-06-01 10:29:28 -0400 (Tue, 01 Jun 2010)
New Revision: 17451
Removed:
root/examples/richfaces-showcase/trunk/src/main/webapp/CSS/
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
Log:
demo styling
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-06-01 13:23:33 UTC (rev 17450)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-06-01 14:29:28 UTC (rev 17451)
@@ -2,9 +2,9 @@
width: 100%;
}
-.body {
- background-color: '#{richSkin.generalBackgroundColor}';
- margin: 0px;
+body {
+ background-color: #FFFFFF;
+ margin: 10px;
}
.header_bg {
@@ -28,29 +28,24 @@
.menu_col {
background-color: '#{richSkin.generalBackgroundColor}';
vertical-align: top;
- border-top: 2px solid;
- border-top-color: '#{richSkin.panelBorderColor}';
- border-right: 2px solid;
- border-right-color: '#{richSkin.panelBorderColor}';
- border-bottom: 2px solid;
- border-bottom-color: '#{richSkin.panelBorderColor}';
+ border-top: 10px solid #FFFFFF;
+ border-right: 10px solid #FFFFFF;
+ border-bottom: 10px solid #FFFFFF;
}
.content_col {
- background-color: '#{richSkin.generalBackgroundColor}';
+ background-color: #FFFFFF;
vertical-align: top;
width: 100%;
- border-top: 2px solid;
- border-top-color: '#{richSkin.panelBorderColor}';
- border-bottom: 2px solid;
- border-bottom-color: '#{richSkin.panelBorderColor}';
+ border-top: 10px solid #FFFFFF;
+ border-bottom: 10px solid #FFFFFF;
}
*.menu_col,*.content_col,*.footer_bg {
font-family: '#{richSkin.generalFamilyFont}';
color: '#{richSkin.generalTextColor}';
font-size: '#{richSkin.generalSizeFont}';
-}
+}
*.header_content {
font-family: '#{richSkin.generalFamilyFont}';
@@ -74,9 +69,8 @@
}
.footer_bg_content {
+ padding:20px;
margin: 0px 0px 0px 0px;
- height: 45px;
- position: relative;
}
.new_marker {
@@ -86,10 +80,17 @@
padding-left: 2px;
}
-.header_links_container, .header_links_container * {
+.header_links_container, .header_links_container a:visited, .header_links_container * {
color: '#{richSkin.headerTextColor}';
}
.header_links_container {
padding-right: 20px;
+}
+
+.skin-chooser{
+margin-bottom: 3px;
+}
+.samples-navigator{
+margin-bottom: 10px;
}
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-06-01 13:23:33 UTC (rev 17450)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-06-01 14:29:28 UTC (rev 17451)
@@ -10,7 +10,7 @@
}
.rich-panel-header {
- padding: 2px;
+ padding: 7px 20px;
border-width: 1px;
border-style: solid;
background-color: '#{richSkin.headerBackgroundColor}';
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-06-01 13:23:33 UTC (rev 17450)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-06-01 14:29:28 UTC (rev 17451)
@@ -14,7 +14,7 @@
</f:metadata>
</ui:define>
<ui:define name="body">
- <rich:panel>
+ <rich:panel styleClass="samples-navigator">
<ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s" varStatus="status">
<h:link value="#{s.name}" includeViewParams="true">
<f:param name="sample" value="#{s.id}" />
@@ -23,7 +23,7 @@
<h:outputText value=" | " rendered="#{not status.last}" />
</ui:repeat>
</rich:panel>
- <fieldset><legend>#{demoNavigator.currentSample.name}</legend>
+ <fieldset><legend><b>#{demoNavigator.currentSample.name}</b></legend>
<ui:include src="#{demoNavigator.sampleURI}" /></fieldset>
</ui:define>
</ui:composition>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml 2010-06-01 13:23:33 UTC (rev 17450)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/poll/poll.xhtml 2010-06-01 14:29:28 UTC (rev 17451)
@@ -47,7 +47,7 @@
value="Server Date: #{pollBean.date}" />
</h:panelGrid>
</h:form>
- <rich:panel bodyClass="note">
+ <rich:panel>
<b>NOTE:</b>polling is automatically disabled in this demo after one minute of working.
</rich:panel>
</ui:composition>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-06-01 13:23:33 UTC (rev 17450)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-06-01 14:29:28 UTC (rev 17451)
@@ -11,7 +11,7 @@
<ul>
<a4j:repeat value="#{demoNavigator.groups}" var="gr">
<li>
- <h:outputText value="#{gr.name}" />
+ <h:outputText value="#{gr.name}" style="font-weight:bold"/>
<h:outputText rendered="#{gr.newItem}" value="NEW!" styleClass="new_marker" />
</li>
<ul>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-06-01 13:23:33 UTC (rev 17450)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-06-01 14:29:28 UTC (rev 17451)
@@ -7,7 +7,7 @@
xmlns:rich="http://java.sun.com/jsf/composite/rich">
<ui:composition>
- <rich:panel>
+ <rich:panel styleClass="skin-chooser">
<a4j:repeat var="skin" value="#{skinBean.skins}" iterationStatusVar="iterStatus">
<h:link value="#{skin}" includeViewParams="true">
<f:param name="skin" value="#{skin}"/>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-01 13:23:33 UTC (rev 17450)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-01 14:29:28 UTC (rev 17451)
@@ -38,14 +38,13 @@
<tr>
<td width="100%" height="100%" class="bg_tabbody" colspan="2">
<table cellpadding="0" cellspacing="0" border="0" width="100%"
- height="100%" class="rich-page-content #{cc.attrs.contentClass}">
+ height="100%" class="rich-page-content">
<tbody>
<tr>
- <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}">
- <div class="menu_width spacer"
- style="width:#{cc.attrs.sidebarWidth}px"></div>
+ <td class="menu_col rich-page-sidebar">
+ <div class="menu_width spacer"></div>
<ui:include src="/templates/includes/navigation.xhtml" /></td>
- <td class="content_col rich-page-body #{cc.attrs.bodyClass}">
+ <td class="content_col rich-page-body">
<ui:remove>
<fieldset>
@@ -64,7 +63,7 @@
<tr>
<td class="footer_bg" colspan="2">
<div
- class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}">
+ class="footer_bg_content rich-page-footer">
RichFaces 4.0 ALPHA 2</div>
</td>
</tr>
13 years, 11 months
JBoss Rich Faces SVN: r17450 - root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-06-01 09:23:33 -0400 (Tue, 01 Jun 2010)
New Revision: 17450
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
Log:
small fix
Modified: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-06-01 13:02:16 UTC (rev 17449)
+++ root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-06-01 13:23:33 UTC (rev 17450)
@@ -598,13 +598,13 @@
writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
writer.startElement(HTML.TR_ELEMENT, component);
writer.startElement(HTML.TH_ELEM, component);
- writer.write(" ");
+ writer.write(" ");
writer.endElement(HTML.TH_ELEM);
writer.endElement(HTML.TR_ELEMENT);
for (int i = 0; i < 6; i++) {
writer.startElement(HTML.TR_ELEMENT, component);
writer.startElement(HTML.TD_ELEM, component);
- writer.write(" ");
+ writer.write(" ");
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEMENT);
}
13 years, 11 months
JBoss Rich Faces SVN: r17449 - in root: ui/dist/trunk/richfaces-components-ui and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-06-01 09:02:16 -0400 (Tue, 01 Jun 2010)
New Revision: 17449
Modified:
root/dist/trunk/richfaces.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
Log:
turn off jsdoc for ui module
Modified: root/dist/trunk/richfaces.xml
===================================================================
--- root/dist/trunk/richfaces.xml 2010-06-01 12:48:25 UTC (rev 17448)
+++ root/dist/trunk/richfaces.xml 2010-06-01 13:02:16 UTC (rev 17449)
@@ -93,10 +93,10 @@
<directory>target/dependency/richfaces-core-impl-jsdoc-java-source</directory>
<outputDirectory>docs/jsdoc/richfaces-core-impl/</outputDirectory>
</fileSet>
- <fileSet>
+<!-- <fileSet>
<directory>target/dependency/richfaces-components-ui-jsdoc-java-source</directory>
<outputDirectory>docs/jsdoc/richfaces-components-ui/</outputDirectory>
- </fileSet>
+ </fileSet>-->
<!-- Examples -->
<fileSet>
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-01 12:48:25 UTC (rev 17448)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-01 13:02:16 UTC (rev 17449)
@@ -209,8 +209,8 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- collecting jsdoc -->
+<!-- <plugin>
+ <!– collecting jsdoc –>
<groupId>gr.abiss.mvn.plugins</groupId>
<artifactId>maven-jstools-plugin</artifactId>
<executions>
@@ -230,7 +230,7 @@
</executions>
</plugin>
<plugin>
- <!-- pack jsdoc to jar -->
+ <!– pack jsdoc to jar –>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -245,7 +245,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
<plugin>
<!-- collecting javadoc -->
<artifactId>maven-javadoc-plugin</artifactId>
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-06-01 12:48:25 UTC (rev 17448)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-06-01 13:02:16 UTC (rev 17449)
@@ -152,8 +152,8 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- collecting jsdoc -->
+<!-- <plugin>
+ <!– collecting jsdoc –>
<groupId>gr.abiss.mvn.plugins</groupId>
<artifactId>maven-jstools-plugin</artifactId>
<executions>
@@ -173,7 +173,7 @@
</executions>
</plugin>
<plugin>
- <!-- pack jsdoc to jar -->
+ <!– pack jsdoc to jar –>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -188,7 +188,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
<plugin>
<!-- collecting javadoc -->
<artifactId>maven-javadoc-plugin</artifactId>
Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-01 12:48:25 UTC (rev 17448)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-01 13:02:16 UTC (rev 17449)
@@ -147,8 +147,9 @@
</execution>
</executions>
</plugin>
+<!--
<plugin>
- <!-- collecting jsdoc -->
+ <!– collecting jsdoc –>
<groupId>gr.abiss.mvn.plugins</groupId>
<artifactId>maven-jstools-plugin</artifactId>
<executions>
@@ -168,7 +169,7 @@
</executions>
</plugin>
<plugin>
- <!-- pack jsdoc to jar -->
+ <!– pack jsdoc to jar –>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -184,6 +185,7 @@
</execution>
</executions>
</plugin>
+-->
<plugin>
<!-- collecting javadoc -->
<artifactId>maven-javadoc-plugin</artifactId>
13 years, 11 months
JBoss Rich Faces SVN: r17448 - root/core/trunk/impl/src/main/java/org/richfaces/util.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-01 08:48:25 -0400 (Tue, 01 Jun 2010)
New Revision: 17448
Added:
root/core/trunk/impl/src/main/java/org/richfaces/util/ObjectInputStreamImpl.java
Modified:
root/core/trunk/impl/src/main/java/org/richfaces/util/Util.java
Log:
https://jira.jboss.org/browse/RF-8723
Added: root/core/trunk/impl/src/main/java/org/richfaces/util/ObjectInputStreamImpl.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/util/ObjectInputStreamImpl.java (rev 0)
+++ root/core/trunk/impl/src/main/java/org/richfaces/util/ObjectInputStreamImpl.java 2010-06-01 12:48:25 UTC (rev 17448)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This 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 software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+class ObjectInputStreamImpl extends ObjectInputStream {
+
+ private static final Map<String, Class<?>> PRIMITIVE_CLASSES = new HashMap<String, Class<?>>(9, 1.0F);
+
+ static {
+ PRIMITIVE_CLASSES.put("boolean", Boolean.TYPE);
+ PRIMITIVE_CLASSES.put("byte", Byte.TYPE);
+ PRIMITIVE_CLASSES.put("char", Character.TYPE);
+ PRIMITIVE_CLASSES.put("short", Short.TYPE);
+ PRIMITIVE_CLASSES.put("int", Integer.TYPE);
+ PRIMITIVE_CLASSES.put("long", Long.TYPE);
+ PRIMITIVE_CLASSES.put("float", Float.TYPE);
+ PRIMITIVE_CLASSES.put("double", Double.TYPE);
+ PRIMITIVE_CLASSES.put("void", Void.TYPE);
+ }
+
+ public ObjectInputStreamImpl() throws IOException, SecurityException {
+ super();
+ }
+
+ public ObjectInputStreamImpl(InputStream in) throws IOException {
+ super(in);
+ }
+
+ protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+ String name = desc.getName();
+ try {
+ return Class.forName(name, true, Thread.currentThread().getContextClassLoader());
+ } catch (ClassNotFoundException cnfe) {
+ Class<?> c = PRIMITIVE_CLASSES.get(name);
+ if (c != null) {
+ return c;
+ }
+ throw cnfe;
+ }
+ }
+}
Modified: root/core/trunk/impl/src/main/java/org/richfaces/util/Util.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/util/Util.java 2010-06-01 12:25:17 UTC (rev 17447)
+++ root/core/trunk/impl/src/main/java/org/richfaces/util/Util.java 2010-06-01 12:48:25 UTC (rev 17448)
@@ -228,7 +228,7 @@
byte[] objectArray = decodeBytesData(encodedData);
try {
- ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(objectArray));
+ ObjectInputStream in = new ObjectInputStreamImpl(new ByteArrayInputStream(objectArray));
return in.readObject();
} catch (StreamCorruptedException e) {
13 years, 11 months
JBoss Rich Faces SVN: r17447 - root/examples/core-demo/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-06-01 08:25:17 -0400 (Tue, 01 Jun 2010)
New Revision: 17447
Modified:
root/examples/core-demo/trunk/pom.xml
Log:
profiles for tomcat6 and jee6
Modified: root/examples/core-demo/trunk/pom.xml
===================================================================
--- root/examples/core-demo/trunk/pom.xml 2010-06-01 12:21:39 UTC (rev 17446)
+++ root/examples/core-demo/trunk/pom.xml 2010-06-01 12:25:17 UTC (rev 17447)
@@ -57,10 +57,31 @@
<profiles>
<profile>
<id>release</id>
-
<build>
<plugins>
<plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jee6</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
+ <classifier>jee6</classifier>
+ <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes>
+ <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <classifier>tomcat6</classifier>
+ </configuration>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -90,9 +111,24 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
+
+
</build>
</profile>
+ <profile>
+ <id>jee6</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
13 years, 11 months
JBoss Rich Faces SVN: r17446 - in root/examples/richfaces-showcase/trunk/src/main: webapp/richfaces/componentControl and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-06-01 08:21:39 -0400 (Tue, 01 Jun 2010)
New Revision: 17446
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/push/ChoicesBean.java
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml
Log:
minor corrections for samples.
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/push/ChoicesBean.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/push/ChoicesBean.java 2010-06-01 12:04:09 UTC (rev 17445)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/push/ChoicesBean.java 2010-06-01 12:21:39 UTC (rev 17446)
@@ -53,8 +53,8 @@
}
}
- public String getTimeStamp() {
- return new Date().toGMTString();
+ public Date getTimeStamp() {
+ return new Date();
}
public synchronized void start() {
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-06-01 12:04:09 UTC (rev 17445)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-06-01 12:21:39 UTC (rev 17446)
@@ -84,6 +84,9 @@
</f:facet>
<h:outputText value="#{car.vin}" />
</it:column>
+ <f:facet name="footer">
+ <it:dataScroller/>
+ </f:facet>
</it:dataTable>
</h:panelGrid>
13 years, 11 months
JBoss Rich Faces SVN: r17445 - in root/examples: richfaces-showcase/trunk and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-01 08:04:09 -0400 (Tue, 01 Jun 2010)
New Revision: 17445
Modified:
root/examples/core-demo/trunk/pom.xml
root/examples/richfaces-showcase/trunk/pom.xml
Log:
Added missing log4j dependency
Modified: root/examples/core-demo/trunk/pom.xml
===================================================================
--- root/examples/core-demo/trunk/pom.xml 2010-06-01 11:51:52 UTC (rev 17444)
+++ root/examples/core-demo/trunk/pom.xml 2010-06-01 12:04:09 UTC (rev 17445)
@@ -48,11 +48,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
<profiles>
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-01 11:51:52 UTC (rev 17444)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-01 12:04:09 UTC (rev 17445)
@@ -43,12 +43,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-iteration-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
13 years, 11 months
JBoss Rich Faces SVN: r17444 - root/examples/richfaces-showcase/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-06-01 07:51:52 -0400 (Tue, 01 Jun 2010)
New Revision: 17444
Modified:
root/examples/richfaces-showcase/trunk/readme.txt
Log:
https://jira.jboss.org/browse/RFPL-607
Modified: root/examples/richfaces-showcase/trunk/readme.txt
===================================================================
--- root/examples/richfaces-showcase/trunk/readme.txt 2010-06-01 11:24:39 UTC (rev 17443)
+++ root/examples/richfaces-showcase/trunk/readme.txt 2010-06-01 11:51:52 UTC (rev 17444)
@@ -0,0 +1,39 @@
+The RichFaces application: short description
+
+
+1 Building and Running the application
+
+
+1.1. Requirements
+
+- Maven 2.1.0 or later
+- Apache Tomcat 6.0
+- JDK 1.6
+
+1.2 Optional Additional Software
+- Eclipse IDE + JBoss Tools (to explore and run the application in IDE).
+- You're free to use any other IDE also but we're not checked an application in other environments.
+
+
+1.3 Building the application
+
+To build the project you need to navigate to the /exmaples/richfaces-showcase and run
+
+mvn clean install
+
+When you see the BUILD SUCCESSFUL message you can deploy the application on the server. You can deploy it on the server by copying the wae file from target to the TOMCAT_HOME/webapps folder. Then, launch the startup.sh or startup.bat script from TOMCAT_HOME/bin/ directory to start the server.
+
+In order to explore, run and deploy the application in Eclipse IDE you could use of the next options:
+
+ * Just import as maven project if using m2eclipse plugin.
+
+ * without m2eclipse - build it with the
+
+ mvn clean install eclipse:clean eclipse:eclipse
+
+ comand and just import as existent project.
+
+More details you can find in the RichFaces Getting Started Guide (visit documentation page at http://jboss.org/richfaces)
+
+
+
13 years, 11 months
JBoss Rich Faces SVN: r17443 - in root/examples/richfaces-showcase/trunk/src/main/webapp: templates and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-01 07:24:39 -0400 (Tue, 01 Jun 2010)
New Revision: 17443
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
Log:
Additional styling added fro richfaces-showcase
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-06-01 11:07:40 UTC (rev 17442)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-06-01 11:24:39 UTC (rev 17443)
@@ -1,5 +1,5 @@
-.rich-page{
- width:100%;
+.rich-page {
+ width: 100%;
}
.body {
@@ -7,55 +7,56 @@
margin: 0px;
}
-* {
- font-size: 11px;
-}
-
-.header_bg{
- background-image: "url(#{resource['org.richfaces.demo.images.PageHeaderGradient']})";
+.header_bg {
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PageHeaderGradient']})";
border-bottom: 1px solid #FFFFFF;
background-color: '#{richSkin.headerBackgroundColor}';
background-repeat: repeat-x;
background-position: top left;
}
-.footer_bg{
- background-image: "url(#{resource['org.richfaces.demo.images.PageFooterGradient']})";
+.footer_bg {
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PageFooterGradient']})";
border-top: 1px solid #FFFFFF;
- background-color: '#{richSkin.headerBackgroundColor}';
- background-repeat:repeat-x;
- background-position:center left;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ background-repeat: repeat-x;
+ background-position: center left;
}
-.menu_col{
+.menu_col {
background-color: '#{richSkin.generalBackgroundColor}';
- vertical-align:top;
- border-top:2px solid;
+ vertical-align: top;
+ border-top: 2px solid;
border-top-color: '#{richSkin.panelBorderColor}';
- border-right:2px solid;
+ border-right: 2px solid;
border-right-color: '#{richSkin.panelBorderColor}';
- border-bottom:2px solid;
+ border-bottom: 2px solid;
border-bottom-color: '#{richSkin.panelBorderColor}';
}
-.content_col{
- background-color: '#{richSkin.generalBackgroundColor}';
- vertical-align:top;
- width: 100%;
- border-top:2px solid;
- border-top-color: '#{richSkin.panelBorderColor}';
- border-bottom:2px solid;
- border-bottom-color: '#{richSkin.panelBorderColor}';
+.content_col {
+ background-color: '#{richSkin.generalBackgroundColor}';
+ vertical-align: top;
+ width: 100%;
+ border-top: 2px solid;
+ border-top-color: '#{richSkin.panelBorderColor}';
+ border-bottom: 2px solid;
+ border-bottom-color: '#{richSkin.panelBorderColor}';
}
-*.menu_col, *.content_col, *.footer_bg {
- font-family: Arial, Verdana, sans-serif;
- color: '#{richSkin.generalTextColor}';
- font-size: 11px;
+
+*.menu_col,*.content_col,*.footer_bg {
+ font-family: '#{richSkin.generalFamilyFont}';
+ color: '#{richSkin.generalTextColor}';
+ font-size: '#{richSkin.generalSizeFont}';
}
-*.header_content{
- font-family: Arial, Verdana, sans-serif;
- color: '#{richSkin.headerTextColor}';
- font-size: 11px;
+
+*.header_content {
+ font-family: '#{richSkin.generalFamilyFont}';
+ color: '#{richSkin.headerTextColor}';
+ font-size: '#{richSkin.generalSizeFont}';
+ padding-left: 20px;
}
.page_size {
@@ -63,18 +64,32 @@
height: 100%;
}
-
.header_content {
margin: 0px 0px 0px 0px;
- position : relative
+ position: relative
}
-.spacer{
- font-size : 1px;
+.spacer {
+ font-size: 1px;
}
.footer_bg_content {
margin: 0px 0px 0px 0px;
height: 45px;
position: relative;
+}
+
+.new_marker {
+ color: red;
+ vertical-align: super;
+ font-size: 8px;
+ padding-left: 2px;
+}
+
+.header_links_container, .header_links_container * {
+ color: '#{richSkin.headerTextColor}';
+}
+
+.header_links_container {
+ padding-right: 20px;
}
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-06-01 11:07:40 UTC (rev 17442)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-06-01 11:24:39 UTC (rev 17443)
@@ -1,27 +1,28 @@
-.rich-panel{
- border-width: 1px;
- border-style: solid;
- padding : 1px;
- color: '#{richSkin.generalTextColor}';
- font-family:Arial,Verdana,sans-serif;
- font-size:11px;
- background-color: '#{richSkin.generalBackgroundColor}';
- border-color: '#{richSkin.panelBorderColor}';
+.rich-panel {
+ border-width: 1px;
+ border-style: solid;
+ padding: 1px;
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size: '#{richSkin.generalSizeFont}';
+ background-color: '#{richSkin.generalBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
}
-
-.rich-panel-header{
- padding : 2px;
- border-width: 1px;
- border-style: solid;
- background-color: '#{richSkin.headerBackgroundColor}';
- border-color: '#{richSkin.panelBorderColor}';
- font-weight:bold;
- background-position:left top;
- background-repeat:repeat-x;
- background-image: "url(#{resource['org.richfaces.demo.images.PanelGradient']})";
- color: '#{richSkin.headerTextColor}';
+
+.rich-panel-header {
+ padding: 2px;
+ border-width: 1px;
+ border-style: solid;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+ font-weight: bold;
+ background-position: left top;
+ background-repeat: repeat-x;
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PanelGradient']})";
+ color: '#{richSkin.headerTextColor}';
}
-
-.rich-panel-body{
- padding : 10px;
-}
+
+.rich-panel-body {
+ padding: 10px;
+}
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-06-01 11:07:40 UTC (rev 17442)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-06-01 11:24:39 UTC (rev 17443)
@@ -12,7 +12,7 @@
<a4j:repeat value="#{demoNavigator.groups}" var="gr">
<li>
<h:outputText value="#{gr.name}" />
- <h:outputText value="NEW!" rendered="#{gr.newItem}" style="color:red"/>
+ <h:outputText rendered="#{gr.newItem}" value="NEW!" styleClass="new_marker" />
</li>
<ul>
<a4j:repeat value="#{gr.demos}" var="d">
@@ -21,7 +21,7 @@
<f:attribute name="style" value="#{(d.id == demoNavigator.currentDemo.id) ? 'color:orange' : ''}"/>
<f:param name="demo" value="#{d.id}"/>
</h:link>
- <h:outputText value="NEW!" rendered="#{d.newItem or gr.newItem}" style="color:red"/>
+ <h:outputText rendered="#{d.newItem or gr.newItem}" value="NEW!" styleClass="new_marker" />
</li>
</a4j:repeat>
</ul>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-01 11:07:40 UTC (rev 17442)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-01 11:24:39 UTC (rev 17443)
@@ -23,7 +23,7 @@
<h1>Welcome to RichFaces demo!</h1>
</div>
</td>
- <td align="right">
+ <td align="right" class="header_links_container">
<h:outputLink value="http://jboss.org/richfaces">Project Site</h:outputLink>
<h:outputText value=" | "/>
<h:outputLink value="http://www.jboss.org/community/wiki/richfaceswikihomepage">Project Wiki</h:outputLink>
13 years, 11 months