Permalink
Browse files

Got the project starting without major problems

  • Loading branch information...
1 parent 051fe17 commit 39b66bbdfcc93ae5f78caf16bae06360ee349391 Rafael Steil committed Jan 15, 2012
Showing with 287 additions and 170 deletions.
  1. +76 −83 .classpath
  2. BIN lib/activation.jar
  3. BIN lib/antlr-2.7.6.jar
  4. BIN lib/aopalliance.jar
  5. BIN lib/asm-2.2.3.jar
  6. BIN lib/asm-attrs.jar
  7. BIN lib/asm-commons-2.2.3.jar
  8. BIN lib/asm-util-2.2.3.jar
  9. BIN lib/aspectjrt.jar
  10. BIN lib/aspectjweaver.jar
  11. BIN lib/backport-util-concurrent.jar
  12. BIN lib/bsh-2.0b4.jar
  13. BIN lib/c3p0-0.9.1.2.jar
  14. BIN lib/casclient.jar
  15. BIN lib/cglib-nodep-2.1_3.jar
  16. BIN lib/commons-codec-1.2.jar
  17. BIN lib/commons-collections-3.2.1.jar
  18. BIN lib/commons-configuration-1.3.jar
  19. BIN lib/commons-fileupload-1.1.jar
  20. BIN lib/commons-httpclient-3.1-beta1.jar
  21. BIN lib/commons-io-1.3.1.jar
  22. BIN lib/commons-lang-2.3.jar
  23. BIN lib/commons-logging.jar
  24. BIN lib/dom4j-1.6.1.jar
  25. BIN lib/ehcache-1.4.1.jar
  26. BIN lib/ejb3-persistence.jar
  27. BIN lib/el-functors-1.0.3.jar
  28. BIN lib/groovy-1.5.6.jar
  29. BIN lib/guava-r07.jar
  30. BIN lib/hibernate-3.2.6-ga.jar
  31. BIN lib/hibernate-annotations-3.3.1-ga.jar
  32. BIN lib/hibernate-commons-annotations.jar
  33. BIN lib/hibernate-search.jar
  34. BIN lib/hsqldb-1.8.0.7.jar
  35. BIN lib/htmlparser-1.5.jar
  36. BIN lib/javassist-3.14.0.GA.jar
  37. BIN lib/jaxb-api-2.1.jar
  38. BIN lib/jaxb-impl-2.0.3.jar
  39. BIN lib/jdom.jar
  40. BIN lib/jsr173_api-1.0.jar
  41. BIN lib/jstl-api-1.2.jar
  42. BIN lib/jstl-impl-1.2.jar
  43. BIN lib/jta-1.0.1B.jar
  44. BIN lib/log4j-1.2.16.jar
  45. BIN lib/lucene-core-2.3.0.jar
  46. BIN lib/mail.jar
  47. BIN lib/mirror-1.5.1.jar
  48. BIN lib/mysql-connector-java-5.1.6-bin.jar
  49. BIN lib/objenesis-1.1.jar
  50. BIN lib/ognl-2.7.3.jar
  51. BIN lib/org.springframework.aop-3.0.5.RELEASE.jar
  52. BIN lib/org.springframework.asm-3.0.5.RELEASE.jar
  53. BIN lib/org.springframework.aspects-3.0.5.RELEASE.jar
  54. BIN lib/org.springframework.beans-3.0.5.RELEASE.jar
  55. BIN lib/org.springframework.context-3.0.5.RELEASE.jar
  56. BIN lib/org.springframework.core-3.0.5.RELEASE.jar
  57. BIN lib/org.springframework.expression-3.0.5.RELEASE.jar
  58. BIN lib/org.springframework.web-3.0.5.RELEASE.jar
  59. BIN lib/paranamer-2.2.jar
  60. BIN lib/persistence-api-1.0.jar
  61. BIN lib/picocontainer-1.3.jar
  62. BIN lib/postgresql-8.3-604.jdbc4.jar
  63. BIN lib/scannotation-1.0.2.jar
  64. BIN lib/slf4j-api-1.6.1.jar
  65. BIN lib/slf4j-log4j12-1.6.1.jar
  66. BIN lib/standard-1.1.2.jar
  67. BIN lib/urlrewrite-3.1.0.jar
  68. BIN lib/vraptor-3.4.0.jar
  69. BIN lib/xalan.jar
  70. BIN lib/xercesImpl.jar
  71. BIN lib/xml-apis.jar
  72. BIN lib/xom-1.0.jar
  73. BIN lib/xpp3_min-1.1.3.4.O.jar
  74. BIN lib/xstream-1.3.1.jar
  75. BIN lib/yarfraw-0.92.jar
  76. +1 −1 src/main/java/net/jforum/actions/interceptors/ControllerSecurityInterceptor.java
  77. +1 −2 src/main/java/net/jforum/actions/interceptors/ExtendsAnnotationInterceptor.java
  78. +1 −1 src/main/java/net/jforum/actions/interceptors/MethodSecurityInterceptor.java
  79. +7 −1 src/main/java/net/jforum/actions/interceptors/SessionManagerInterceptor.java
  80. +4 −0 src/main/java/net/jforum/controllers/MessageController.java
  81. +0 −2 src/main/java/net/jforum/controllers/PostController.java
  82. +1 −0 src/main/java/net/jforum/controllers/UserController.java
  83. +38 −0 src/main/java/net/jforum/core/PageExtensionRedirectFilter.java
  84. +3 −1 src/main/java/net/jforum/core/UserSessionListener.java
  85. +27 −0 src/main/java/net/jforum/core/VRaptorCustomPathResolver.java
  86. +28 −0 src/main/java/net/jforum/core/VRaptorSpringProvider.java
  87. +1 −1 src/main/java/net/jforum/core/tags/DisplayFormattedMessageTag.java
  88. +1 −1 src/main/java/net/jforum/core/tags/FormatSignatureTag.java
  89. +15 −20 src/main/java/net/jforum/core/tags/JForumTag.java
  90. +24 −23 src/main/java/net/jforum/core/tags/URLTag.java
  91. +9 −7 src/main/java/net/jforum/entities/UserSession.java
  92. +4 −1 src/main/java/net/jforum/plugins/post/PostEditInterceptor.java
  93. +2 −0 src/main/java/net/jforum/services/AvatarService.java
  94. +3 −0 src/main/java/net/jforum/services/LostPasswordService.java
  95. +2 −0 src/main/java/net/jforum/services/MostUsersEverOnlineService.java
  96. +3 −0 src/main/java/net/jforum/services/UserService.java
  97. +3 −0 src/main/java/net/jforum/sso/DefaultLoginAuthenticator.java
  98. +2 −0 src/main/java/net/jforum/util/GroupInteractionFilter.java
  99. +4 −17 src/main/java/net/jforum/util/JForumConfig.java
  100. +1 −1 src/main/resources/log4j.xml
  101. +19 −6 src/test/resources/log4j.xml
  102. +6 −1 webapp/WEB-INF/web.xml
  103. +1 −1 webapp/index.jsp
  104. 0 webapp/templates/default/{forums → forum}/folder_descriptions.jsp
  105. 0 webapp/templates/default/{forums → forum}/list.jsp
  106. 0 webapp/templates/default/{forums → forum}/moderation_buttons.jsp
  107. 0 webapp/templates/default/{forums → forum}/newMessages.jsp
  108. 0 webapp/templates/default/{forums → forum}/pending_moderation.jsp
  109. 0 webapp/templates/default/{forums → forum}/show.jsp
  110. 0 webapp/templates/default/{forums → forum}/topic_folder_images.jsp
View
@@ -1,17 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="webapp/WEB-INF/lib" path="lib"/>
- <classpathentry kind="src" output="target/tests" path="src/test/java"/>
- <classpathentry kind="src" output="target/tests" path="src/test/resources"/>
<classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/activation.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/antlr-2.7.6.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/aopalliance.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/asm-2.2.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/asm-attrs.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/asm-commons-2.2.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/asm-util-2.2.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/aspectjrt.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/aspectjweaver.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/backport-util-concurrent.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/bsh-2.0b4.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/c3p0-0.9.1.2.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/casclient.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/cglib-nodep-2.1_3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-codec-1.2.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-configuration-1.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-fileupload-1.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-httpclient-3.1-beta1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-io-1.3.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-lang-2.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/ehcache-1.4.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/ejb3-persistence.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/el-functors-1.0.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/groovy-1.5.6.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/guava-r07.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/hibernate-3.2.6-ga.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/hibernate-annotations-3.3.1-ga.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/hibernate-commons-annotations.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/hibernate-search.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/hsqldb-1.8.0.7.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/htmlparser-1.5.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/javassist-3.14.0.GA.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/jaxb-api-2.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/jaxb-impl-2.0.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/jdom.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/jsr173_api-1.0.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/jstl-api-1.2.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/jstl-impl-1.2.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/jta-1.0.1B.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/log4j-1.2.16.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/lucene-core-2.3.0.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/mail.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/mirror-1.5.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/mysql-connector-java-5.1.6-bin.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/objenesis-1.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/ognl-2.7.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/paranamer-2.2.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/persistence-api-1.0.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/picocontainer-1.3.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/postgresql-8.3-604.jdbc4.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/scannotation-1.0.2.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/slf4j-api-1.6.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/slf4j-log4j12-1.6.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/standard-1.1.2.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/urlrewrite-3.1.0.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/vraptor-3.4.0.jar" sourcepath="E:/dev/vraptor-3.4.0/src/main/java"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/xalan.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/xml-apis.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/xom-1.0.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/xstream-1.3.1.jar"/>
+ <classpathentry kind="lib" path="webapp/WEB-INF/lib/yarfraw-0.92.jar"/>
<classpathentry kind="lib" path="compile-lib/annotations-api.jar"/>
<classpathentry kind="lib" path="compile-lib/aspectjrt-1.2.1.jar"/>
<classpathentry kind="lib" path="compile-lib/cglib-nodep-2.1_3.jar"/>
- <classpathentry kind="lib" path="compile-lib/cobertura/asm-2.2.1.jar"/>
- <classpathentry kind="lib" path="compile-lib/cobertura/asm-tree-2.2.1.jar"/>
- <classpathentry kind="lib" path="compile-lib/cobertura/cobertura.jar"/>
- <classpathentry kind="lib" path="compile-lib/cobertura/jakarta-oro-2.0.8.jar"/>
<classpathentry kind="lib" path="compile-lib/dumbster1.6.jar"/>
<classpathentry kind="lib" path="compile-lib/el-api.jar"/>
<classpathentry kind="lib" path="compile-lib/hamcrest-library-1.1.jar"/>
@@ -24,82 +92,7 @@
<classpathentry kind="lib" path="compile-lib/jsp-api.jar"/>
<classpathentry kind="lib" path="compile-lib/junit-4.4.jar"/>
<classpathentry kind="lib" path="compile-lib/servlet-api.jar"/>
- <classpathentry kind="lib" path="compile-lib/spring-test.jar"/>
<classpathentry kind="lib" path="compile-lib/xmlunit-1.2.jar"/>
- <classpathentry kind="lib" path="lib/activation.jar"/>
- <classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/>
- <classpathentry kind="lib" path="lib/asm-2.2.3.jar"/>
- <classpathentry kind="lib" path="lib/asm-attrs.jar"/>
- <classpathentry kind="lib" path="lib/asm-commons-2.2.3.jar"/>
- <classpathentry kind="lib" path="lib/asm-util-2.2.3.jar"/>
- <classpathentry kind="lib" path="lib/aspectjrt.jar"/>
- <classpathentry kind="lib" path="lib/aspectjweaver.jar"/>
- <classpathentry kind="lib" path="lib/backport-util-concurrent.jar"/>
- <classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
- <classpathentry kind="lib" path="lib/c3p0-0.9.1.2.jar"/>
- <classpathentry kind="lib" path="lib/casclient.jar"/>
- <classpathentry kind="lib" path="lib/cglib-nodep-2.1_3.jar"/>
- <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/>
- <classpathentry kind="lib" path="lib/commons-configuration-1.3.jar" sourcepath="/Users/carneiro/.m2/repository/commons-configuration/commons-configuration/1.3/commons-configuration-1.3-sources.jar"/>
- <classpathentry kind="lib" path="lib/commons-fileupload-1.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-httpclient-3.1-beta1.jar"/>
- <classpathentry kind="lib" path="lib/commons-io-1.3.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.3.jar" sourcepath="/Users/carneiro/.m2/repository/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/>
- <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/ehcache-1.4.1.jar"/>
- <classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>
- <classpathentry kind="lib" path="lib/el-functors-1.0.3.jar"/>
- <classpathentry kind="lib" path="lib/groovy-1.5.6.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-3.2.6-ga.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-annotations-3.3.1-ga.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-commons-annotations.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-search.jar"/>
- <classpathentry kind="lib" path="lib/hsqldb-1.8.0.7.jar"/>
- <classpathentry kind="lib" path="lib/htmlparser-1.5.jar"/>
- <classpathentry kind="lib" path="lib/jaxb-api-2.1.jar"/>
- <classpathentry kind="lib" path="lib/jaxb-impl-2.0.3.jar"/>
- <classpathentry kind="lib" path="lib/jdom.jar"/>
- <classpathentry kind="lib" path="lib/jsr173_api-1.0.jar"/>
- <classpathentry kind="lib" path="lib/jta-1.0.1B.jar"/>
- <classpathentry kind="lib" path="lib/lucene-core-2.3.0.jar"/>
- <classpathentry kind="lib" path="lib/mail.jar"/>
- <classpathentry kind="lib" path="lib/mysql-connector-java-5.1.6-bin.jar"/>
- <classpathentry kind="lib" path="lib/objenesis-1.1.jar"/>
- <classpathentry kind="lib" path="lib/persistence-api-1.0.jar"/>
- <classpathentry kind="lib" path="lib/picocontainer-1.3.jar"/>
- <classpathentry kind="lib" path="lib/postgresql-8.3-604.jdbc4.jar"/>
- <classpathentry kind="lib" path="lib/standard-1.1.2.jar"/>
- <classpathentry kind="lib" path="lib/urlrewrite-3.1.0.jar"/>
- <classpathentry kind="lib" path="lib/xalan.jar"/>
- <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
- <classpathentry kind="lib" path="lib/xml-apis.jar"/>
- <classpathentry kind="lib" path="lib/xom-1.0.jar"/>
- <classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="lib" path="lib/yarfraw-0.92.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/aopalliance.jar"/>
- <classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/guava-r07.jar"/>
- <classpathentry kind="lib" path="lib/javassist-3.14.0.GA.jar"/>
- <classpathentry kind="lib" path="lib/jstl-api-1.2.jar"/>
- <classpathentry kind="lib" path="lib/jstl-impl-1.2.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
- <classpathentry kind="lib" path="lib/mirror-1.5.1.jar"/>
- <classpathentry kind="lib" path="lib/ognl-2.7.3.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.aop-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.asm-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.beans-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.context-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.core-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.expression-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.web-3.0.5.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/paranamer-2.2.jar"/>
- <classpathentry kind="lib" path="lib/scannotation-1.0.2.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/vraptor-3.4.0.jar" sourcepath="E:\dev\projects\java\vraptor-3.4.0\src\main\java"/>
- <classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
+ <classpathentry kind="lib" path="compile-lib/spring-test.jar"/>
<classpathentry kind="output" path="webapp/WEB-INF/classes"/>
</classpath>
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -24,7 +24,7 @@
* Intercepts and process the {@link SecurityConstraint} annotation for controllers
* @author Rafael Steil
*/
-@Intercepts
+@Intercepts(after = SessionManagerInterceptor.class)
@RequestScoped
public class ControllerSecurityInterceptor extends SecurityInterceptor {
public ControllerSecurityInterceptor(HttpServletRequest request, Result result, UserSession userSession, Container container) {
@@ -13,7 +13,6 @@
import net.jforum.extensions.ActionExtensionManager;
import net.jforum.extensions.Extends;
import br.com.caelum.vraptor.InterceptionException;
-import br.com.caelum.vraptor.Intercepts;
import br.com.caelum.vraptor.core.InterceptorStack;
import br.com.caelum.vraptor.interceptor.Interceptor;
import br.com.caelum.vraptor.resource.ResourceMethod;
@@ -22,7 +21,7 @@
* @author Rafael Steil
* @author Bill
*/
-@Intercepts
+//@Intercepts
public class ExtendsAnnotationInterceptor implements Interceptor {
private final ActionExtensionManager manager;
@@ -24,7 +24,7 @@
* Intercepts and process the {@link SecurityConstraint} annotation for methods
* @author Rafael Steil
*/
-@Intercepts
+@Intercepts(after = SessionManagerInterceptor.class)
@RequestScoped
public class MethodSecurityInterceptor extends SecurityInterceptor {
public MethodSecurityInterceptor(HttpServletRequest request, Result result, UserSession userSession, Container container) {
@@ -10,6 +10,8 @@
*/
package net.jforum.actions.interceptors;
+import javax.servlet.http.HttpServletRequest;
+
import net.jforum.core.SessionManager;
import net.jforum.entities.UserSession;
import br.com.caelum.vraptor.InterceptionException;
@@ -22,15 +24,19 @@
public class SessionManagerInterceptor implements Interceptor {
private final UserSession userSession;
private final SessionManager sessionManager;
+ private final HttpServletRequest request;
- public SessionManagerInterceptor(UserSession userSession, SessionManager sessionManager) {
+ public SessionManagerInterceptor(UserSession userSession, SessionManager sessionManager, HttpServletRequest request) {
+ this.request = request;
+ userSession.setRequest(request);
this.userSession = userSession;
this.sessionManager = sessionManager;
}
@Override
public void intercept(InterceptorStack stack, ResourceMethod method, Object resourceInstance) throws InterceptionException {
sessionManager.refreshSession(userSession);
+ request.setAttribute("userSession", userSession);
stack.next(method, resourceInstance);
}
@@ -42,6 +42,10 @@ public void accessDenied() {
this.result.forwardTo(Actions.MESSAGE);
}
+ public void message() {
+
+ }
+
/**
* Displays a "waiting moderation" message for newly created topics in
* moderated forums
@@ -95,8 +95,6 @@ public void delete(int postId) {
public void editSave( Post post, PostFormOptions options,
List<PollOption> pollOptions, ModerationLog moderationLog) {
- //TODO Verify this -> @Parameter(create=true) in param pollOptions
-
ActionUtils.definePostOptions(post, options);
post.getTopic().setType(options.getTopicType());
@@ -271,6 +271,7 @@ public void insertSave(User user) {
* Shows the profile of some user
* @param userId the user to show
*/
+ @Path("/profile/{userId}")
public void profile(int userId) {
if (!this.userSession.getRoleManager().getCanViewProfile()) {
this.result.redirectTo(MessageController.class).accessDenied();
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) JForum Team. All rights reserved.
+ *
+ * The software in this package is published under the terms of the LGPL
+ * license a copy of which has been included with this distribution in the
+ * license.txt file.
+ *
+ * The JForum Project
+ * http://www.jforum.net
+ */
+package net.jforum.core;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+public class PageExtensionRedirectFilter implements Filter {
+ @Override
+ public void destroy() {
+ }
+
+ @Override
+ public void doFilter(ServletRequest req, ServletResponse res, FilterChain filterChain) throws IOException, ServletException {
+ HttpServletRequest request = (HttpServletRequest)req;
+ HttpServletRequest response = (HttpServletRequest)res;
+ }
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+}
@@ -60,12 +60,14 @@
/**
* @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent)
*/
+ @Override
public void sessionCreated(HttpSessionEvent event) {
}
/**
* @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent)
*/
+ @Override
public void sessionDestroyed(HttpSessionEvent event) {
HttpSession session = event.getSession();
@@ -84,7 +86,7 @@ public void sessionDestroyed(HttpSessionEvent event) {
else {
String sessionId = session.getId();
- SessionManager sessionManager = (SessionManager)beanFactory.getBean(SessionManager.class.getName());
+ SessionManager sessionManager = beanFactory.getBean(SessionManager.class);
try {
sessionManager.storeSession(sessionId);
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) JForum Team. All rights reserved.
+ *
+ * The software in this package is published under the terms of the LGPL
+ * license a copy of which has been included with this distribution in the
+ * license.txt file.
+ *
+ * The JForum Project
+ * http://www.jforum.net
+ */
+package net.jforum.core;
+
+import br.com.caelum.vraptor.http.FormatResolver;
+import br.com.caelum.vraptor.ioc.Component;
+import br.com.caelum.vraptor.view.DefaultPathResolver;
+
+@Component
+public class VRaptorCustomPathResolver extends DefaultPathResolver {
+ public VRaptorCustomPathResolver(FormatResolver resolver) {
+ super(resolver);
+ }
+
+ @Override
+ protected String getPrefix() {
+ return "/templates/default/";
+ }
+}
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) JForum Team. All rights reserved.
+ *
+ * The software in this package is published under the terms of the LGPL
+ * license a copy of which has been included with this distribution in the
+ * license.txt file.
+ *
+ * The JForum Project
+ * http://www.jforum.net
+ */
+package net.jforum.core;
+
+import javax.servlet.ServletContext;
+
+import net.jforum.util.ConfigKeys;
+
+import org.springframework.web.context.ConfigurableWebApplicationContext;
+
+import br.com.caelum.vraptor.ioc.spring.SpringProvider;
+
+public class VRaptorSpringProvider extends SpringProvider {
+ @Override
+ protected ConfigurableWebApplicationContext getParentApplicationContext(ServletContext context) {
+ ConfigurableWebApplicationContext springContext = super.getParentApplicationContext(context);
+ context.setAttribute(ConfigKeys.SPRING_CONTEXT, springContext);
+ return springContext;
+ }
+}
@@ -31,7 +31,7 @@
public DisplayFormattedMessageTag() {
if (formatters == null) {
- formatters = (PostFormatters)this.getBean(PostFormatters.class.getName());
+ formatters = this.getBean(PostFormatters.class);
}
}
Oops, something went wrong.

0 comments on commit 39b66bb

Please sign in to comment.