- Revision
- 927
- Author
- paul
- Date
- 2009-02-25 11:00:15 -0600 (Wed, 25 Feb 2009)
Log Message
better paranamer generation (latest version)
Modified Paths
- trunk/examples/paranamer-example/pom.xml
- trunk/pom.xml
- trunk/waffle-core/pom.xml
- trunk/waffle-core/src/main/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinder.java
Diff
Modified: trunk/examples/paranamer-example/pom.xml (926 => 927)
--- trunk/examples/paranamer-example/pom.xml 2009-02-24 13:13:40 UTC (rev 926) +++ trunk/examples/paranamer-example/pom.xml 2009-02-25 17:00:15 UTC (rev 927) @@ -24,7 +24,7 @@ <artifactId>paranamer-maven-plugin</artifactId> <configuration> <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> - <outputDirectory>${basedir}/src/main/resources</outputDirectory> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> </configuration> <executions> <execution>
Modified: trunk/pom.xml (926 => 927)
--- trunk/pom.xml 2009-02-24 13:13:40 UTC (rev 926) +++ trunk/pom.xml 2009-02-25 17:00:15 UTC (rev 927) @@ -113,7 +113,7 @@ <plugin> <groupId>com.thoughtworks.paranamer</groupId> <artifactId>paranamer-maven-plugin</artifactId> - <version>1.1.5</version> + <version>1.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
Modified: trunk/waffle-core/pom.xml (926 => 927)
--- trunk/waffle-core/pom.xml 2009-02-24 13:13:40 UTC (rev 926) +++ trunk/waffle-core/pom.xml 2009-02-25 17:00:15 UTC (rev 927) @@ -69,6 +69,18 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.codehaus.waffle</groupId> + <artifactId>waffle-core</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + </dependencies> </plugin> </plugins> </build>
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinder.java (926 => 927)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinder.java 2009-02-24 13:13:40 UTC (rev 926) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinder.java 2009-02-25 17:00:15 UTC (rev 927) @@ -87,12 +87,12 @@ * @return the resolved list of arguments needed to satisfy the action method invocation */ protected List<Object> getArguments(Method method, HttpServletRequest request) { - Class<?>[] parameterTypes = method.getParameterTypes(); - String[] parameterNames = null; try { - parameterNames = paranamer.lookupParameterNames(method); + return foo(request, method.getParameterTypes(), + paranamer.lookupParameterNames(method)); } catch (ParameterNamesNotFoundException e) { + e.printStackTrace(); Class<?> declaringClass = method.getDeclaringClass(); int rc = paranamer.areParameterNamesAvailable(declaringClass, method.getName()); if (rc == Paranamer.NO_PARAMETER_NAMES_LIST) { @@ -105,7 +105,11 @@ String message = messageResources.getMessageWithDefault("noParameterNamesFoundForClassAndMethod", "No parameter names found for class ''{0}'' and method ''{1}'' by paranamer ''{2}''", declaringClass.getName(), method.getName(), paranamer); throw new MatchingActionMethodException(message); } + throw new MatchingActionMethodException("Paranamer problem..." + rc); } + } + + private List<Object> foo(HttpServletRequest request, Class<?>[] parameterTypes, String[] parameterNames) { List<String> arguments = new ArrayList<String>(parameterNames.length); // these should always be of the same length
To unsubscribe from this list please visit:
