JBoss Rich Faces SVN: r15653 - in root/cdk/trunk/plugins: generator and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-09-21 20:35:44 -0400 (Mon, 21 Sep 2009)
New Revision: 15653
Modified:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java
root/cdk/trunk/plugins/generator/pom.xml
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/component.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/properties.xml
Log:
turn oh xml schema validation for JAXB parser
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -50,8 +50,9 @@
*
* @return Icon url.
*/
- public String value();
+ public String small() default "";
+ public String large() default "";
}
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/pom.xml 2009-09-22 00:35:44 UTC (rev 15653)
@@ -145,7 +145,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
+ <version>2.9.1</version>
</dependency>
<!--
<dependency> <groupId>com.google.collections</groupId>
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -62,6 +62,7 @@
import org.richfaces.cdk.annotations.SuggestedValue;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
+import org.richfaces.cdk.model.DescriptionGroup;
import org.richfaces.cdk.model.Property;
import org.richfaces.cdk.util.Strings;
import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
@@ -194,7 +195,7 @@
facet.setDescription(beanProperty.getDocComment());
Icon icon = beanProperty.getAnnotation(Icon.class);
if (null != icon) {
- facet.setIcon(icon.value());
+ setIcon(facet, icon);
}
DisplayName displayName = beanProperty
.getAnnotation(DisplayName.class);
@@ -227,7 +228,7 @@
.getDocComment(componentElement));
Icon icon = componentElement.getAnnotation(Icon.class);
if (null != icon) {
- component.setIcon(icon.value());
+ setIcon(component, icon);
}
DisplayName displayName = componentElement
.getAnnotation(DisplayName.class);
@@ -236,6 +237,22 @@
}
}
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param component
+ * @param icon
+ */
+ private void setIcon(DescriptionGroup component, Icon icon) {
+ DescriptionGroup.Icon iconValue = new DescriptionGroup.Icon();
+ if (icon.small().length() > 0) {
+ iconValue.setSmallIcon(icon.small());
+ }
+ if (icon.large().length() > 0) {
+ iconValue.setLargeIcon(icon.large());
+ }
+ component.setIcon(iconValue);
+ }
+
private void setComponeneFamily(TypeElement componentElement,
org.richfaces.cdk.model.Component component) {
Family family = componentElement.getAnnotation(Family.class);
@@ -296,7 +313,7 @@
attribute.setDescription(beanProperty.getDocComment());
Icon icon = beanProperty.getAnnotation(Icon.class);
if (null != icon) {
- attribute.setIcon(icon.value());
+ setIcon(attribute,icon);
}
DisplayName displayName = beanProperty
.getAnnotation(DisplayName.class);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/DescriptionGroup.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -1,6 +1,7 @@
package org.richfaces.cdk.model;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
/**
* <p class="changed_added_4_0"></p>
@@ -10,6 +11,47 @@
public interface DescriptionGroup {
/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+ @XmlType(name="icon-type",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE)
+ public static final class Icon {
+ private String smallIcon;
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the smallIcon
+ */
+ @XmlElement(name = "small-icon", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
+ public String getSmallIcon() {
+ return smallIcon;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param smallIcon the smallIcon to set
+ */
+ public void setSmallIcon(String smallIcon) {
+ this.smallIcon = smallIcon;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the largeIcon
+ */
+ @XmlElement(name = "large-icon", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
+ public String getLargeIcon() {
+ return largeIcon;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param largeIcon the largeIcon to set
+ */
+ public void setLargeIcon(String largeIcon) {
+ this.largeIcon = largeIcon;
+ }
+ private String largeIcon;
+ }
+
+ /**
* <p class="changed_added_4_0">Documentation description of that element.
* </p>
*
@@ -55,7 +97,7 @@
*/
@XmlElement
@Merge
- public String getIcon();
+ public Icon getIcon();
/**
* <p class="changed_added_4_0">
@@ -64,6 +106,6 @@
* @param icon
* the icon to set
*/
- public void setIcon(String icon);
+ public void setIcon(Icon icon);
}
\ No newline at end of file
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -23,7 +23,7 @@
* Icon name for IDE tools
* </p>
*/
- private String icon;
+ private Icon icon;
private ConfigExtension extension;
public ModelElementBase() {
@@ -49,11 +49,11 @@
}
@XmlElement
- public final String getIcon() {
+ public final Icon getIcon() {
return icon;
}
- public final void setIcon(String icon) {
+ public final void setIcon(Icon icon) {
this.icon = icon;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -28,6 +28,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import org.richfaces.cdk.CdkContext;
import org.richfaces.cdk.StandardSources;
@@ -59,21 +60,21 @@
private static final ImmutableMap<String, String> systemEntities = ImmutableMap
.<String, String> builder()
.put("http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd",
- URN_SYSTEM + "web-facesconfig_2_0.xsd")
+ URN_SYSTEM + "/web-facesconfig_2_0.xsd")
.put("http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd",
- URN_SYSTEM + "web-facesconfig_1_2.xsd")
+ URN_SYSTEM + "/web-facesconfig_1_2.xsd")
.put("http://java.sun.com/xml/ns/javaee/javaee_5.xsd",
- URN_SYSTEM + "javaee_5.xsd")
+ URN_SYSTEM + "/javaee_5.xsd")
.put(
"http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd",
- URN_SYSTEM + "javaee_web_services_1_2.xsd")
+ URN_SYSTEM + "/javaee_web_services_1_2.xsd")
.put(
"http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd",
- URN_SYSTEM + "javaee_web_services_client_1_2.xsd")
- .put("http://www.w3.org/2001/03/xml.xsd", URN_SYSTEM + "xml.xsd")
+ URN_SYSTEM + "/javaee_web_services_client_1_2.xsd")
+ .put("http://www.w3.org/2001/03/xml.xsd", URN_SYSTEM + "/xml.xsd")
.build();
- private static final String SYSTEM_PREFIX = "/META-INF/schema/";
+ private static final String SYSTEM_PREFIX = "/META-INF/schema";
public static final String URN_RESOURCE = "urn:resource:";
@@ -116,7 +117,17 @@
@Override
public InputSource resolveEntity(String name, String publicId,
String baseURI, String systemId) throws SAXException, IOException {
- // TODO perform conversions with baseURI
+ // perform conversions with baseURI
+ if (null != systemId) {
+ try {
+ URI sourceURI = URI.create(systemId);
+ if (!sourceURI.isAbsolute() && null != baseURI) {
+ systemId = URI.create(baseURI).resolve(sourceURI).toString();
+ }
+ } catch (IllegalArgumentException e){
+ // Ignore ?
+ }
+ }
return resolveSystemId(systemId);
}
@@ -142,48 +153,51 @@
throws FileNotFoundException {
InputSource entity = null;
// first step - convert known system url's:
+ String systemIdInternal;
if (systemEntities.containsKey(systemId)) {
- systemId = systemEntities.get(systemId);
+ systemIdInternal = systemEntities.get(systemId);
+ } else {
+ systemIdInternal = systemId;
}
// Check registered urn's:
- if (systemId.startsWith(URN_SYSTEM)) {
+ if (systemIdInternal.startsWith(URN_SYSTEM)) {
// Cdk resources
- String path = systemId.substring(URN_SYSTEM.length());
+ String path = systemIdInternal.substring(URN_SYSTEM.length());
InputStream inputStream = CdkEntityResolver.class
.getResourceAsStream(SYSTEM_PREFIX + path);
if (null != inputStream) {
entity = new InputSource(inputStream);
-
}
- } else if (systemId.startsWith(URN_RESOURCE)) {
+ } else if (systemIdInternal.startsWith(URN_RESOURCE)) {
// Project resources
- String path = systemId.substring(URN_RESOURCE.length());
+ String path = systemIdInternal.substring(URN_RESOURCE.length());
InputStream inputStream = getContext().getLoader()
.getResourceAsStream(RESOURCE_PREFIX + path);
if (null != inputStream) {
entity = new InputSource(inputStream);
-
}
- } else if (systemId.startsWith(URN_ATTRIBUTES)) {
+ } else if (systemIdInternal.startsWith(URN_ATTRIBUTES)) {
// Standard attributes. Look for them in the satndard place via
// project classloader.
- String path = systemId.substring(URN_ATTRIBUTES.length());
+ String path = systemIdInternal.substring(URN_ATTRIBUTES.length());
InputStream inputStream = getContext().getLoader()
.getResourceAsStream(ATTRIBUTES_PREFIX + path);
if (null != inputStream) {
entity = new InputSource(inputStream);
-
}
- } else if (systemId.startsWith(URN_CONFIG)) {
+ } else if (systemIdInternal.startsWith(URN_CONFIG)) {
// Config folder.
- String path = systemId.substring(URN_CONFIG.length());
+ String path = systemIdInternal.substring(URN_CONFIG.length());
entity = getProjectInputSource(StandardSources.FACES_CONFIGS, path);
- } else if (systemId.startsWith(URN_TEMPLATES)) {
+ } else if (systemIdInternal.startsWith(URN_TEMPLATES)) {
// Templates folder.
- String path = systemId.substring(URN_TEMPLATES.length());
+ String path = systemIdInternal.substring(URN_TEMPLATES.length());
entity = getProjectInputSource(StandardSources.RENDERER_TEMPLATES,
path);
}
+ if(null != entity){
+ entity.setSystemId(systemId);
+ }
return entity;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -23,7 +23,6 @@
package org.richfaces.cdk.xmlconfig;
-import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.File;
@@ -34,7 +33,6 @@
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
import java.net.URISyntaxException;
@@ -46,11 +44,6 @@
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.UnmarshallerHandler;
import javax.xml.bind.util.ValidationEventCollector;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.sax.SAXSource;
@@ -60,16 +53,12 @@
import org.richfaces.cdk.CdkContext;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWorker;
-import org.richfaces.cdk.model.ClassDescription;
-import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConfigExtension;
import org.richfaces.cdk.model.Extensible;
import org.richfaces.cdk.model.Key;
import org.richfaces.cdk.model.ModelElement;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
@@ -109,6 +98,7 @@
throws CdkException {
try {
InputSource input = new InputSource(new FileInputStream(file));
+ input.setSystemId(file.toURI().toString());
T unmarshal = unmarshal(schemaLocation, bindClass, input);
return unmarshal;
} catch (FileNotFoundException e) {
@@ -138,6 +128,8 @@
XMLReader xmlReader = XMLReaderFactory.createXMLReader();
xmlReader.setEntityResolver(resolver);
xmlReader.setFeature("http://xml.org/sax/features/validation", true);
+ xmlReader.setFeature("http://apache.org/xml/features/validation/schema", true);
+ xmlReader.setFeature("http://apache.org/xml/features/validation/dynamic", true);
// Setup JAXB to unmarshal
// TODO - create xinclude content handler that process xinclude directives
// and send SAX event to the unmarshaller handler.
@@ -299,7 +291,7 @@
if (source instanceof Extensible
&& destination instanceof Extensible) {
Extensible extensibleSource = (Extensible) source;
- Extensible extensibleDestination = (Extensible) destination;
+ Extensible<ConfigExtension> extensibleDestination = (Extensible<ConfigExtension>) destination;
ConfigExtension sourceExtension = extensibleSource
.getExtension();
if (null != sourceExtension) {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -7,7 +7,7 @@
public class DescriptionGroupBean implements DescriptionGroup {
- private String icon;
+ private Icon icon;
private String description;
private String displayname;
@@ -20,7 +20,7 @@
* @return the icon
*/
@XmlElement(name = "icon", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
- public final String getIcon() {
+ public final Icon getIcon() {
return icon;
}
@@ -28,7 +28,7 @@
* <p class="changed_added_4_0"></p>
* @param icon the icon to set
*/
- public final void setIcon(String icon) {
+ public final void setIcon(Icon icon) {
this.icon = icon;
}
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -58,7 +58,8 @@
assertEquals("javax.faces.Panel", component.getType().toString());
assertEquals("javax.faces.Panel", component.getFamily());
assertEquals("javax.faces.component.UIPanel", component.getComponentClass().getName());
- assertEquals("panel.gif", component.getIcon());
+ assertEquals("panel.gif", component.getIcon().getSmallIcon());
+ assertEquals("panel-large.gif", component.getIcon().getLargeIcon());
assertEquals("Panel component", component.getDescription());
assertEquals("Panel", component.getDisplayname());
assertTrue(component.isGenerate());
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java 2009-09-22 00:35:44 UTC (rev 15653)
@@ -82,7 +82,7 @@
assertEquals("ontest2",property.getName().toString());
assertEquals("int",property.getType().getName());
assertEquals("test2 property",property.getDescription());
- assertEquals("ontest2.png",property.getIcon());
+ assertEquals("ontest2.png",property.getIcon().getSmallIcon());
assertEquals("test2 event property",property.getDisplayname());
assertEquals("3",property.getDefaultValue());
assertEquals("15",property.getSuggestedValue());
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/component.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/component.xml 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/component.xml 2009-09-22 00:35:44 UTC (rev 15653)
@@ -6,13 +6,19 @@
version="2.0">
<component>
+ <description>Panel component</description>
+ <display-name>Panel</display-name>
+ <icon>
+ <small-icon>panel.gif</small-icon>
+ <large-icon>panel-large.gif</large-icon>
+ </icon>
<component-type>javax.faces.Panel</component-type>
<component-class>javax.faces.component.UIPanel</component-class>
<facet>
<description>Header facet</description>
<facet-name>header</facet-name>
<facet-extension>
- <cdk:generate>true</cdk:generate>
+ <cdk:generate>true</cdk:generate>
</facet-extension>
</facet>
@@ -56,12 +62,10 @@
<value-expression-enabled>true</value-expression-enabled>
</property-extension>
</property>
- <icon>panel.gif</icon>
- <description>Panel component</description>
- <display-name>Panel</display-name>
<component-extension>
<cdk:component-family>javax.faces.Panel</cdk:component-family>
- <cdk:base-class>javax.faces.component.UIComponentBase</cdk:base-class>
+ <cdk:base-class>javax.faces.component.UIComponentBase
+ </cdk:base-class>
<cdk:generate>true</cdk:generate>
</component-extension>
</component>
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/properties.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/properties.xml 2009-09-21 21:21:50 UTC (rev 15652)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/properties.xml 2009-09-22 00:35:44 UTC (rev 15653)
@@ -5,7 +5,7 @@
<property>
<description><![CDATA[test2 property]]></description>
<display-name>test2 event property</display-name>
- <icon>ontest2.png</icon>
+ <icon><small-icon>ontest2.png</small-icon></icon>
<property-name>ontest2</property-name>
<property-class>int</property-class>
<default-value>3</default-value>
14 years, 7 months
JBoss Rich Faces SVN: r15652 - in root/cdk/trunk/plugins: generator/src/main/java/org/richfaces/cdk/xmlconfig and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-09-21 17:21:50 -0400 (Mon, 21 Sep 2009)
New Revision: 15652
Added:
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent2.xml
Modified:
root/cdk/trunk/plugins/generator/pom.xml
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/include.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent.xml
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMUtils.java
Log:
got Xinclude works with JAXB unmarshaller.
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2009-09-21 20:33:51 UTC (rev 15651)
+++ root/cdk/trunk/plugins/generator/pom.xml 2009-09-21 21:21:50 UTC (rev 15652)
@@ -110,6 +110,11 @@
<artifactId>annotations</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>xinclude</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
<!--
<dependency> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <version>2.1</version>
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-09-21 20:33:51 UTC (rev 15651)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-09-21 21:21:50 UTC (rev 15652)
@@ -36,12 +36,15 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Collection;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.UnmarshallerHandler;
import javax.xml.bind.util.ValidationEventCollector;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -53,6 +56,7 @@
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
+import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer;
import org.richfaces.cdk.CdkContext;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWorker;
@@ -67,6 +71,7 @@
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
import com.google.common.collect.ImmutableSet;
@@ -85,9 +90,6 @@
private CdkEntityResolver resolver;
- private SAXParserFactory spf;
-
-
public JAXBBinding() {
}
@@ -101,35 +103,8 @@
public void init(CdkContext context) throws CdkException {
this.context = context;
this.resolver = new CdkEntityResolver(context);
- spf = createParserFactory(context);
}
- private SAXParserFactory createParserFactory(CdkContext context)
- throws CdkException {
- SAXParserFactory spf = SAXParserFactory.newInstance(
- "org.apache.xerces.jaxp.SAXParserFactoryImpl",
- FragmentParser.class.getClassLoader());
- spf.setNamespaceAware(true);
- spf.setValidating(true);
- try {
- spf.setFeature("http://apache.org/xml/features/validation/schema",
- true);
- spf.setFeature("http://apache.org/xml/features/xinclude", true);
- spf.setFeature(
- "http://apache.org/xml/features/xinclude/fixup-base-uris",
- false);
- spf.setXIncludeAware(true);
- } catch (ParserConfigurationException e) {
- throw new CdkException(
- "parser does not support desired configuration", e);
- } catch (SAXNotRecognizedException e) {
- throw new CdkException("parser does not recofnize property", e);
- } catch (SAXNotSupportedException e) {
- throw new CdkException("parser feature does not supported", e);
- }
- return spf;
- }
-
public <T> T unmarshal(File file, String schemaLocation, Class<T> bindClass)
throws CdkException {
try {
@@ -159,8 +134,10 @@
public <T> T unmarshal(String schemaLocation, Class<T> bindClass,
InputSource inputSource) throws CdkException {
T unmarshal = null;
- Source source = createXmlSource(inputSource, schemaLocation);
try {
+ XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ xmlReader.setEntityResolver(resolver);
+ xmlReader.setFeature("http://xml.org/sax/features/validation", true);
// Setup JAXB to unmarshal
// TODO - create xinclude content handler that process xinclude directives
// and send SAX event to the unmarshaller handler.
@@ -168,15 +145,29 @@
Unmarshaller u = jc.createUnmarshaller();
ValidationEventCollector vec = new ValidationEventCollector();
u.setEventHandler(vec);
-
+ XIncludeTransformer xIncludeTransformer = new XIncludeTransformer();
+ if(null != inputSource.getSystemId()){
+ xIncludeTransformer.setBaseUri(new URI(inputSource.getSystemId()));
+ }
+ UnmarshallerHandler unmarshallerHandler = u.getUnmarshallerHandler();
+ xIncludeTransformer.setContentHandler(unmarshallerHandler);
+ xIncludeTransformer.setResolver(resolver);
+ xmlReader.setContentHandler(xIncludeTransformer);
+ xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", xIncludeTransformer);
+ xmlReader.parse(inputSource);
// turn off the JAXB provider's default validation mechanism to
// avoid duplicate validation
// u.setValidating(false);
- unmarshal = (T) u.unmarshal(source);
+ unmarshal = (T) unmarshallerHandler.getResult();
} catch (JAXBException e) {
throw new CdkException("JAXB Unmarshaller error", e);
+ } catch (URISyntaxException e) {
+ throw new CdkException("Invalid XML source URI", e);
+ } catch (IOException e) {
+ throw new CdkException("JAXB Unmarshaller input error", e);
+ } catch (SAXException e) {
+ throw new CdkException("XML error", e);
} finally {
- closeSource(source);
}
return unmarshal;
}
@@ -245,31 +236,6 @@
}
}
- private Source createXmlSource(InputSource input, String schemaLocation)
- throws CdkException {
- try {
- SAXParser saxParser = spf.newSAXParser();
- if (null != schemaLocation) {
- saxParser.setProperty(CdkEntityResolver.JAXP_SCHEMA_LANGUAGE,
- CdkEntityResolver.W3C_XML_SCHEMA);
- saxParser.setProperty(CdkEntityResolver.JAXP_SCHEMA_LOCATION,
- schemaLocation);
-
- }
- XMLReader xmlReader = saxParser.getXMLReader();
- xmlReader.setEntityResolver(resolver);
- SAXSource source = new SAXSource(xmlReader, input);
- return source;
- } catch (SAXNotRecognizedException x) {
- throw new CdkException(x);
- } catch (SAXException e) {
- throw new CdkException(e);
- } catch (ParserConfigurationException e) {
- throw new CdkException(e);
- }
-
- }
-
private static final ImmutableSet<String> ignoreProperties = ImmutableSet.of("class","extension");
/**
* <p class="changed_added_4_0">
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java 2009-09-21 20:33:51 UTC (rev 15651)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FragmentParserTest.java 2009-09-21 21:21:50 UTC (rev 15652)
@@ -63,6 +63,15 @@
}
@Test
+ public void nestedXincludeTest() throws Exception {
+ FragmentParser parser = new FragmentParser();
+ CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader());
+ parser.init(contextBase);
+ Collection<Property> properties = parser.parseProperties("urn:resource:org/richfaces/cdk/xmlconfig/parent2.xml");
+ assertEquals(2,properties.size());
+ }
+
+ @Test
public void propertyTest() throws Exception {
FragmentParser parser = new FragmentParser();
CdkContextBase contextBase = new CdkContextBase(this.getClass().getClassLoader());
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/include.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/include.xml 2009-09-21 20:33:51 UTC (rev 15651)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/include.xml 2009-09-21 21:21:50 UTC (rev 15652)
@@ -1,43 +1,45 @@
- <property xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions">
- <description><![CDATA[test property]]></description>
- <display-name>test event property</display-name>
- <icon>ontest.png</icon>
- <property-name>ontest</property-name>
- <property-class>boolean</property-class>
- <default-value>1</default-value>
- <suggested-value>1</suggested-value>
- <property-extension>
- <cdk:literal>true</cdk:literal>
- <cdk:generate>true</cdk:generate>
- <cdk:hidden>true</cdk:hidden>
- <cdk:required>true</cdk:required>
- <cdk:pass-through>true</cdk:pass-through>
- <cdk:event-name>test</cdk:event-name>
- <cdk:event-name default="true">action</cdk:event-name>
- </property-extension>
- </property >
- <property xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions">
- <description><![CDATA[test2 property]]></description>
- <display-name>test2 event property</display-name>
- <icon>ontest2.png</icon>
- <property-name>ontest2</property-name>
- <property-class>int</property-class>
- <default-value>3</default-value>
- <suggested-value>15</suggested-value>
- <property-extension>
- <cdk:literal>true</cdk:literal>
- <cdk:generate>true</cdk:generate>
- <cdk:hidden>true</cdk:hidden>
- <cdk:required>true</cdk:required>
- <cdk:pass-through>true</cdk:pass-through>
- <cdk:event-name>ontest2</cdk:event-name>
- <cdk:event-name default="true">action</cdk:event-name>
- <cdk:signature>
- <cdk:param>boolean</cdk:param>
- <cdk:param>java.lang.String</cdk:param>
- </cdk:signature>
- <cdk:alias>foo</cdk:alias>
- <cdk:alias>bar</cdk:alias>
- </property-extension>
- </property>
-
+<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions">
+ <property>
+ <description><![CDATA[test property]]></description>
+ <display-name>test event property</display-name>
+ <icon>ontest.png</icon>
+ <property-name>ontest</property-name>
+ <property-class>boolean</property-class>
+ <default-value>1</default-value>
+ <suggested-value>1</suggested-value>
+ <property-extension>
+ <cdk:literal>true</cdk:literal>
+ <cdk:generate>true</cdk:generate>
+ <cdk:hidden>true</cdk:hidden>
+ <cdk:required>true</cdk:required>
+ <cdk:pass-through>true</cdk:pass-through>
+ <cdk:event-name>test</cdk:event-name>
+ <cdk:event-name default="true">action</cdk:event-name>
+ </property-extension>
+ </property>
+ <property>
+ <description><![CDATA[test2 property]]></description>
+ <display-name>test2 event property</display-name>
+ <icon>ontest2.png</icon>
+ <property-name>ontest2</property-name>
+ <property-class>int</property-class>
+ <default-value>3</default-value>
+ <suggested-value>15</suggested-value>
+ <property-extension>
+ <cdk:literal>true</cdk:literal>
+ <cdk:generate>true</cdk:generate>
+ <cdk:hidden>true</cdk:hidden>
+ <cdk:required>true</cdk:required>
+ <cdk:pass-through>true</cdk:pass-through>
+ <cdk:event-name>ontest2</cdk:event-name>
+ <cdk:event-name default="true">action</cdk:event-name>
+ <cdk:signature>
+ <cdk:param>boolean</cdk:param>
+ <cdk:param>java.lang.String</cdk:param>
+ </cdk:signature>
+ <cdk:alias>foo</cdk:alias>
+ <cdk:alias>bar</cdk:alias>
+ </property-extension>
+ </property>
+</cdk:properties>
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent.xml 2009-09-21 20:33:51 UTC (rev 15651)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent.xml 2009-09-21 21:21:50 UTC (rev 15652)
@@ -1,13 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions">
- <!--
<xi:include
href="urn:resource:org/richfaces/cdk/xmlconfig/include.xml"
- xpointer="xmlns(jsf=http://java.sun.com/xml/ns/javaee)xpointer(//jsf:property)"/>
- -->
+ xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cdk:properties/*)"/>
- <xi:include
- href="urn:resource:org/richfaces/cdk/xmlconfig/include.xml"/>
-
</cdk:properties>
Added: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent2.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent2.xml (rev 0)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent2.xml 2009-09-21 21:21:50 UTC (rev 15652)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions">
+ <xi:include
+ href="urn:resource:org/richfaces/cdk/xmlconfig/parent.xml"
+ xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cdk:properties/*)"/>
+
+</cdk:properties>
Property changes on: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/parent2.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMUtils.java
===================================================================
--- root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMUtils.java 2009-09-21 20:33:51 UTC (rev 15651)
+++ root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/util/dom/DOMUtils.java 2009-09-21 21:21:50 UTC (rev 15652)
@@ -36,6 +36,11 @@
public final class DOMUtils {
private final static DocumentBuilderFactory DBF = DocumentBuilderFactory.newInstance();
+
+ static {
+ DBF.setNamespaceAware(true);
+ DBF.setXIncludeAware(false);
+ }
private DOMUtils() {
// instances are not allowed
@@ -44,6 +49,7 @@
public static Document toDOM(InputSource source, EntityResolver resolver) throws SAXException, IOException {
DocumentBuilder documentBuilder;
try {
+
// TODO - configuration
documentBuilder = DBF.newDocumentBuilder();
documentBuilder.setEntityResolver(resolver);
14 years, 7 months
JBoss Rich Faces SVN: r15651 - branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson.
by richfaces-svn-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-09-21 16:33:51 -0400 (Mon, 21 Sep 2009)
New Revision: 15651
Added:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-all-all-none-parser.xml
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-tidy-parser.xml
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-default-default-neko-parser.xml
Log:
adding separate config for different parsers so that we can run them separately in hudson
Added: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-all-all-none-parser.xml
===================================================================
--- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-all-all-none-parser.xml (rev 0)
+++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-all-all-none-parser.xml 2009-09-21 20:33:51 UTC (rev 15651)
@@ -0,0 +1,19 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTestAANe">
+ <test name="all_all_none">
+ <parameter name="browser" value="*firefox" />
+ <parameter name="loadStyleStrategy" value="ALL" />
+ <parameter name="loadScriptStrategy" value="ALL" />
+ <parameter name="filterPrefix" value="/faces/NONE/" />
+
+ <groups>
+ <run>
+ <exclude name="failures" />
+ </run>
+ </groups>
+
+ <packages>
+ <package name="org.richfaces.testng" />
+ </packages>
+ </test>
+</suite>
Added: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-tidy-parser.xml
===================================================================
--- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-tidy-parser.xml (rev 0)
+++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-def-def-tidy-parser.xml 2009-09-21 20:33:51 UTC (rev 15651)
@@ -0,0 +1,19 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTestAANe">
+ <test name="default_default_tidy">
+ <parameter name="loadStyleStrategy" value="DEFAULT" />
+ <parameter name="loadScriptStrategy" value="DEFAULT" />
+ <parameter name="filterPrefix" value="/faces/TIDY/" />
+ <parameter name="browser" value="*firefox" />
+
+ <groups>
+ <run>
+ <exclude name="failures" />
+ </run>
+ </groups>
+
+ <packages>
+ <package name="org.richfaces.testng" />
+ </packages>
+ </test>
+</suite>
Added: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-default-default-neko-parser.xml
===================================================================
--- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-default-default-neko-parser.xml (rev 0)
+++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/hudson/testng-default-default-neko-parser.xml 2009-09-21 20:33:51 UTC (rev 15651)
@@ -0,0 +1,19 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="seleniumTestAANe">
+ <test name="default_default_neko">
+ <parameter name="browser" value="*firefox" />
+ <parameter name="loadStyleStrategy" value="DEFAULT" />
+ <parameter name="loadScriptStrategy" value="DEFAULT" />
+ <parameter name="filterPrefix" value="/faces/NEKO/" />
+
+ <groups>
+ <run>
+ <exclude name="failures" />
+ </run>
+ </groups>
+
+ <packages>
+ <package name="org.richfaces.testng" />
+ </packages>
+ </test>
+</suite>
14 years, 7 months
JBoss Rich Faces SVN: r15650 - in root/ui-sandbox/trunk/components: tables and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-09-21 14:01:10 -0400 (Mon, 21 Sep 2009)
New Revision: 15650
Modified:
root/ui-sandbox/trunk/components/pom.xml
root/ui-sandbox/trunk/components/tables/api/pom.xml
root/ui-sandbox/trunk/components/tables/impl/pom.xml
root/ui-sandbox/trunk/components/tables/pom.xml
root/ui-sandbox/trunk/components/tables/ui/pom.xml
Log:
fix build
Modified: root/ui-sandbox/trunk/components/pom.xml
===================================================================
--- root/ui-sandbox/trunk/components/pom.xml 2009-09-21 18:00:23 UTC (rev 15649)
+++ root/ui-sandbox/trunk/components/pom.xml 2009-09-21 18:01:10 UTC (rev 15650)
@@ -11,7 +11,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.ui.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui</groupId>
<artifactId>components</artifactId>
<packaging>pom</packaging>
<name>richfaces components sandbox</name>
Modified: root/ui-sandbox/trunk/components/tables/api/pom.xml
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/pom.xml 2009-09-21 18:00:23 UTC (rev 15649)
+++ root/ui-sandbox/trunk/components/tables/api/pom.xml 2009-09-21 18:01:10 UTC (rev 15650)
@@ -5,7 +5,7 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>tables</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
Modified: root/ui-sandbox/trunk/components/tables/impl/pom.xml
===================================================================
--- root/ui-sandbox/trunk/components/tables/impl/pom.xml 2009-09-21 18:00:23 UTC (rev 15649)
+++ root/ui-sandbox/trunk/components/tables/impl/pom.xml 2009-09-21 18:01:10 UTC (rev 15650)
@@ -5,7 +5,7 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>tables</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
Modified: root/ui-sandbox/trunk/components/tables/pom.xml
===================================================================
--- root/ui-sandbox/trunk/components/tables/pom.xml 2009-09-21 18:00:23 UTC (rev 15649)
+++ root/ui-sandbox/trunk/components/tables/pom.xml 2009-09-21 18:01:10 UTC (rev 15650)
@@ -5,13 +5,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.richfaces.ui.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui</groupId>
<artifactId>components</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.ui.components</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>tables</artifactId>
<packaging>pom</packaging>
Modified: root/ui-sandbox/trunk/components/tables/ui/pom.xml
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/pom.xml 2009-09-21 18:00:23 UTC (rev 15649)
+++ root/ui-sandbox/trunk/components/tables/ui/pom.xml 2009-09-21 18:01:10 UTC (rev 15650)
@@ -5,7 +5,7 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>tables</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
14 years, 7 months
JBoss Rich Faces SVN: r15649 - in root/examples-sandbox/trunk/components: tables and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-09-21 14:00:23 -0400 (Mon, 21 Sep 2009)
New Revision: 15649
Modified:
root/examples-sandbox/trunk/components/pom.xml
root/examples-sandbox/trunk/components/tables/pom.xml
Log:
fix build
Modified: root/examples-sandbox/trunk/components/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/pom.xml 2009-09-21 15:02:40 UTC (rev 15648)
+++ root/examples-sandbox/trunk/components/pom.xml 2009-09-21 18:00:23 UTC (rev 15649)
@@ -16,17 +16,17 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>${example.componentName}-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>${example.componentName}-api</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>${example.componentName}-impl</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
Modified: root/examples-sandbox/trunk/components/tables/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/tables/pom.xml 2009-09-21 15:02:40 UTC (rev 15648)
+++ root/examples-sandbox/trunk/components/tables/pom.xml 2009-09-21 18:00:23 UTC (rev 15649)
@@ -46,15 +46,15 @@
<dependencies>
<dependency>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>${example.componentName}-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>${example.componentName}-api</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.ui.components.sandbox</groupId>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>${example.componentName}-impl</artifactId>
</dependency>
14 years, 7 months
JBoss Rich Faces SVN: r15647 - branches/community/3.3.X/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-09-21 10:59:29 -0400 (Mon, 21 Sep 2009)
New Revision: 15647
Removed:
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/scrollableDataTable_cn.png
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/scrollableDataTable_oc.png
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/scrollableDataTable_pc.png
Log:
https://jira.jboss.org/jira/browse/RF-7913 - deleting unnecessary images;
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/scrollableDataTable_cn.png
===================================================================
(Binary files differ)
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/scrollableDataTable_oc.png
===================================================================
(Binary files differ)
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/scrollableDataTable_pc.png
===================================================================
(Binary files differ)
14 years, 7 months
JBoss Rich Faces SVN: r15646 - branches/community/3.3.X/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-09-21 10:55:55 -0400 (Mon, 21 Sep 2009)
New Revision: 15646
Removed:
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/datascroller_cn.png
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/datascroller_oc.png
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/datascroller_pc.png
Log:
https://jira.jboss.org/jira/browse/RF-7913 - deleting unnecessary images;
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/datascroller_cn.png
===================================================================
(Binary files differ)
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/datascroller_oc.png
===================================================================
(Binary files differ)
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/datascroller_pc.png
===================================================================
(Binary files differ)
14 years, 7 months
JBoss Rich Faces SVN: r15645 - branches/community/3.3.X/test-applications/seleniumTest/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-09-21 10:54:43 -0400 (Mon, 21 Sep 2009)
New Revision: 15645
Modified:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml
Log:
Hudson profile switched to testng.xml file
Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml 2009-09-21 14:53:39 UTC (rev 15644)
+++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml 2009-09-21 14:54:43 UTC (rev 15645)
@@ -110,7 +110,7 @@
<skip>true</skip>
<suiteXmlFiles>
<suiteXmlFile>
- src/test/testng/hudson/testng-def-def-none-parser.xml
+ src/test/testng/hudson/testng.xml
</suiteXmlFile>
<!--
<suiteXmlFile>
14 years, 7 months
JBoss Rich Faces SVN: r15644 - branches/community/3.3.X/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-09-21 10:53:39 -0400 (Mon, 21 Sep 2009)
New Revision: 15644
Removed:
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/dataGrid_oc.png
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/dataGrid_pc.png
Log:
https://jira.jboss.org/jira/browse/RF-7913 - deleting unnecessary images;
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/dataGrid_oc.png
===================================================================
(Binary files differ)
Deleted: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/dataGrid_pc.png
===================================================================
(Binary files differ)
14 years, 7 months
JBoss Rich Faces SVN: r15643 - branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/win.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-09-21 10:23:29 -0400 (Mon, 21 Sep 2009)
New Revision: 15643
Modified:
branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/win/local_testng.xml
Log:
RFPL-143
Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/win/local_testng.xml
===================================================================
--- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/win/local_testng.xml 2009-09-21 14:05:34 UTC (rev 15642)
+++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/testng/win/local_testng.xml 2009-09-21 14:23:29 UTC (rev 15643)
@@ -1,12 +1,21 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="seleniumTest">
<test name="FFFunctionalTests">
- <parameter name="browser" value="*firefox"/>
+ <parameter name="browser" value="*firefox c:/Program Files/Mozilla Firefox3/firefox.exe"/>
<parameter name="loadStyleStrategy" value="DEFAULT"/>
<parameter name="loadScriptStrategy" value="DEFAULT"/>
<parameter name="filterPrefix" value="/faces/NONE/"/>
+ <!--parameter name="templates" value="SIMPLE" /-->
+ <groups>
+ <run>
+ <exclude name="failures" />
+ </run>
+ </groups>
<classes>
- <class name="org.richfaces.testng.MessageTest" />
+ <class name="org.richfaces.testng.AjaxLogTest" >
+ <!--methods><include name="testLogComponentWithPopupTrue"></include></methods-->
+ </class>
</classes>
</test>
+ <!-- "D:/workspace/seleniumFirefoxProfile/" -->
</suite>
14 years, 7 months