This is an automated email from the ASF dual-hosted git repository. painter pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
The following commit(s) were added to refs/heads/master by this push: new cb99751 Update dependencies and remove references to SelectorBox (ecs dependency) in the FluxTool cb99751 is described below commit cb9975143a20e7a49fbfaf80c31755d5ff301563 Author: jlpainter <jeff.pain...@gmail.com> AuthorDate: Tue Jan 22 14:19:57 2019 -0500 Update dependencies and remove references to SelectorBox (ecs dependency) in the FluxTool --- src/main/resources/archetype-resources/pom.xml | 30 ++++++++++------------ .../src/main/java/flux/tools/FluxTool.java | 28 ++++++++++++-------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 2d2bf81..39cdf97 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -72,14 +72,17 @@ under the License. </testResources> <plugins> <!-- test will not fail in turbine 4.0.1 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.20.1</version> - <configuration> - <skipTests>#var("skipTests")</skipTests> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0-M2</version> + <configuration> + <skipTests>#var("skipTests")</skipTests> + <!--default setting is forkCount=1/reuseForks=true --> + <reuseForks>false</reuseForks> + <forkCount>1</forkCount> + </configuration> + </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> @@ -240,7 +243,7 @@ under the License. <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.12.v20181114</version> <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <dumpOnStart>true</dumpOnStart> @@ -320,7 +323,7 @@ under the License. <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.0.8</version> </dependency> <!-- if using intake --> <dependency> @@ -336,11 +339,6 @@ under the License. <artifactId>fulcrum-cache</artifactId> <version>1.1.0</version> </dependency> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-upload</artifactId> - <version>1.0.6-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-memory</artifactId> @@ -396,7 +394,7 @@ under the License. <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.8-SNAPSHOT</version> + <version>1.0.8</version> <scope>test</scope> </dependency> </dependencies> diff --git a/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java b/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java index 1bb6b70..1bf49f5 100644 --- a/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java +++ b/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java @@ -40,7 +40,6 @@ import org.apache.turbine.om.security.User; import org.apache.turbine.services.pull.ApplicationTool; import org.apache.turbine.services.security.SecurityService; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.template.SelectorBox; /** * The pull api for flux templates @@ -207,22 +206,29 @@ public class FluxTool implements ApplicationTool, Recyclable { /** */ - public SelectorBox getFieldList() throws Exception { - Object[] names = { "username", "firstname", "middlename", "lastname" }; - Object[] values = { "Username", "First Name", "Middle Name", "Last Name" }; - return new SelectorBox("fieldList", names, values); + public String getFieldList() throws Exception { + StringBuilder selectorBox = new StringBuilder(); + selectorBox.append("<select name=\"fieldList\">"); + selectorBox.append("<option value=\"username\">Username</option>"); + selectorBox.append("<option value=\"firstname\">First Name</option>"); + selectorBox.append("<option value=\"middlename\">Middle Name</option>"); + selectorBox.append("<option value=\"lastname\">Last Name</option>"); + selectorBox.append("</select>"); + return selectorBox.toString(); } /** * This is a tie to the DB implementation something should be added the * pluggable pieces to allow decent parameterized searching. */ - public SelectorBox getUserFieldList() throws Exception { - - Object[] names = { TurbineUserPeer.LOGIN_NAME, TurbineUserPeer.FIRST_NAME, TurbineUserPeer.LAST_NAME }; - Object[] values = { "User Name", "First Name", "Last Name" }; - - return new SelectorBox("fieldList", names, values); + public String getUserFieldList() throws Exception { + StringBuilder selectorBox = new StringBuilder(); + selectorBox.append("<select name=\"fieldList\">"); + selectorBox.append("<option value=\"" + TurbineUserPeer.LOGIN_NAME + "\">User Name</option>"); + selectorBox.append("<option value=\"" + TurbineUserPeer.FIRST_NAME + "\">First Name</option>"); + selectorBox.append("<option value=\"" + TurbineUserPeer.LAST_NAME + "\">Last Name</option>"); + selectorBox.append("</select>"); + return selectorBox.toString(); } /**