Skip to content

Commit

Permalink
WW-3872 Moves files to appropriate locations
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1509085 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
lukaszlenart committed Aug 1, 2013
1 parent 7e2f9f6 commit 303eb9f
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 0 deletions.
4 changes: 4 additions & 0 deletions apps/portlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-dwr-plugin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
</dependency>

<dependency>
<groupId>org.apache.velocity</groupId>
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions apps/portlet/src/main/resources/struts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
<include file="struts-edit.xml"/>
<include file="struts-help.xml"/>
<include file="struts-eventing.xml"/>
<include file="struts-tiles.xml"/>
</struts>
File renamed without changes.
1 change: 1 addition & 0 deletions apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Here you'll find examples of what is possible with the Struts Portlet integratio
<li><a href="<s:url action="fileUpload" method="input"/>">File upload</li>
<li><a href="<s:url action="freeMarkerExample"/>">FreeMarker</a></li>
<li><a href="<s:url action="velocityHelloWorld"/>">Velocity</a></li>
<li><a href="<s:url action="index" namespace="/tiles"/>">Form Example Validation with Tiles</a></li>
<li><a href="<s:url action="index" portletMode="edit"/>">Go to edit mode and see what's there</a></li>
<li><a href="<s:url action="index" portletMode="help"/>">Go to help mode and see what's there</a></li>
</ul>
16 changes: 16 additions & 0 deletions apps/portlet/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app id="StrutsPortlet">

<context-param>
<param-name>org.apache.tiles.factory.TilesContainerFactory</param-name>
<param-value>org.apache.struts2.tiles.StrutsTilesContainerFactory</param-value>
</context-param>
<context-param>
<param-name>org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG</param-name>
<param-value>/WEB-INF/tiles.xml</param-value>
</context-param>

<!-- Uncomment/comment this if you need/don't need Spring support -->
<context-param>
<param-name>contextConfigLocation</param-name>
Expand All @@ -12,4 +22,10 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>

<!-- Tiles Plugin -->
<listener>
<listener-class>org.apache.struts2.tiles.StrutsTilesListener
</listener-class>
</listener>

</web-app>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,11 @@
<artifactId>struts2-dwr-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
Expand Down

0 comments on commit 303eb9f

Please sign in to comment.