Author: mrdon
Date: Mon Jan 8 10:41:13 2007
New Revision: 494148
URL: http://svn.apache.org/viewvc?view=rev&rev=494148
Log:
Fixing Struts 2 build for OSX
WW-1588
Modified:
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=494148&r1=494147&r2=494148
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Mon Jan 8 10:41:13 2007
@@ -226,6 +226,25 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>default-tools.jar</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java?view=diff&rev=494148&r1=494147&r2=494148
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
Mon Jan 8 10:41:13 2007
@@ -39,4 +39,8 @@
protected Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new Div(stack, req, res);
}
+
+ public int getType() {
+ return BLOCK;
+ }
}
Modified: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld?view=diff&rev=494148&r1=494147&r2=494148
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
(original)
+++ struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld Mon
Jan 8 10:41:13 2007
@@ -2762,7 +2762,7 @@
<name>doubleListKey</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
- <description><![CDATA[The key expression to use for second
list]]></description>
+ <description><![CDATA[Set the list key of the second
attribute]]></description>
</attribute>
<attribute>
<name>doubleListValue</name>
@@ -4958,7 +4958,7 @@
<name>doubleListKey</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
- <description><![CDATA[The key expression to use for second
list]]></description>
+ <description><![CDATA[Set the list key of the second
attribute]]></description>
</attribute>
<attribute>
<name>doubleListValue</name>
Modified: struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html?view=diff&rev=494148&r1=494147&r2=494148
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html Mon Jan
8 10:41:13 2007
@@ -137,7 +137,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">The key
expression to use for second list</td>
+ <td align="left" valign="top">Set the
list key of the second attribute</td>
</tr>
<tr>
<td align="left"
valign="top">doubleListValue</td>
Modified:
struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html?view=diff&rev=494148&r1=494147&r2=494148
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
Mon Jan 8 10:41:13 2007
@@ -241,7 +241,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left" valign="top">The key
expression to use for second list</td>
+ <td align="left" valign="top">Set the
list key of the second attribute</td>
</tr>
<tr>
<td align="left"
valign="top">doubleListValue</td>
