JBoss Rich Faces SVN: r12573 - trunk/test-applications/realworld/web/src/main/webapp/includes/image.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-02-05 08:23:43 -0500 (Thu, 05 Feb 2009)
New Revision: 12573
Modified:
trunk/test-applications/realworld/web/src/main/webapp/includes/image/mainImage.xhtml
trunk/test-applications/realworld/web/src/main/webapp/includes/image/scroller.xhtml
Log:
Apply effect for image scrolling
Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/mainImage.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/scroller.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
JBoss Rich Faces SVN: r12572 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-02-05 08:04:54 -0500 (Thu, 05 Feb 2009)
New Revision: 12572
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml
Log:
https://jira.jboss.org/jira/browse/RF-6014 - info about dependecies was added to the 'Getting Started with RichFaces' section
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2009-02-05 13:02:10 UTC (rev 12571)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2009-02-05 13:04:54 UTC (rev 12572)
@@ -57,7 +57,17 @@
<code>*.jar</code> files with API, UI and
implementation libraries. Copy that "jars" from
<code>lib</code> folder to <code>WEB-INF/lib</code> folder
- of "Greeter" JSF application. </para>
+ of "Greeter" JSF application. </para>
+
+ <important>
+ <title>Important:</title>
+ <para>
+ A JSF application with RichFaces
+ assumes that the following JARs are available in the project:
+ commons-beanutils-1.7.0.jar, commons-collections-3.2.jar, commons-digester-1.8.jar, commons-logging-1.0.4.jar, jhighlight-1.0.jar.
+
+ </para>
+ </important>
</section>
<section id="RegisteringRichFacesinwebxml">
15 years, 2 months
JBoss Rich Faces SVN: r12571 - Plan and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-02-05 08:02:10 -0500 (Thu, 05 Feb 2009)
New Revision: 12571
Modified:
trunk/test-applications/qa/Test Plan/Richfaces-Seam integration test plan.doc
Log:
Excel export TC correction.
Modified: trunk/test-applications/qa/Test Plan/Richfaces-Seam integration test plan.doc
===================================================================
(Binary files differ)
15 years, 2 months
JBoss Rich Faces SVN: r12570 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-02-05 06:53:26 -0500 (Thu, 05 Feb 2009)
New Revision: 12570
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
Log:
f:setPropertyActionListender not needed there.
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2009-02-05 11:47:49 UTC (rev 12569)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2009-02-05 11:53:26 UTC (rev 12570)
@@ -35,7 +35,6 @@
<a4j:outputPanel layout="block">
<rich:toolTip direction="top-right" mode="ajax" showDelay="300"
styleClass="tooltip" layout="block">
- <f:setPropertyActionListener value="#{vehicle}" target="#{toolTipData.vehicle}" />
<a4j:actionparam name="key" value="#{row}"
assignTo="#{toolTipData.currentVehicleIndex}" actionListener="#{toolTipData.fillCurrent}"/>
<h:panelGrid columns="4">
15 years, 2 months
JBoss Rich Faces SVN: r12569 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-02-05 06:47:49 -0500 (Thu, 05 Feb 2009)
New Revision: 12569
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
Log:
actionListener for demonstration of possible external data loading according to param added instead of just object setting during request.
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2009-02-05 11:32:51 UTC (rev 12568)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2009-02-05 11:47:49 UTC (rev 12569)
@@ -36,6 +36,8 @@
<rich:toolTip direction="top-right" mode="ajax" showDelay="300"
styleClass="tooltip" layout="block">
<f:setPropertyActionListener value="#{vehicle}" target="#{toolTipData.vehicle}" />
+ <a4j:actionparam name="key" value="#{row}"
+ assignTo="#{toolTipData.currentVehicleIndex}" actionListener="#{toolTipData.fillCurrent}"/>
<h:panelGrid columns="4">
<f:facet name="header">
<h:outputText value="Vehicle details:" />
@@ -47,7 +49,7 @@
<h:outputText value="year:" />
<h:outputText value="#{toolTipData.vehicle.year}" styleClass="tooltipData" />
<h:outputText value="milage:" />
- <h:outputText value="#{vehicle.milage}" styleClass="tooltipData" />
+ <h:outputText value="#{toolTipData.vehicle.milage}" styleClass="tooltipData" />
<h:outputText value="zip:" />
<h:outputText value="#{toolTipData.vehicle.zip}" styleClass="tooltipData" />
<h:outputText value="listed:" />
@@ -60,7 +62,7 @@
<h:outputText value="#{toolTipData.vehicle.vin}" styleClass="tooltipData" />
</h:panelGroup>
</f:facet>
-
+
</h:panelGrid>
</rich:toolTip>
<h:outputText id="make" value="#{vehicle.make}"/>
15 years, 2 months
JBoss Rich Faces SVN: r12568 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-02-05 06:32:51 -0500 (Thu, 05 Feb 2009)
New Revision: 12568
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
Log:
way of tooltip data loading changed. action param did nothing in previous version.
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2009-02-04 17:30:55 UTC (rev 12567)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2009-02-05 11:32:51 UTC (rev 12568)
@@ -35,31 +35,29 @@
<a4j:outputPanel layout="block">
<rich:toolTip direction="top-right" mode="ajax" showDelay="300"
styleClass="tooltip" layout="block">
- <a4j:actionparam name="key" value="#{row}"
- assignTo="#{toolTipData.currentVehicleIndex}" />
-
+ <f:setPropertyActionListener value="#{vehicle}" target="#{toolTipData.vehicle}" />
<h:panelGrid columns="4">
<f:facet name="header">
<h:outputText value="Vehicle details:" />
</f:facet>
<h:outputText value="make:" />
- <h:outputText value="#{vehicle.make}" styleClass="tooltipData" />
+ <h:outputText value="#{toolTipData.vehicle.make}" styleClass="tooltipData" />
<h:outputText value="model:" />
- <h:outputText value="#{vehicle.model}" styleClass="tooltipData" />
+ <h:outputText value="#{toolTipData.vehicle.model}" styleClass="tooltipData" />
<h:outputText value="year:" />
- <h:outputText value="#{vehicle.year}" styleClass="tooltipData" />
+ <h:outputText value="#{toolTipData.vehicle.year}" styleClass="tooltipData" />
<h:outputText value="milage:" />
<h:outputText value="#{vehicle.milage}" styleClass="tooltipData" />
<h:outputText value="zip:" />
- <h:outputText value="#{vehicle.zip}" styleClass="tooltipData" />
+ <h:outputText value="#{toolTipData.vehicle.zip}" styleClass="tooltipData" />
<h:outputText value="listed:" />
- <h:outputText value="#{vehicle.listed}" styleClass="tooltipData">
+ <h:outputText value="#{toolTipData.vehicle.listed}" styleClass="tooltipData">
<f:convertDateTime dateStyle="short" />
</h:outputText>
<f:facet name="footer">
<h:panelGroup>
<h:outputText value="vin: " />
- <h:outputText value="#{vehicle.vin}" styleClass="tooltipData" />
+ <h:outputText value="#{toolTipData.vehicle.vin}" styleClass="tooltipData" />
</h:panelGroup>
</f:facet>
15 years, 2 months
JBoss Rich Faces SVN: r12567 - in trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd: generator and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-02-04 12:30:55 -0500 (Wed, 04 Feb 2009)
New Revision: 12567
Modified:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/JarResourceScanner.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java
Log:
add include/exclude features for the styles, scripts, namespaces, componentNames and so on
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/JarResourceScanner.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/JarResourceScanner.java 2009-02-04 17:16:16 UTC (rev 12566)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/JarResourceScanner.java 2009-02-04 17:30:55 UTC (rev 12567)
@@ -58,6 +58,7 @@
}
protected boolean isAcceptable(FileObject fileObject) {
+
for (int i = 0; i < patterns.length; i++) {
if(SelectorUtils.matchPath(patterns[i], fileObject.getName().getPath())) {
return true;
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java 2009-02-04 17:16:16 UTC (rev 12566)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java 2009-02-04 17:30:55 UTC (rev 12567)
@@ -79,7 +79,7 @@
private URL getResourceURL(String resourceName) {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
URL resource = classLoader.getResource(resourceName);
-
+
try {
if(resource == null) {
//resolve framework script path
@@ -92,6 +92,7 @@
} catch (Exception e) {
log.error("Error process: " + resourceName + "\n" + e.getMessage(), e);
}
+
return resource;
}
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java 2009-02-04 17:16:16 UTC (rev 12566)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java 2009-02-04 17:30:55 UTC (rev 12567)
@@ -20,11 +20,6 @@
*/
package org.richfaces.cdk.rd.handler;
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -42,67 +37,129 @@
*/
public class ComponentsHandler extends DefaultHandler{
+ private String [] INCLUDE_ALL_PATTERN = {"**"};
+
private Map <String,Components> components;
private Set <String> scripts = new LinkedHashSet<String>();
private Set <String> styles = new LinkedHashSet<String>();
+ private String [] scriptIncludes;
+
private String [] scriptExcludes;
+ private String [] styleIncludes;
+
private String [] styleExcludes;
+ private String [] namespaceIncludes;
+
private String [] namespaceExcludes;
+ private String [] componentIncludes;
+
private String [] componentExcludes;
@Override
public void endElement(String uri, String localName, String name) throws SAXException {
+
if(components != null && components.containsKey(uri)) {
- if(!isExcluded(namespaceExcludes, uri, true)) {
- Components library = components.get(uri);
- List <Component> components = library.getComponents();
- for(Component component : components ){
- String componentName = component.getComponentName();
- System.out.println("process: " + componentName);
- if(localName.equals(componentName) && !isExcluded(componentExcludes, componentName,false)) {
- collectScripts(component);
- collectStyles(component);
+
+ if(namespaceIncludes == null) {
+ namespaceIncludes = INCLUDE_ALL_PATTERN;
+ }
+
+ if(doMatch(namespaceIncludes, uri, true)){
+
+ if(!doMatch(namespaceExcludes, uri, true)) {
+
+ Components library = components.get(uri);
+ List <Component> components = library.getComponents();
+
+ if (componentIncludes == null) {
+ componentIncludes = INCLUDE_ALL_PATTERN;
}
+
+ for(Component component : components ){
+
+ String componentName = component.getComponentName();
+
+ if(localName.equals(componentName)) {
+
+ if(doMatch(componentIncludes, componentName,false)) {
+
+ if(!doMatch(componentExcludes, componentName,false)) {
+ collectScripts(component);
+ collectStyles(component);
+ }
+
+ }
+
+ }
+
+ }
+
}
+
}
+
}
}
private void collectStyles(Component component) {
+
+ if(styleIncludes == null) {
+ styleIncludes = INCLUDE_ALL_PATTERN;
+ }
+
for(String style : component.getStyles()) {
- if(!isExcluded(styleExcludes, style, true)) {
- this.styles.add(style);
+
+ if(doMatch(styleIncludes, style, true)) {
+ if(!doMatch(styleExcludes, style, true)) {
+ this.styles.add(style);
+ }
}
- }
+
+ }
}
- private boolean isExcluded(String [] excludePatterns, String str, boolean matchPath) {
- boolean exclude = false;
- if(excludePatterns != null) {
- for(String excludePattern: excludePatterns) {
+ private boolean doMatch(String [] patterns, String str, boolean matchPath) {
+ boolean allow = false;
+
+ if(patterns != null) {
+
+ for(String excludePattern: patterns) {
+
if(matchPath) {
- exclude = SelectorUtils.matchPath(excludePattern, str);
+ allow = SelectorUtils.matchPath(excludePattern, str);
} else {
- exclude = SelectorUtils.matchPath(excludePattern, str);
+ allow = SelectorUtils.match(excludePattern, str);
}
- if(exclude) break;
+
+ if(allow) break;
}
+
}
- return exclude;
+
+ return allow;
}
private void collectScripts(Component component) {
+
+ if(scriptIncludes == null) {
+ scriptIncludes = INCLUDE_ALL_PATTERN;
+ }
+
for(String script : component.getScripts()) {
- if(!isExcluded(scriptExcludes, script, true)) {
- this.scripts.add(script);
- }
+
+ if(doMatch(scriptIncludes, script, true)) {
+ if(!doMatch(scriptExcludes, script, true)) {
+ this.scripts.add(script);
+ }
+ }
+
}
}
@@ -153,4 +210,36 @@
public void setStyleExcludes(String [] styleExcludes) {
this.styleExcludes = styleExcludes;
}
+
+ public String[] getScriptIncludes() {
+ return scriptIncludes;
+ }
+
+ public void setScriptIncludes(String[] scriptIncludes) {
+ this.scriptIncludes = scriptIncludes;
+ }
+
+ public String[] getStyleIncludes() {
+ return styleIncludes;
+ }
+
+ public void setStyleIncludes(String[] styleIncludes) {
+ this.styleIncludes = styleIncludes;
+ }
+
+ public String[] getNamespaceIncludes() {
+ return namespaceIncludes;
+ }
+
+ public void setNamespaceIncludes(String[] namespaceIncludes) {
+ this.namespaceIncludes = namespaceIncludes;
+ }
+
+ public String[] getComponentIncludes() {
+ return componentIncludes;
+ }
+
+ public void setComponentIncludes(String[] componentIncludes) {
+ this.componentIncludes = componentIncludes;
+ }
}
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-02-04 17:16:16 UTC (rev 12566)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-02-04 17:30:55 UTC (rev 12567)
@@ -123,7 +123,7 @@
* scriptPackName
* @parameter expression="custom-dependencies"
*/
- private String scriptPackName;
+ private String scriptFileName;
/**
* outputStyleDirectory
@@ -135,77 +135,126 @@
* stylePackName
* @parameter expression="custom-dependencies"
*/
- private String stylePackName;
+ private String styleFileName;
/**
- * beforeIncludes
+ * beforeScriptIncludes
* @parameter
*/
private List <String> beforeScriptIncludes;
/**
- * afterIncludes
+ * afterScriptIncludes
* @parameter
*/
private List <String> afterScriptIncludes;
/**
- * beforeIncludes
+ * beforeStyleIncludes
* @parameter
*/
private List <String> beforeStyleIncludes;
/**
- * afterIncludes
+ * afterStyleIncludes
* @parameter
*/
private List <String> afterStyleIncludes;
/**
+ * scriptIncludes
+ * @parameter
+ */
+ private String [] scriptIncludes;
+
+ /**
* scriptExcludes
* @parameter
*/
private String [] scriptExcludes;
/**
+ * styleIncludes
+ * @parameter
+ */
+ private String [] styleIncludes;
+
+ /**
* styleExcludes
* @parameter
*/
private String [] styleExcludes;
/**
+ * namespaceIncludes
+ * @parameter
+ */
+ private String [] namespaceIncludes;
+
+ /**
* namespaceExcludes
* @parameter
*/
private String [] namespaceExcludes;
/**
+ * componentIncludes
+ * @parameter
+ */
+
+ private String [] componentIncludes;
+
+ /**
* componentExcludes
* @parameter
*/
private String [] componentExcludes;
/**
+ * xml_config_patterns
+ * @parameter
+ */
+ private String [] xmlConfigPatterns;
+
+ /**
+ * xhtml_includes
+ * @parameter
+ */
+ private String [] xhtmlIncludes;
+
+ /**
+ * xhtml_excludes
+ * @parameter
+ */
+ private String [] xhtmlExcludes;
+ /**
* @component
*/
protected VelocityComponent velocity;
+
+
public void execute() throws MojoExecutionException, MojoFailureException {
try {
Set <Artifact> artifacts = resolveDependenciesArtifacts();
Digester defaultDigester = createDigester();
Map <String, Components> components = new HashMap<String, Components>();
+
+ if(xmlConfigPatterns == null) {
+ xmlConfigPatterns = PluginUtils.DEFAULT_CONFIG_PATTERNS;
+ }
+
for (Artifact artifact : artifacts) {
FileObject jar = resolveArtifact(artifact);
- FileObject [] configs = PluginUtils.resolveConfigsFromJar(jar, PluginUtils.DEFAULT_CONFIG_PATTERNS);
+ FileObject [] configs = PluginUtils.resolveConfigsFromJar(jar, xmlConfigPatterns);
components.putAll(PluginUtils.processConfigs(configs, defaultDigester));
}
if(!webSourceDirectory.exists()) {
webSourceDirectory.mkdirs();
}
- ComponentsHandler handler = findComponents(webSourceDirectory, components, PluginUtils.DEFAULT_PROCESS_INCLUDES, new String[0]);
+ ComponentsHandler handler = findComponents(webSourceDirectory, components, xhtmlIncludes, xhtmlExcludes);
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
ClassLoader contextClassLoader = createClassLoader();
@@ -215,22 +264,23 @@
Set <String> scripts = handler.getScripts();
- File scriptFile = new File(outputScriptDirectory, scriptPackName + ".js");
- if(scriptFile.exists()) {
- scriptFile.delete();
- }
-
+ File scriptFile = new File(outputScriptDirectory, scriptFileName + ".js");
+
if(!scripts.isEmpty()) {
if(!outputScriptDirectory.exists()) {
outputScriptDirectory.mkdirs();
}
ScriptAssembler scriptAssembler = new ScriptAssembler();
mergeResources(scriptFile, scriptAssembler, beforeScriptIncludes, afterScriptIncludes, scripts);
+ } else {
+ if(scriptFile.exists()) {
+ scriptFile.delete();
+ }
}
Set <String> styles = handler.getStyles();
- File styleFile = new File(outputStyleDirectory, stylePackName + ".xcss");
- if(styleFile.exists()) styleFile.delete();
+ File styleFile = new File(outputStyleDirectory, styleFileName + ".xcss");
+
if(!styles.isEmpty()) {
if(!outputStyleDirectory.exists()) {
outputStyleDirectory.mkdirs();
@@ -239,7 +289,9 @@
StyleAssembler styleAssembler = new StyleAssembler();
styleAssembler.setVelocityComponent(velocity);
mergeResources(styleFile, styleAssembler, beforeStyleIncludes, afterStyleIncludes, styles);
- }
+ } else if(styleFile.exists()) {
+ styleFile.delete();
+ }
}
Thread.currentThread().setContextClassLoader(oldClassLoader);
@@ -271,6 +323,14 @@
public ComponentsHandler findComponents (File webSourceDir, Map <String, Components> components, String [] includes, String [] excludes) throws Exception {
+ if(includes == null) {
+ includes = PluginUtils.DEFAULT_PROCESS_INCLUDES;
+ }
+
+ if(excludes == null) {
+ excludes = new String[0];
+ }
+
DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir(webSourceDir);
scanner.setIncludes(includes);
@@ -281,10 +341,14 @@
ComponentsHandler handler = new ComponentsHandler();
handler.setComponents(components);
+ handler.setScriptIncludes(scriptIncludes);
handler.setScriptExcludes(scriptExcludes);
+ handler.setStyleIncludes(styleIncludes);
handler.setStyleExcludes(styleExcludes);
+ handler.setComponentIncludes(componentIncludes);
handler.setComponentExcludes(componentExcludes);
handler.setNamespaceExcludes(namespaceExcludes);
+ handler.setNamespaceIncludes(namespaceIncludes);
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
@@ -343,6 +407,7 @@
//use the existing ContextClassLoader in a realm of the classloading space
ClassRealm realm = world.newRealm("org.richfaces.cdk", Thread.currentThread().getContextClassLoader());
+
//create another realm for the app jars
ClassRealm childRealm = realm.createChildRealm("jar");
@@ -360,11 +425,13 @@
addResources(childRealm, compileClasspathElements);
List<Resource> scripts = project.getScriptSourceRoots();
- addResources(realm, scripts);
+ addResources(childRealm, scripts);
List<Resource> resources = project.getResources();
- addResources(realm, resources);
+ addResources(childRealm, resources);
+ childRealm.addConstituent(webSourceDirectory.toURI().toURL());
+
//make the child realm the ContextClassLoader
classLoader = childRealm.getClassLoader();
return classLoader;
15 years, 2 months
JBoss Rich Faces SVN: r12566 - trunk/sandbox/samples/maven-rd-plugin-sample.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-02-04 12:16:16 -0500 (Wed, 04 Feb 2009)
New Revision: 12566
Modified:
trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml
Log:
Modified: trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-02-04 17:15:32 UTC (rev 12565)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-02-04 17:16:16 UTC (rev 12566)
@@ -26,20 +26,30 @@
<version>3.3.1-SNAPSHOT</version>
<configuration>
<webSourceDirectory>${basedir}/src/main/webapp</webSourceDirectory>
+
<beforeScriptIncludes>
- <beforeScriptInclude>scripts/before.js</beforeScriptInclude>
+ <beforeScriptInclude>foo/scripts/before.js</beforeScriptInclude>
+ <beforeScriptInclude>scripts/test/test.js</beforeScriptInclude>
</beforeScriptIncludes>
+
<afterScriptIncludes>
- <afterScriptInclude>scripts/after.js</afterScriptInclude>
+ <afterScriptInclude>foo/scripts/after.js</afterScriptInclude>
</afterScriptIncludes>
+
<beforeStyleIncludes>
- <beforeStyleInclude>styles/before.xcss</beforeStyleInclude>
- <afterStyleInclude>styles/before.css</afterStyleInclude>
+ <beforeStyleInclude>foo/styles/before.xcss</beforeStyleInclude>
+ <beforeStyleInclude>foo/styles/before.css</beforeStyleInclude>
</beforeStyleIncludes>
+
<afterStyleIncludes>
- <afterStyleInclude>styles/after.xcss</afterStyleInclude>
- <afterStyleInclude>styles/after.css</afterStyleInclude>
- </afterStyleIncludes>
+ <afterStyleInclude>foo/styles/after.xcss</afterStyleInclude>
+ <afterStyleInclude>foo/styles/after.css</afterStyleInclude>
+ </afterStyleIncludes>
+
+ <namespaceExcludes>
+ <namespaceExclude>http://richfaces.org/a4j</namespaceExclude>
+ </namespaceExcludes>
+
</configuration>
<executions>
<execution>
15 years, 2 months
JBoss Rich Faces SVN: r12565 - in trunk/sandbox/samples/maven-rd-plugin-sample/src/main: scripts and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-02-04 12:15:32 -0500 (Wed, 04 Feb 2009)
New Revision: 12565
Added:
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/after.js
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/before.js
Log:
Added: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/after.js
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/after.js (rev 0)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/after.js 2009-02-04 17:15:32 UTC (rev 12565)
@@ -0,0 +1 @@
+// script after
\ No newline at end of file
Added: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/before.js
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/before.js (rev 0)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/scripts/foo/scripts/before.js 2009-02-04 17:15:32 UTC (rev 12565)
@@ -0,0 +1 @@
+//script before
\ No newline at end of file
15 years, 2 months
JBoss Rich Faces SVN: r12564 - in trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources: META-INF and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-02-04 12:15:14 -0500 (Wed, 04 Feb 2009)
New Revision: 12564
Added:
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-INF/
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-INF/resources-config.xml
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.css
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.xcss
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.css
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.xcss
Log:
Added: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-INF/resources-config.xml
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-INF/resources-config.xml (rev 0)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/META-INF/resources-config.xml 2009-02-04 17:15:14 UTC (rev 12564)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource>
+ <name>css/custom-dependencies.xcss</name>
+ <path>custom-dependencies.xcss</path>
+ </resource>
+ <resource>
+ <name>scripts/custom-dependencies.js</name>
+ <path>custom-dependencies.js</path>
+ </resource>
+</resource-config>
\ No newline at end of file
Added: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.css
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.css (rev 0)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.css 2009-02-04 17:15:14 UTC (rev 12564)
@@ -0,0 +1,2 @@
+.after_css {
+}
\ No newline at end of file
Added: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.xcss
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.xcss (rev 0)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/after.xcss 2009-02-04 17:15:14 UTC (rev 12564)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml" >
+ <![CDATA[
+ .after_xss{
+ }
+
+ ]]>
+</f:template>
\ No newline at end of file
Added: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.css
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.css (rev 0)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.css 2009-02-04 17:15:14 UTC (rev 12564)
@@ -0,0 +1,2 @@
+.before_css{
+}
\ No newline at end of file
Added: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.xcss
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.xcss (rev 0)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/resources/foo/styles/before.xcss 2009-02-04 17:15:14 UTC (rev 12564)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml" >
+ <![CDATA[
+ .before_xss{
+ }
+
+ ]]>
+</f:template>
\ No newline at end of file
15 years, 2 months