svn commit: r409841 - in /struts/sandbox/trunk/tiles: pom.xml tiles-core/pom.xml tiles-test/ tiles-test/pom.xml tiles-test/src/ tiles-test/src/main/ tiles-test/src/main/webapp/
Author: wsmoak Date: Sat May 27 10:12:11 2006 New Revision: 409841 URL: http://svn.apache.org/viewvc?rev=409841&view=rev Log: [SB-19] Standalone Tiles - Maven 2 Reorganization Moved the tiles-test example app, and added a parent pom. Added: struts/sandbox/trunk/tiles/pom.xml (with props) struts/sandbox/trunk/tiles/tiles-test/ struts/sandbox/trunk/tiles/tiles-test/pom.xml (with props) struts/sandbox/trunk/tiles/tiles-test/src/ struts/sandbox/trunk/tiles/tiles-test/src/main/ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/ - copied from r406177, struts/sandbox/trunk/tiles-test/ Modified: struts/sandbox/trunk/tiles/tiles-core/pom.xml Added: struts/sandbox/trunk/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/pom.xml?rev=409841&view=auto == --- struts/sandbox/trunk/tiles/pom.xml (added) +++ struts/sandbox/trunk/tiles/pom.xml Sat May 27 10:12:11 2006 @@ -0,0 +1,155 @@ + + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + + org.apache.struts + struts-parent + 2 + + +4.0.0 +org.apache.struts.tiles +tiles-parent +0.2-SNAPSHOT +pom +Standalone Tiles +http://struts.apache.org +Standalone Tiles + +2000 + + + scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles + scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles + http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles + + + +JIRA +http://issues.apache.org/struts/ + + + + + + apache-maven-test-builds + Apache Maven Repository (Test Builds) + scp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository + + +apache-site + scp://people.apache.org/www/struts.apache.org/struts-sandbox/tiles + + + + +tiles-core +tiles-test + + + + +The Apache Software License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0.txt +repo + + + + + +Apache Software Foundation +http://www.apache.org + + + + + + +org.apache.maven.plugins +maven-compiler-plugin + +1.4 +1.4 + + + + + + + +org.apache.struts +struts-build +1.0.1 + + + +install + + + + + + +org.apache.maven.plugins +maven-project-info-reports-plugin + + +maven-javadoc-plugin + +true + + + +maven-surefire-report-plugin + + +maven-checkstyle-plugin + + org/apache/struts/build/struts_checks.xml + + + +org.codehaus.mojo +jxr-maven-plugin + + +maven-pmd-plugin + + + + + + + + +apache.snapshots +Apache Maven Repository (Snapshots and Test Builds) +http://people.apache.org/maven-snapshot-repository +true +true + + + + Propchange: struts/sandbox/trunk/tiles/pom.xml -- svn:eol-style = native Propchange: struts/sandbox/trunk/tiles/pom.xml -- svn:executable = * Propchange: struts/sandbox/trunk/tiles/pom.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: struts/sandbox/trunk/tiles/tiles-core/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/pom.xml?rev=409841&r1=409840&r2=409841&view=diff == --- struts/sandbox/trunk/tiles/tiles-core/pom.xml (original) +++ struts/sandbox/trunk/tiles/tiles-core/pom.xml Sat May 27 10:12:11 2006 @@ -21,12 +21,16 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + org.apache.struts.tiles + tiles-parent + 0.2-SNA
svn commit: r409842 - /struts/sandbox/trunk/tiles-test/
Author: wsmoak Date: Sat May 27 10:14:57 2006 New Revision: 409842 URL: http://svn.apache.org/viewvc?rev=409842&view=rev Log: [SB-19] Standalone Tiles - Maven 2 Reorganization Removed the tiles-test example app, which was moved into sandbox/tiles in r409841. Removed: struts/sandbox/trunk/tiles-test/
svn commit: r409847 - in /struts/sandbox/trunk/tiles: pom.xml tiles-test/pom.xml
Author: wsmoak
Date: Sat May 27 10:58:56 2006
New Revision: 409847
URL: http://svn.apache.org/viewvc?rev=409847&view=rev
Log:
Removed svn:executable property.
Modified:
struts/sandbox/trunk/tiles/pom.xml (props changed)
struts/sandbox/trunk/tiles/tiles-test/pom.xml (props changed)
Propchange: struts/sandbox/trunk/tiles/pom.xml
('svn:executable' removed)
Propchange: struts/sandbox/trunk/tiles/tiles-test/pom.xml
('svn:executable' removed)
svn commit: r409894 - in /struts/shale/trunk/clay-plugin/src: java/org/apache/shale/clay/config/ java/org/apache/shale/clay/config/beans/ java/org/apache/shale/clay/parser/builder/ test/org/apache/sha
Author: gvanmatre
Date: Sat May 27 15:57:44 2006
New Revision: 409894
URL: http://svn.apache.org/viewvc?rev=409894&view=rev
Log:
Fix for issue SHALE-181 reported by "ÁÖ Ã÷ [EMAIL PROTECTED]".
Added:
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/OptimizeTreeTestCase.java
(with props)
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/ClayTemplateParser.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/VerbatimBuilder.java
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/ClayTemplateParser.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/ClayTemplateParser.java?rev=409894&r1=409893&r2=409894&view=diff
==
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/ClayTemplateParser.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/ClayTemplateParser.java
Sat May 27 15:57:44 2006
@@ -29,6 +29,7 @@
import org.apache.shale.clay.config.beans.ComponentConfigBean;
import org.apache.shale.clay.config.beans.ConfigBean;
import org.apache.shale.clay.config.beans.ElementBean;
+import org.apache.shale.clay.config.beans.TemplateConfigBean;
import org.apache.shale.clay.parser.Node;
import org.apache.shale.clay.parser.Parser;
import org.apache.shale.clay.parser.builder.Builder;
@@ -142,6 +143,11 @@
//verify there is not a duplicate component id within a naming
//container.
config.checkTree(root);
+
+//compress the tree merging adjacent verbatim nodes
+if (config instanceof TemplateConfigBean)
+ ((TemplateConfigBean) config).optimizeTree(root);
+
return root;
}
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java?rev=409894&r1=409893&r2=409894&view=diff
==
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java
Sat May 27 15:57:44 2006
@@ -18,6 +18,7 @@
package org.apache.shale.clay.config.beans;
+import java.util.BitSet;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
@@ -218,5 +219,126 @@
return b;
}
+
+/**
+ * Determines if the node is a transient
+ * outputText (verbatim) component.
+ */
+private boolean isVerbatim(ComponentBean node) {
+
+AttributeBean attr = null;
+if (node.getJsfid().equals("verbatim")
+ && node.getComponentType().equals("javax.faces.HtmlOutputText")) {
+
+if ((attr = node.getAttribute("isTransient")) != null) {
+if (attr.getValue() != null && attr.getValue().length() > 0) {
+return (Character.toLowerCase(attr.getValue().charAt(0))
== 't');
+}
+}
+}
+
+return false;
+}
+
+
+/**
+ * Recursively walks down the graph of meta-data [EMAIL PROTECTED]
ComponentBean}'s
+ * looking at the children of the root. Adjacent
+ * children that are both verbatim component
+ * definitions are merged. If there is only one child and
+ * the child and root nodes are both verbatim
+ * definitions, the child is merged up to the root.
+ */
+public void optimizeTree(ComponentBean root) {
+
+// children is a TreeSet that is returned as a Collection.
+int size = root.getChildren().size();
+ComponentBean[] children = new ComponentBean[size];
+BitSet verbatimSet = new BitSet(size);
+verbatimSet.clear(0, size);
+
+StringBuffer buff = new StringBuffer();
+
+int i = 0;
+Iterator ci = root.getChildrenIterator();
+while (ci.hasNext()) {
+children[i] = (ComponentBean) ci.next();
+if (isVerbatim(children[i])) {
+
+verbatimSet.set(i);
+}
+
+if (children[i].getChildren().size() > 0) {
+optimizeTree(children[i]);// merge children for the top
down
+// starting a the botton of the tree.
+}
+
+i++;
+}
+
+int s = -1;
+while ((s = verbatimSet.nextSetBit(++s)) > -1) {
+
+merge: for (int
svn commit: r409904 - in /struts/sandbox/trunk/tiles: pom.xml tiles-core/pom.xml tiles-test/pom.xml
Author: wsmoak Date: Sat May 27 18:20:31 2006 New Revision: 409904 URL: http://svn.apache.org/viewvc?rev=409904&view=rev Log: Increment the version number to 0.3-SNAPSHOT before publishing new snapshots. Modified: struts/sandbox/trunk/tiles/pom.xml struts/sandbox/trunk/tiles/tiles-core/pom.xml struts/sandbox/trunk/tiles/tiles-test/pom.xml Modified: struts/sandbox/trunk/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/pom.xml?rev=409904&r1=409903&r2=409904&view=diff == --- struts/sandbox/trunk/tiles/pom.xml (original) +++ struts/sandbox/trunk/tiles/pom.xml Sat May 27 18:20:31 2006 @@ -32,7 +32,7 @@ 4.0.0 org.apache.struts.tiles tiles-parent -0.2-SNAPSHOT +0.3-SNAPSHOT pom Standalone Tiles http://struts.apache.org Modified: struts/sandbox/trunk/tiles/tiles-core/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/pom.xml?rev=409904&r1=409903&r2=409904&view=diff == --- struts/sandbox/trunk/tiles/tiles-core/pom.xml (original) +++ struts/sandbox/trunk/tiles/tiles-core/pom.xml Sat May 27 18:20:31 2006 @@ -24,7 +24,7 @@ org.apache.struts.tiles tiles-parent - 0.2-SNAPSHOT + 0.3-SNAPSHOT 4.0.0 Modified: struts/sandbox/trunk/tiles/tiles-test/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/pom.xml?rev=409904&r1=409903&r2=409904&view=diff == --- struts/sandbox/trunk/tiles/tiles-test/pom.xml (original) +++ struts/sandbox/trunk/tiles/tiles-test/pom.xml Sat May 27 18:20:31 2006 @@ -25,7 +25,7 @@ org.apache.struts.tiles tiles-parent - 0.2-SNAPSHOT + 0.3-SNAPSHOT 4.0.0
svn commit: r409914 - in /struts/action2/trunk/apps: pom.xml portlet/pom.xml shopping-cart/pom.xml showcase/pom.xml
Author: wsmoak
Date: Sat May 27 20:24:39 2006
New Revision: 409914
URL: http://svn.apache.org/viewvc?rev=409914&view=rev
Log:
Move the Spring dependencies into .
Add build/finalName to remove the version number from the packaged webapp
filename.
Modified:
struts/action2/trunk/apps/pom.xml
struts/action2/trunk/apps/portlet/pom.xml
struts/action2/trunk/apps/shopping-cart/pom.xml
struts/action2/trunk/apps/showcase/pom.xml
Modified: struts/action2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Sat May 27 20:24:39 2006
@@ -114,10 +114,13 @@
+
+${pom.artifactId}
+
-
-
+
+
org.apache.struts.action2
struts-core
@@ -129,28 +132,24 @@
org.springframework
spring-beans
1.2.6
-true
org.springframework
spring-core
1.2.6
-true
org.springframework
spring-context
1.2.6
-true
org.springframework
spring-web
1.2.6
-true
@@ -159,7 +158,7 @@
1.2.6
test
-
-
-
+
+
+
Modified: struts/action2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/portlet/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==
--- struts/action2/trunk/apps/portlet/pom.xml (original)
+++ struts/action2/trunk/apps/portlet/pom.xml Sat May 27 20:24:39 2006
@@ -10,7 +10,7 @@
org.apache.struts.action2
struts-portlet
war
-Portet Webapp
+Portlet Webapp
portlet-api
Modified: struts/action2/trunk/apps/shopping-cart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/shopping-cart/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==
--- struts/action2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/action2/trunk/apps/shopping-cart/pom.xml Sat May 27 20:24:39 2006
@@ -31,7 +31,27 @@
sitemesh
2.2.1
-
+
+
+ org.springframework
+ spring-beans
+
+
+
+ org.springframework
+ spring-core
+
+
+
+ org.springframework
+ spring-context
+
+
+
+ org.springframework
+ spring-web
+
+
Modified: struts/action2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=409914&r1=409913&r2=409914&view=diff
==
--- struts/action2/trunk/apps/showcase/pom.xml (original)
+++ struts/action2/trunk/apps/showcase/pom.xml Sat May 27 20:24:39 2006
@@ -45,25 +45,21 @@
org.springframework
spring-beans
-1.2.6
org.springframework
spring-core
-1.2.6
org.springframework
spring-context
-1.2.6
org.springframework
spring-web
-1.2.6
svn commit: r409915 - /struts/action2/trunk/apps/showcase/pom.xml
Author: wsmoak Date: Sat May 27 20:33:37 2006 New Revision: 409915 URL: http://svn.apache.org/viewvc?rev=409915&view=rev Log: Add missing struts-core dependency to showcase. Modified: struts/action2/trunk/apps/showcase/pom.xml Modified: struts/action2/trunk/apps/showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=409915&r1=409914&r2=409915&view=diff == --- struts/action2/trunk/apps/showcase/pom.xml (original) +++ struts/action2/trunk/apps/showcase/pom.xml Sat May 27 20:33:37 2006 @@ -32,6 +32,11 @@ +org.apache.struts.action2 +struts-core + + + opensymphony sitemesh 2.2.1
