- Nuiton-web-commits - mailman.cloud.codelutin.com

r310 - in trunk/nuiton-struts2: . src/main/java/org/nuiton/web/struts2/converters
by bleny＠users.nuiton.org 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 10:54:52 +0100 (Fri, 28 Feb 2014) New Revision: 310 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/310 Log: fixes #3104 introduce JsonConverter and add json-plugin as provided Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java Modified: trunk/nuiton-struts2/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-02-04 18:11:04 UTC (rev 309) +++ trunk/nuiton-struts2/pom.xml 2014-02-28 09:54:52 UTC (rev 310) @@ -21,6 +21,11 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java 2014-02-28 09:54:52 UTC (rev 310) @@ -0,0 +1,99 @@ +package org.nuiton.web.struts2.converters; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.json.JSONException; +import org.apache.struts2.json.JSONPopulator; +import org.apache.struts2.json.JSONUtil; +import org.apache.struts2.util.StrutsTypeConverter; + +import java.util.Arrays; +import java.util.Map; + +/** + * This converter will convert any field by serializing it to its JSON String representation. + * + * You must have struts2-json-plugin provided in you classpath. + * + * If you want the serialized JSON to be printed properly in a JSP, don't forget to escape it: + * + * <pre> + * <s:property value="my.path.to.myProperty" escapeHtml="false" /> + * </pre> + */ +public class JsonConverter extends StrutsTypeConverter { + + private static final Log log = LogFactory.getLog(JsonConverter.class); + + @Override + public Object convertFromString(Map context, String[] values, Class toClass) { + + if (log.isTraceEnabled()) { + log.trace("will convertFromString " + Arrays.toString(values)); + } + + Object object; + if (values.length == 0) { + object = null; + } else if (values.length == 1) { + String json = values[0]; + if (log.isTraceEnabled()) { + log.trace("will deserialize " + json); + } + try { + Map deserialize = (Map) JSONUtil.deserialize(json); + JSONPopulator jsonPopulator = new JSONPopulator(); + object = toClass.newInstance(); + jsonPopulator.populateObject(object, deserialize); + } catch (Throwable e) { + if (log.isErrorEnabled()) { + log.error("unable to parse json =\n" + json, e); + } + throw new RuntimeException("unable to parse json = " + json, e); + } + } else { + throw new UnsupportedOperationException("unable to parse multiple values " + Arrays.toString(values)); + } + + if (log.isTraceEnabled()) { + log.trace("convert from string " + Arrays.toString(values) + " will return " + object); + } + + return object; + } + + @Override + public String convertToString(Map context, Object object) { + + if (log.isTraceEnabled()) { + log.trace("will serialize " + object); + } + + String json; + + if (object == null) { + json = "null"; + } else { + try { + json = JSONUtil.serialize(object); + } catch (JSONException e) { + if (log.isErrorEnabled()) { + log.error("unable to serialize object " + object, e); + } + throw new RuntimeException("unable to serialize object " + object, e); + } catch (Throwable t) { + if (log.isErrorEnabled()) { + log.error("error while serializing object " + object, t); + } + throw new RuntimeException("error while serializing object " + object, t); + } + } + + if (log.isTraceEnabled()) { + log.trace("serialize " + object + " will return " + json); + } + + return json; + + } +} \ No newline at end of file

1 0

Build failed in Jenkins: nuiton-web #7
by admin+ci-nuiton.org＠codelutin.com 06 Feb '14

06 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/7/> ------------------------------------------ Started by user Tony CHEMIT Building in workspace <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/> Updating http://svn.nuiton.org/svn/nuiton-web/trunk at revision '2014-02-05T21:43:15.683 +0100' At revision 309 no change for http://svn.nuiton.org/svn/nuiton-web/trunk since the previous build Parsing POMs [trunk] $ /opt/jdk7/bin/java -Dsettings.security=/var/local/forge/data/nuiton.org/maven/settings-security.xml -Djava.awt.headless=true -cp /var/local/forge/data/nuiton.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.4.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /var/local/forge/tomcat/nuiton.org/webapps/jenkins/WEB-INF/lib/remoting-2.33.jar /var/local/forge/data/nuiton.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.4.jar /var/local/forge/data/nuiton.org/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.4.jar 53410 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/pom.xml> -s /var/local/forge/data/nuiton.org/maven/settings.xml -e -U clean verify [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] Nuiton Web [INFO] Nuiton Web :: Nuiton Web [INFO] Nuiton Web :: Nuiton Struts 2 [INFO] Nuiton Web :: Nuiton Tapestry [INFO] Nuiton Web :: Nuiton RSS [INFO] Nuiton Web :: Nuiton GWT [INFO] Nuiton Web :: Nuiton Security [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-web-parent --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-web-parent --- [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ nuiton-web-parent --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/target/surefire-wor…> [INFO] Executed tasks [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ nuiton-web-parent --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Web 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-web --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-web --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-web --- [INFO] Compiling 10 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/target/c…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/src/main…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/src/main…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ nuiton-web --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/target/s…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ nuiton-web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ nuiton-web --- [INFO] Nothing to compile - all classes are up to date [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ nuiton-web --- [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ nuiton-web --- [INFO] Building jar: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/target/n…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ nuiton-web --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Struts 2 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-struts2 --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/targ…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-struts2 --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-struts2 --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 7 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-struts2 --- [INFO] Compiling 11 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/targ…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/src/…>:[3,1] class, interface, or enum expected [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/src/…>:[3,1] class, interface, or enum expected [INFO] 2 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Nuiton Web ........................................ SUCCESS [2.337s] [INFO] Nuiton Web :: Nuiton Web .......................... SUCCESS [1.724s] [INFO] Nuiton Web :: Nuiton Struts 2 ..................... FAILURE [0.349s] [INFO] Nuiton Web :: Nuiton Tapestry ..................... SKIPPED [INFO] Nuiton Web :: Nuiton RSS .......................... SKIPPED [INFO] Nuiton Web :: Nuiton GWT .......................... SKIPPED [INFO] Nuiton Web :: Nuiton Security ..................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 5.667s [INFO] Finished at: Wed Feb 05 21:43:24 CET 2014 [INFO] Final Memory: 29M/311M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project nuiton-struts2: Compilation failure: Compilation failure: [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/src/…>:[3,1] class, interface, or enum expected [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/src/…>:[3,1] class, interface, or enum expected [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project nuiton-struts2: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :nuiton-struts2 Sending e-mails to: nuiton-web-commits(a)list.nuiton.org channel stopped

1 1

Build failed in Jenkins: nuiton-web » Nuiton Web :: Nuiton Struts 2 #7
by admin+ci-nuiton.org＠codelutin.com 06 Feb '14

06 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Struts 2 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-struts2 --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-struts2 --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-struts2 --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 7 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-struts2 --- [INFO] Compiling 11 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…>:[3,1] class, interface, or enum expected [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…>:[3,1] class, interface, or enum expected [INFO] 2 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

Build failed in Jenkins: nuiton-web #3
by admin+ci-nuiton.org＠codelutin.com 05 Feb '14

05 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/3/changes> Changes: [athimel] fixes #3062 Updates nuiton-utils to 3.0-rc-2 fixes #3063 Updates Eugene to 2.7.4 fixes #3064 Updates nuiton-i18n to 3.0 fixes #3065 Updates nuiton-config to 3.0-alpha-2 fixes #3066 Updates topia to 3.0-alpha-10 fixes #3067 Updates mavenpom to 4.7 ------------------------------------------ [...truncated 345 lines...] [mkdir] Created dir: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/s…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ nuiton-rss --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ nuiton-rss --- [INFO] Compiling 2 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/t…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ nuiton-rss --- [INFO] Surefire report directory: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/s…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running org.nuiton.rss.RSSTest TIME:300000 RENDER:class org.nuiton.rss.FeedHTMLRenderer TIME:10 RENDER:interface org.nuiton.rss.FeedRenderer Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.179 sec - in org.nuiton.rss.RSSTest Running org.nuiton.rss.RSSGeneratorHelperTest 2014/02/04 07:08:02 INFO (RSSGeneratorHelperTest.java:70) basedir for test <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/s…> 2014/02/04 07:08:02 INFO (RSSGeneratorHelperTest.java:95) feedFile : /tmp/rssinclude/RSSGeneratorHelperTest-20107698157085127.xml 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:70) basedir for test <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/s…> 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:95) feedFile : /tmp/rssinclude/RSSGeneratorHelperTest-20107698444294158.xml 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:70) basedir for test <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/s…> 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:95) feedFile : /tmp/rssinclude/RSSGeneratorHelperTest-20107698456189349.xml 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:70) basedir for test <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/s…> 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:95) feedFile : /tmp/rssinclude/RSSGeneratorHelperTest-20107698481299927.xml 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:70) basedir for test <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/s…> 2014/02/04 07:08:03 INFO (RSSGeneratorHelperTest.java:95) feedFile : /tmp/rssinclude/RSSGeneratorHelperTest-20107698501132921.xml Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.79 sec - in org.nuiton.rss.RSSGeneratorHelperTest Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-war-plugin:2.4:war (default-war) @ nuiton-rss --- [INFO] Packaging webapp [INFO] Assembling webapp [nuiton-rss] in [<http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/n…]> [INFO] Processing war project [INFO] Copying webapp webResources [<http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/src/main…]> to [<http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/n…]> [INFO] Copying webapp resources [<http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/src/main…]> [INFO] Webapp assembled in [121 msecs] [INFO] Building war: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/n…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ nuiton-rss --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton GWT 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-gwt --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-gwt --- [INFO] [INFO] --- i18n-maven-plugin:3.0:parserGWTJava (scan-gwt-java-source) @ nuiton-gwt --- [INFO] start entry basedir:<http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/main…,> includes:[**/*.java] [INFO] 14 file(s) to process (among 14 files) [INFO] Parsing is done. [treated file(s) : 1/14](total time:1.031s) ( ~ 73.636ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.0:gen (gen) @ nuiton-gwt >>> [INFO] [INFO] --- i18n-maven-plugin:3.0:get (get) @ nuiton-gwt --- [INFO] config - basedir : <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/g…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter gwt-java.getter in 308739ns [INFO] Copying nuiton-gwt.properties to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/g…> [INFO] Copying nuiton-gwt.properties to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/g…> [INFO] [INFO] <<< i18n-maven-plugin:3.0:gen (gen) @ nuiton-gwt <<< [INFO] [INFO] --- i18n-maven-plugin:3.0:gen (gen) @ nuiton-gwt --- [INFO] config - src basedir : <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/main…> [INFO] config - out basedir : <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/g…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-gwt --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] [INFO] --- gwt-maven-plugin:2.2.0:resources (default) @ nuiton-gwt --- [INFO] auto discovered modules [org.nuiton.web.gwt.NuitonGWT] [INFO] 15 source files from GWT module org.nuiton.web.gwt.NuitonGWT [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-gwt --- [INFO] Compiling 14 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/c…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/main…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/main…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ nuiton-gwt --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/s…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ nuiton-gwt --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/test…> [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ nuiton-gwt --- [INFO] No sources to compile [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ nuiton-gwt --- [INFO] No tests to run. [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ nuiton-gwt --- [INFO] Building jar: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/n…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ nuiton-gwt --- [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ nuiton-gwt >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-gwt --- [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ nuiton-gwt <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ nuiton-gwt --- [INFO] Building jar: <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/n…> [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Security 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-security --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/tar…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.4:generate (eugene-generation) @ nuiton-security --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (5 KB at 109.3 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (98 KB at 1170.4 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [WARNING] Failed to getClass for org.nuiton.eugene.plugin.GenerateMojo [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Nuiton Web ........................................ SUCCESS [2.480s] [INFO] Nuiton Web :: Nuiton Web .......................... SUCCESS [3.207s] [INFO] Nuiton Web :: Nuiton Struts 2 ..................... SUCCESS [2.104s] [INFO] Nuiton Web :: Nuiton Tapestry ..................... SUCCESS [1.177s] [INFO] Nuiton Web :: Nuiton RSS .......................... SUCCESS [3.255s] [INFO] Nuiton Web :: Nuiton GWT .......................... SUCCESS [3.785s] [INFO] Nuiton Web :: Nuiton Security ..................... FAILURE [0.811s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 18.579s [INFO] Finished at: Tue Feb 04 19:08:09 CET 2014 [INFO] Final Memory: 39M/292M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.eugene:eugene-maven-plugin:2.7.4:generate (eugene-generation) on project nuiton-security: Execution eugene-generation of goal org.nuiton.eugene:eugene-maven-plugin:2.7.4:generate failed: Plugin org.nuiton.eugene:eugene-maven-plugin:2.7.4 or one of its dependencies could not be resolved: Failure to find org.nuiton.topia:topia-persistence:jar:3.0-alpha-10 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.eugene:eugene-maven-plugin:2.7.4:generate (eugene-generation) on project nuiton-security: Execution eugene-generation of goal org.nuiton.eugene:eugene-maven-plugin:2.7.4:generate failed: Plugin org.nuiton.eugene:eugene-maven-plugin:2.7.4 or one of its dependencies could not be resolved: Failure to find org.nuiton.topia:topia-persistence:jar:3.0-alpha-10 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:224) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.PluginExecutionException: Execution eugene-generation of goal org.nuiton.eugene:eugene-maven-plugin:2.7.4:generate failed: Plugin org.nuiton.eugene:eugene-maven-plugin:2.7.4 or one of its dependencies could not be resolved: Failure to find org.nuiton.topia:topia-persistence:jar:3.0-alpha-10 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:87) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more Caused by: org.apache.maven.plugin.PluginResolutionException: Plugin org.nuiton.eugene:eugene-maven-plugin:2.7.4 or one of its dependencies could not be resolved: Failure to find org.nuiton.topia:topia-persistence:jar:3.0-alpha-10 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced at org.apache.maven.plugin.internal.DefaultPluginDependenciesResolver.resolve(DefaultPluginDependenciesResolver.java:208) at org.apache.maven.plugin.internal.DefaultMavenPluginManager.createPluginRealm(DefaultMavenPluginManager.java:357) at org.apache.maven.plugin.internal.DefaultMavenPluginManager.setupPluginRealm(DefaultMavenPluginManager.java:325) at org.apache.maven.plugin.DefaultBuildPluginManager.getPluginRealm(DefaultBuildPluginManager.java:180) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:83) ... 31 more Caused by: org.eclipse.aether.resolution.ArtifactResolutionException: Failure to find org.nuiton.topia:topia-persistence:jar:3.0-alpha-10 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:459) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifacts(DefaultArtifactResolver.java:262) at org.eclipse.aether.internal.impl.DefaultRepositorySystem.resolveDependencies(DefaultRepositorySystem.java:367) at org.apache.maven.plugin.internal.DefaultPluginDependenciesResolver.resolve(DefaultPluginDependenciesResolver.java:200) ... 35 more Caused by: org.eclipse.aether.transfer.ArtifactNotFoundException: Failure to find org.nuiton.topia:topia-persistence:jar:3.0-alpha-10 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced at org.eclipse.aether.internal.impl.DefaultUpdateCheckManager.newException(DefaultUpdateCheckManager.java:232) at org.eclipse.aether.internal.impl.DefaultUpdateCheckManager.checkArtifact(DefaultUpdateCheckManager.java:177) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.gatherDownloads(DefaultArtifactResolver.java:599) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.performDownloads(DefaultArtifactResolver.java:518) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:436) ... 38 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/PluginResolutionException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :nuiton-security Failed to send e-mail to athimel because no e-mail address is known, and no default e-mail domain is configured Sending e-mails to: nuiton-web-commits(a)list.nuiton.org channel stopped Failed to send e-mail to athimel because no e-mail address is known, and no default e-mail domain is configured

1 3

Build failed in Jenkins: nuiton-web » Nuiton Web :: Nuiton Struts 2 #4
by admin+ci-nuiton.org＠codelutin.com 05 Feb '14

05 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> Changes: [maven-release] [maven-release-plugin] prepare for next development iteration [maven-release] [maven-release-plugin] prepare release nuiton-web-1.15-alpha-3 [athimel] SVN properties and file headers ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Struts 2 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-struts2 --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-struts2 --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-struts2 --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 7 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-struts2 --- [INFO] Compiling 11 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…>:[3,1] class, interface, or enum expected [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…>:[3,1] class, interface, or enum expected [INFO] 2 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 2

Jenkins build is back to normal : nuiton-web » Nuiton Web :: Nuiton Security #6
by admin+ci-nuiton.org＠codelutin.com 05 Feb '14

05 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-securi…>

1 0

[ANN] - Nuiton Web 1.15-alpha-3 released
by nuiton.org Release Notification 04 Feb '14

04 Feb '14

The Nuiton Web team is pleased to announce the nuiton-web-parent-1.15-alpha-3 release! Common ressources for web applications Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-web/ Changes ------- Changes in this version include: Changes: o Updates mavenpom to 4.7 Issue: 3067. Thanks to Arnaud Thimel. Resolved by athimel. o Updates topia to 3.0-alpha-10 Issue: 3066. Thanks to Arnaud Thimel. Resolved by athimel. o Updates nuiton-config to 3.0-alpha-2 Issue: 3065. Thanks to Arnaud Thimel. Resolved by athimel. o Updates nuiton-i18n to 3.0 Issue: 3064. Thanks to Arnaud Thimel. Resolved by athimel. o Updates Eugene to 2.7.4 Issue: 3063. Thanks to Arnaud Thimel. Resolved by athimel. o Updates nuiton-utils to 3.0-rc-2 Issue: 3062. Thanks to Arnaud Thimel. Resolved by athimel. Downloads --------- For a manual installation, you can download files here: https://nuiton.org/projects/nuiton-web/files * nuiton-rss-1.15-alpha-3-deps.zip - https://nuiton.org/attachments/download/1002 * nuiton-rss-1.15-alpha-3-full.zip - https://nuiton.org/attachments/download/1003 * nuiton-web-1.15-alpha-3-deps.zip - https://nuiton.org/attachments/download/1004 * nuiton-web-1.15-alpha-3-full.zip - https://nuiton.org/attachments/download/1005 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.web|nuiton-web-parent|1… Have fun! -Nuiton Web team

1 0

r309 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 19:11:04 +0100 (Tue, 04 Feb 2014) New Revision: 309 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/309 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-gwt/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-rss/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-security/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-struts2/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-tapestry/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-web/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-3</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-3 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1.15-…</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r308 - in tags: . nuiton-web-1.15-alpha-3
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 19:10:59 +0100 (Tue, 04 Feb 2014) New Revision: 308 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/308 Log: [maven-release-plugin] copy for tag nuiton-web-1.15-alpha-3 Added: tags/nuiton-web-1.15-alpha-3/ Property changes on: tags/nuiton-web-1.15-alpha-3 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r307 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 19:10:55 +0100 (Tue, 04 Feb 2014) New Revision: 307 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/307 Log: [maven-release-plugin] prepare release nuiton-web-1.15-alpha-3 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-gwt/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-rss/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-security/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-struts2/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-tapestry/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-web/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-3</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-3 </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1.15-…</url> </scm> <distributionManagement> <site>

1 0

r306 - in trunk/nuiton-struts2/src: main/java/org/nuiton/web/struts2/converters test/java/org/nuiton/web/struts2/converters
by athimel＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: athimel Date: 2014-02-04 19:09:20 +0100 (Tue, 04 Feb 2014) New Revision: 306 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/306 Log: SVN properties and file headers Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + /** * Same as of {@link LocalNumberConverter} but always use 2 decimals: it's * a suitable default for money, etc. Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.opensymphony.xwork2.conversion.TypeConversionException; import com.opensymphony.xwork2.conversion.impl.NumberConverter; import org.apache.commons.lang3.StringUtils; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.junit.Assert; import org.junit.Test; Property changes on: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

Build failed in Jenkins: nuiton-web » Nuiton Web :: Nuiton Security #3
by admin+ci-nuiton.org＠codelutin.com 04 Feb '14

04 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-securi…> Changes: [athimel] fixes #3062 Updates nuiton-utils to 3.0-rc-2 fixes #3063 Updates Eugene to 2.7.4 fixes #3064 Updates nuiton-i18n to 3.0 fixes #3065 Updates nuiton-config to 3.0-alpha-2 fixes #3066 Updates topia to 3.0-alpha-10 fixes #3067 Updates mavenpom to 4.7 ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Security 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-security --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-securi…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.4:generate (eugene-generation) @ nuiton-security --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (5 KB at 109.3 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (98 KB at 1170.4 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [WARNING] Failed to getClass for org.nuiton.eugene.plugin.GenerateMojo [JENKINS] Archiving disabled

1 0

r305 - in trunk: . nuiton-security/src/main/java/org/nuiton/web/security/actions nuiton-struts2/src/main/java/org/nuiton/web/struts2
by athimel＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: athimel Date: 2014-02-04 19:06:52 +0100 (Tue, 04 Feb 2014) New Revision: 305 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/305 Log: fixes #3062 Updates nuiton-utils to 3.0-rc-2 fixes #3063 Updates Eugene to 2.7.4 fixes #3064 Updates nuiton-i18n to 3.0 fixes #3065 Updates nuiton-config to 3.0-alpha-2 fixes #3066 Updates topia to 3.0-alpha-10 fixes #3067 Updates mavenpom to 4.7 Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java trunk/pom.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2014-02-04 18:06:52 UTC (rev 305) @@ -24,8 +24,6 @@ package org.nuiton.web.security.actions; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.SecurityUtils; @@ -37,6 +35,7 @@ import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; +import org.nuiton.i18n.I18n; import org.nuiton.web.security.SecurityShiroFilter; public class LoginAction extends AbstractAction { @@ -86,19 +85,19 @@ result = SUCCESS; } } catch (UnknownAccountException ex) { - addActionError(_("Identifiant ou mot de passe invalide !")); + addActionError(I18n.t("Identifiant ou mot de passe invalide !")); log.warn("Unknow user account", ex); result = input(); } catch (IncorrectCredentialsException ex) { - addActionError(_("Identifiant ou mot de passe invalide !")); + addActionError(I18n.t("Identifiant ou mot de passe invalide !")); log.warn("Invalid password", ex); result = input(); } catch (LockedAccountException ex) { - addActionError(_("Compte bloqué. Contacter un administrateur")); + addActionError(I18n.t("Compte bloqué. Contacter un administrateur")); log.error("Account locked error", ex); result = input(); } catch (ExcessiveAttemptsException ex) { - addActionError(_("Nombre de tentatives dépassé")); + addActionError(I18n.t("Nombre de tentatives dépassé")); log.error("Excessive attemps error", ex); result = input(); } catch (AuthenticationException ex) { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-02-04 18:06:52 UTC (rev 305) @@ -27,14 +27,13 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityTopiaPersistenceContext; import org.nuiton.web.security.SecurityUser; import org.nuiton.web.security.SecurityUserImpl; import org.nuiton.web.security.SecurityUserTopiaDao; -import static org.nuiton.i18n.I18n._; - public class UserAction extends AbstractAction { /** serialVersionUID. */ @@ -97,7 +96,7 @@ public void validate() { if (StringUtils.isNotBlank(password)) { if (!password.equals(confirm)) { - addActionError(_("Les mots de passes ne sont pas identiques !")); + addActionError(I18n.t("Les mots de passes ne sont pas identiques !")); } } } Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2014-02-04 18:06:52 UTC (rev 305) @@ -90,7 +90,7 @@ protected String getTextFromLocale(String key, String defaultValue) { Locale locale = localeProvider.getLocale(); - String result = I18n.l_(locale, key); + String result = I18n.l(locale, key); if (result == null) { result = defaultValue; } @@ -100,7 +100,7 @@ protected String getTextFromLocale(String key, String defaultValue, Object ... args) { Locale locale = localeProvider.getLocale(); - String result = I18n.l_(locale, key, args); + String result = I18n.l(locale, key, args); if (result == null) { result = defaultValue; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/pom.xml 2014-02-04 18:06:52 UTC (rev 305) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.5</version> + <version>4.7</version> </parent> <groupId>org.nuiton.web</groupId> @@ -89,14 +89,14 @@  <projectId>nuiton-web</projectId> - <eugeneVersion>2.7.3</eugeneVersion> + <eugeneVersion>2.7.4</eugeneVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> + <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-alpha-8</topiaVersion> + <topiaVersion>3.0-alpha-10</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r304 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by bleny＠users.nuiton.org 27 Jan '14

27 Jan '14

Author: bleny Date: 2014-01-27 11:44:45 +0100 (Mon, 27 Jan 2014) New Revision: 304 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/304 Log: refs #3010 add a FIXME Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-24 17:14:05 UTC (rev 303) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-27 10:44:45 UTC (rev 304) @@ -84,6 +84,8 @@ if (value == null) { + // FIXME brendan 27/01/14 this is dead code, already lost 1 hour with it + string = formatNullValue(); } else if (value instanceof Integer) {

1 0

r303 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by bleny＠users.nuiton.org 24 Jan '14

24 Jan '14

Author: bleny Date: 2014-01-24 18:14:05 +0100 (Fri, 24 Jan 2014) New Revision: 303 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/303 Log: refs #3010 add some variation points in LocalNumberConverter and some javadocs Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-24 13:53:42 UTC (rev 302) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-24 17:14:05 UTC (rev 303) @@ -25,29 +25,38 @@ * <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" class="org.nuiton.web.struts2.converters.LocalNumberConverter" scope="singleton"/> * </pre> * + * You may tune this converter to your needs by overriding some methods like {@link #formatNullValue()}, + * {@link #getMinDecimals()} or {@link #getMaxDecimals} + * * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> * @since 1.15 */ public class LocalNumberConverter extends NumberConverter { - protected int getMinDecimals() { - return 0; - } - - protected int getMaxDecimals() { - return 3; - } - + /** {@link java.text.DecimalFormat} to use for parsing/formatting {@link int}s and {@link java.lang.Integer} instances */ protected DecimalFormat integerFormat; - protected DecimalFormat decimalFormat; + /** {@link java.text.DecimalFormat} to use for parsing/formatting {@link double}s and {@link java.lang.Double} instances */ + protected DecimalFormat doubleFormat; - public LocalNumberConverter() { - integerFormat = new DecimalFormat("###,##0"); - decimalFormat = new DecimalFormat("###,##0." + StringUtils.repeat("0", getMinDecimals()) + StringUtils.repeat("#", getMaxDecimals() - getMinDecimals())); + protected DecimalFormat getIntegerFormat() { + if (integerFormat == null) { + integerFormat = new DecimalFormat("###,##0"); + } + return integerFormat; } + protected DecimalFormat getDoubleFormat() { + if (doubleFormat == null) { + String pattern = "###,##0." + StringUtils.repeat("0", getMinDecimals()) + StringUtils.repeat("#", getMaxDecimals() - getMinDecimals()); + doubleFormat = new DecimalFormat(pattern); + } + return doubleFormat; + } + + @Override public Object convertValue(Map<String, Object> context, Object target, Member member, String propertyName, Object value, Class toType) { + Object result; if (toType == String.class && (value instanceof Double || value instanceof Integer)) { @@ -75,79 +84,94 @@ if (value == null) { - string = StringUtils.EMPTY; + string = formatNullValue(); } else if (value instanceof Integer) { - string = integerFormat.format(value); + string = getIntegerFormat().format(value); } else { - string = decimalFormat.format(value); + string = getDoubleFormat().format(value); } return string; + } protected Number convertToNumber(String string, Class toType) { Number parsedValue; - if (string == null || string.isEmpty()) { + if (isNullValue(string)) { if (toType.isPrimitive()) { - - if (toType == Double.class || toType == double.class) { - - parsedValue = new Double(0); - + if (toType == double.class) { + parsedValue = 0.; } else { - - parsedValue = new Integer(0); - + parsedValue = 0; } } else { - parsedValue = null; - } } else { - char groupingSeparator = integerFormat.getDecimalFormatSymbols().getGroupingSeparator(); + char groupingSeparator = getIntegerFormat().getDecimalFormatSymbols().getGroupingSeparator(); if (Character.isSpaceChar(groupingSeparator)) { - string = string.replaceAll(" ", groupingSeparator + ""); - } try { if (toType == Double.class || toType == double.class) { - string = string.replace('.', decimalFormat.getDecimalFormatSymbols().getDecimalSeparator()); + string = string.replace('.', getDoubleFormat().getDecimalFormatSymbols().getDecimalSeparator()); - parsedValue = decimalFormat.parse(string).doubleValue(); + parsedValue = getDoubleFormat().parse(string).doubleValue(); } else { - parsedValue = integerFormat.parse(string).intValue(); + parsedValue = getIntegerFormat().parse(string).intValue(); } - } catch (ParseException e ){ + } catch (ParseException e) { + throw new TypeConversionException("unable to parse " + string, e); + } catch (NumberFormatException e) { + throw new TypeConversionException("unable to parse " + string, e); + } - throw new TypeConversionException("strings=" + string, e); + } - } catch (NumberFormatException e ){ + return parsedValue; + } - throw new TypeConversionException("strings=" + string, e); + /** + * Result if formatted object is null. + * + * If you override this method, you probably must override + * {@link #isNullValue(String)} too + */ + protected String formatNullValue() { + return StringUtils.EMPTY; + } - } + /** + * Method to know if a given string should be interpreted as "no value". + */ + protected boolean isNullValue(String string) { + boolean isNullValue = StringUtils.isEmpty(string); + return isNullValue; + } - } + protected int getMinDecimals() { + return 0; + } - return parsedValue; + protected int getMaxDecimals() { + return 3; } + }

1 0

r302 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by bleny＠users.nuiton.org 24 Jan '14

24 Jan '14

Author: bleny Date: 2014-01-24 14:53:42 +0100 (Fri, 24 Jan 2014) New Revision: 302 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/302 Log: refs #3010 add a HundredthLocalNumberConverter Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-01-24 13:53:42 UTC (rev 302) @@ -0,0 +1,21 @@ +package org.nuiton.web.struts2.converters; + +/** + * Same as of {@link LocalNumberConverter} but always use 2 decimals: it's + * a suitable default for money, etc. + * + * @since 1.15 + */ +public class HundredthLocalNumberConverter extends LocalNumberConverter { + + @Override + protected int getMinDecimals () { + return 2; + } + + @Override + protected int getMaxDecimals () { + return 2; + } + +}

1 0

r301 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by sbavencoff＠users.nuiton.org 22 Jan '14

22 Jan '14

Author: sbavencoff Date: 2014-01-22 16:28:43 +0100 (Wed, 22 Jan 2014) New Revision: 301 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/301 Log: refs #3010 : add since Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-22 15:21:44 UTC (rev 300) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-22 15:28:43 UTC (rev 301) @@ -26,6 +26,7 @@ * </pre> * * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + * @since 1.15 */ public class LocalNumberConverter extends NumberConverter {

1 0

r300 - in trunk/nuiton-struts2/src: main/java/org/nuiton/web/struts2/converters test/java/org/nuiton/web/struts2 test/java/org/nuiton/web/struts2/converters
by sbavencoff＠users.nuiton.org 22 Jan '14

22 Jan '14

Author: sbavencoff Date: 2014-01-22 16:21:44 +0100 (Wed, 22 Jan 2014) New Revision: 300 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/300 Log: refs #3010 : create a number converter with local parameters Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2014-01-06 18:07:49 UTC (rev 299) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2014-01-22 15:21:44 UTC (rev 300) @@ -24,13 +24,12 @@ * #L% */ -import java.util.Arrays; -import java.util.Map; - +import com.opensymphony.xwork2.conversion.TypeConversionException; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.util.StrutsTypeConverter; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import java.util.Arrays; +import java.util.Map; /** * Let user input either "0.1" or "0,1" as a double value. To use this converter, add the following lines in your @@ -42,7 +41,10 @@ * </pre> * * @author Arnaud Thimel <thimel(a)codelutin.com> + * @Deprecated since 1.15 prefer use LocalNumberConverter */ + +@Deprecated public class DoubleConverter extends StrutsTypeConverter { @Override Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-22 15:21:44 UTC (rev 300) @@ -0,0 +1,152 @@ +package org.nuiton.web.struts2.converters; + +import com.opensymphony.xwork2.conversion.TypeConversionException; +import com.opensymphony.xwork2.conversion.impl.NumberConverter; +import org.apache.commons.lang3.StringUtils; + +import java.lang.reflect.Member; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.util.Map; + +/** + * this class convert a double and integer with local format or standard format + * To use this converter, add the following lines in your + * <code>classpath:xwork-conversion.properties</code> file : + * + * <pre> + * java.lang.Double=org.nuiton.web.struts2.converters.LocalNumberConverter + * java.lang.Integer=org.nuiton.web.struts2.converters.LocalNumberConverter + * </pre> + * + * <code>classpath:struts.xml</code> file : + * + * <pre> + * <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" class="org.nuiton.web.struts2.converters.LocalNumberConverter" scope="singleton"/> + * </pre> + * + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class LocalNumberConverter extends NumberConverter { + + protected int getMinDecimals() { + return 0; + } + + protected int getMaxDecimals() { + return 3; + } + + protected DecimalFormat integerFormat; + + protected DecimalFormat decimalFormat; + + public LocalNumberConverter() { + integerFormat = new DecimalFormat("###,##0"); + decimalFormat = new DecimalFormat("###,##0." + StringUtils.repeat("0", getMinDecimals()) + StringUtils.repeat("#", getMaxDecimals() - getMinDecimals())); + } + + public Object convertValue(Map<String, Object> context, Object target, Member member, String propertyName, Object value, Class toType) { + Object result; + + if (toType == String.class && (value instanceof Double || value instanceof Integer)) { + + result = convertToString(value); + + } else if (value instanceof String + && (toType == Double.class || toType == double.class || toType == Integer.class || toType == int.class)) { + + result = convertToNumber((String) value, toType); + + } else { + + result = super.convertValue(context, target, member, propertyName, value, toType); + + } + + return result; + + } + + protected String convertToString(Object value) { + + String string; + + if (value == null) { + + string = StringUtils.EMPTY; + + } else if (value instanceof Integer) { + + string = integerFormat.format(value); + + } else { + + string = decimalFormat.format(value); + + } + + return string; + } + + protected Number convertToNumber(String string, Class toType) { + Number parsedValue; + + if (string == null || string.isEmpty()) { + + if (toType.isPrimitive()) { + + if (toType == Double.class || toType == double.class) { + + parsedValue = new Double(0); + + } else { + + parsedValue = new Integer(0); + + } + } else { + + parsedValue = null; + + } + + } else { + + char groupingSeparator = integerFormat.getDecimalFormatSymbols().getGroupingSeparator(); + + if (Character.isSpaceChar(groupingSeparator)) { + + string = string.replaceAll(" ", groupingSeparator + ""); + + } + + try { + + if (toType == Double.class || toType == double.class) { + + string = string.replace('.', decimalFormat.getDecimalFormatSymbols().getDecimalSeparator()); + + parsedValue = decimalFormat.parse(string).doubleValue(); + + } else { + + parsedValue = integerFormat.parse(string).intValue(); + + } + + } catch (ParseException e ){ + + throw new TypeConversionException("strings=" + string, e); + + } catch (NumberFormatException e ){ + + throw new TypeConversionException("strings=" + string, e); + + } + + } + + return parsedValue; + } +} Added: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java (rev 0) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-01-22 15:21:44 UTC (rev 300) @@ -0,0 +1,327 @@ +package org.nuiton.web.struts2.converters; + +import org.junit.Assert; +import org.junit.Test; + +import java.text.DecimalFormatSymbols; +import java.util.Locale; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class LocalNumberConverterTest { + + protected LocalNumberConverter converter; + + protected Object convert(Object value, Class toType) { + return converter.convertValue(null, null, null, "", value, toType); + } + + @Test + public void testConvertValue() { + converter = new LocalNumberConverter(); + + DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.getDefault(Locale.Category.FORMAT)); + + symbols.getCurrency(); + char minusSign = symbols.getMinusSign(); + char groupingSeparator = symbols.getGroupingSeparator(); + char decimalSeparator = symbols.getDecimalSeparator(); + + + // Integer to String + Assert.assertEquals("0", + convert(0, String.class)); + + Assert.assertEquals("0", + convert(new Integer(0), String.class)); + + Assert.assertEquals("18", + convert(18, String.class)); + + Assert.assertEquals("18", + convert(new Integer(18), String.class), "18"); + + Assert.assertEquals(minusSign + "18", + convert(-18, String.class)); + + Assert.assertEquals(minusSign + "18", + convert(new Integer(-18), String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(1000008, String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Integer(1000008), String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(-1000008, String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Integer(-1000008), String.class)); + + // Double to String + Assert.assertEquals("0", + convert(0, String.class)); + + Assert.assertEquals("0", + convert(new Double(0), String.class)); + + Assert.assertEquals("18", + convert(18, String.class)); + + Assert.assertEquals("18", convert(new Double(18), String.class)); + + Assert.assertEquals(minusSign + "18", + convert(-18, String.class)); + + Assert.assertEquals(minusSign + "18", + convert(new Double(-18), String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(1000008, String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Double(1000008), String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(-1000008, String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Double(-1000008), String.class)); + + Assert.assertEquals("0" + decimalSeparator + "58", + convert(0.58, String.class)); + + Assert.assertEquals("0" + decimalSeparator + "58", + convert(new Double(0.58), String.class)); + + Assert.assertEquals("18" + decimalSeparator + "58", + convert(18.58, String.class)); + + Assert.assertEquals("18" + decimalSeparator + "58", + convert(new Double(18.58), String.class)); + + Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", + convert(-18.58, String.class)); + + Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", + convert(new Double(-18.58), String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(1000008.58, String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(new Double(1000008.58), String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(-1000008.58, String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(new Double(-1000008.58), String.class)); + + Assert.assertEquals("0" + decimalSeparator + "586", + convert(0.5864, String.class)); + + Assert.assertEquals("0" + decimalSeparator + "586", + convert(new Double(0.5864), String.class)); + + Assert.assertEquals("0" + decimalSeparator + "587", + convert(0.5867, String.class)); + + Assert.assertEquals("0" + decimalSeparator + "587", + convert(new Double(0.5867), String.class)); + + // String to Integer + Assert.assertEquals(0, + convert(null, int.class)); + + Assert.assertEquals(null, + convert(null, Integer.class)); + + Assert.assertEquals(0, + convert("", int.class)); + + Assert.assertEquals(null, + convert("", Integer.class)); + + Assert.assertEquals(0, + convert("0", int.class)); + + Assert.assertEquals(new Integer(0), + convert("0", Integer.class)); + + Assert.assertEquals(12, + convert("12", int.class)); + + Assert.assertEquals(new Integer(12), + convert("12", Integer.class)); + + Assert.assertEquals(-12, + convert(minusSign + "12", int.class)); + + Assert.assertEquals(new Integer(-12), + convert(minusSign + "12", Integer.class)); + + if (Character.isSpaceChar(groupingSeparator)) { + + Assert.assertEquals(1002, + convert("1 002", int.class)); + + Assert.assertEquals(new Integer(1002), + convert("1 002", Integer.class)); + + Assert.assertEquals(-1002, + convert(minusSign + "1 002", int.class)); + + Assert.assertEquals(new Integer(-1002), + convert(minusSign + "1 002", Integer.class)); + + } + + Assert.assertEquals(1002, + convert("1" + groupingSeparator + "002", int.class)); + Assert.assertEquals(new Integer(1002), + convert("1" + groupingSeparator + "002", Integer.class)); + + Assert.assertEquals(-1002, + convert(minusSign + "1" + groupingSeparator + "002", int.class)); + + Assert.assertEquals(new Integer(-1002), + convert(minusSign + "1" + groupingSeparator + "002", Integer.class)); + + // String to Double + Assert.assertEquals(0d, + convert(null, double.class)); + + Assert.assertEquals(null, + convert(null, Double.class)); + + Assert.assertEquals(0d, + convert("", double.class)); + + Assert.assertEquals(null, + convert("", Double.class)); + + Assert.assertEquals(0d, + convert("0", double.class)); + + Assert.assertEquals(new Double(0), + convert("0", Double.class)); + + Assert.assertEquals(12d, + convert("12", double.class)); + + Assert.assertEquals(new Double(12), + convert("12", Double.class)); + + Assert.assertEquals(-12d, + convert(minusSign + "12", double.class)); + + Assert.assertEquals(new Double(-12), + convert(minusSign + "12", Double.class)); + + + if (Character.isSpaceChar(groupingSeparator)) { + + Assert.assertEquals(1002d, + convert("1 002", double.class)); + + Assert.assertEquals(new Double(1002), + convert("1 002", Double.class)); + + Assert.assertEquals(-1002d, + convert(minusSign + "1 002", double.class)); + + Assert.assertEquals(new Double(-1002), + convert(minusSign + "1 002", Double.class)); + + } + + Assert.assertEquals(1002d, + convert("1" + groupingSeparator + "002", double.class)); + + Assert.assertEquals(new Double(1002), + convert("1" + groupingSeparator + "002", Double.class)); + + Assert.assertEquals(-1002d, + convert(minusSign + "1" + groupingSeparator + "002", double.class)); + + Assert.assertEquals(new Double(-1002), + convert(minusSign + "1" + groupingSeparator + "002", Double.class)); + + Assert.assertEquals(0.36, + convert("0" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(0.36), + convert("0" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(12.36, + convert("12" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(12.36), + convert("12" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(-12.36, + convert(minusSign + "12" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(-12.36), + convert(minusSign + "12" + decimalSeparator + "36", Double.class)); + + + if (Character.isSpaceChar(groupingSeparator)) { + + Assert.assertEquals(1002.36, + convert("1 002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1 002" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(-1002.36, + convert(minusSign + "1 002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(-1002.36), + convert(minusSign + "1 002" + decimalSeparator + "36", Double.class)); + + } + + Assert.assertEquals(1002.36, + convert("1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(-1002.36, + convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(-1002.36), + convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(12.3669, + convert("12" + decimalSeparator + "3669", double.class)); + + Assert.assertEquals(new Double(12.3669), + convert("12" + decimalSeparator + "3669", Double.class)); + + Assert.assertEquals(12.36, + convert("12.36", double.class)); + + Assert.assertEquals(new Double(12.36), + convert("12.36", Double.class)); + + Assert.assertEquals(1002.36, + convert("1 002.36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1 002.36", Double.class)); + + Assert.assertEquals(1002.36, + convert("1002.36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1002.36", Double.class)); + + } + + +}

1 0

[ANN] - Nuiton Web 1.15-alpha-2 released
by nuiton.org Release Notification 06 Jan '14

06 Jan '14

The Nuiton Web team is pleased to announce the nuiton-web-parent-1.15-alpha-2 release! Common ressources for web applications Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-web/ Changes ------- Changes in this version include: New features: o Use topia 3.0-alpha-8 Issue: 2979. Thanks to Tony Chemit. Resolved by tchemit. o Add a new filter to deal with typed persistence context Issue: 2975. Thanks to Tony Chemit. Resolved by tchemit. Changes: o updates mavenpom to 4.5 + tidy poms and site.xml Issue: 2987. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://nuiton.org/projects/nuiton-web/files * nuiton-rss-1.15-alpha-2-deps.zip - http://nuiton.org/attachments/download/986 * nuiton-rss-1.15-alpha-2-full.zip - http://nuiton.org/attachments/download/987 * nuiton-web-1.15-alpha-2-deps.zip - http://nuiton.org/attachments/download/988 * nuiton-web-1.15-alpha-2-full.zip - http://nuiton.org/attachments/download/989 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.web|nuiton-web-parent|1… Have fun! -Nuiton Web team

1 0

r299 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 06 Jan '14

06 Jan '14

Author: maven-release Date: 2014-01-06 19:07:49 +0100 (Mon, 06 Jan 2014) New Revision: 299 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/299 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-gwt/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-rss/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-security/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-struts2/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-tapestry/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-web/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-2 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1.15-…</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r298 - in tags: . nuiton-web-1.15-alpha-2
by maven-release＠users.nuiton.org 06 Jan '14

06 Jan '14

Author: maven-release Date: 2014-01-06 19:07:47 +0100 (Mon, 06 Jan 2014) New Revision: 298 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/298 Log: [maven-release-plugin] copy for tag nuiton-web-1.15-alpha-2 Added: tags/nuiton-web-1.15-alpha-2/ Property changes on: tags/nuiton-web-1.15-alpha-2 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r297 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 06 Jan '14

06 Jan '14

Author: maven-release Date: 2014-01-06 19:07:44 +0100 (Mon, 06 Jan 2014) New Revision: 297 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/297 Log: [maven-release-plugin] prepare release nuiton-web-1.15-alpha-2 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2014-01-06 18:06:07 UTC (rev 296) +++ trunk/nuiton-gwt/pom.xml 2014-01-06 18:07:44 UTC (rev 297) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-2</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-01-06 18:06:07 UTC (rev 296) +++ trunk/nuiton-rss/pom.xml 2014-01-06 18:07:44 UTC (rev 297) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-2</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-01-06 18:06:07 UTC (rev 296) +++ trunk/nuiton-security/pom.xml 2014-01-06 18:07:44 UTC (rev 297) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-2</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-01-06 18:06:07 UTC (rev 296) +++ trunk/nuiton-struts2/pom.xml 2014-01-06 18:07:44 UTC (rev 297) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-2</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-01-06 18:06:07 UTC (rev 296) +++ trunk/nuiton-tapestry/pom.xml 2014-01-06 18:07:44 UTC (rev 297) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-2</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-01-06 18:06:07 UTC (rev 296) +++ trunk/nuiton-web/pom.xml 2014-01-06 18:07:44 UTC (rev 297) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-2</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-06 18:06:07 UTC (rev 296) +++ trunk/pom.xml 2014-01-06 18:07:44 UTC (rev 297) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-2</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-2 </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1.15-…</url> </scm> <distributionManagement> <site>

1 0

r296 - trunk
by echatellier＠users.nuiton.org 06 Jan '14

06 Jan '14

Author: echatellier Date: 2014-01-06 19:06:07 +0100 (Mon, 06 Jan 2014) New Revision: 296 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/296 Log: Use topia alpha 8 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-06 18:03:31 UTC (rev 295) +++ trunk/pom.xml 2014-01-06 18:06:07 UTC (rev 296) @@ -96,7 +96,7 @@ <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-alpha-8</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r295 - trunk
by echatellier＠users.nuiton.org 06 Jan '14

06 Jan '14

Author: echatellier Date: 2014-01-06 19:03:31 +0100 (Mon, 06 Jan 2014) New Revision: 295 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/295 Log: Usemavenpom 4.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-25 16:58:50 UTC (rev 294) +++ trunk/pom.xml 2014-01-06 18:03:31 UTC (rev 295) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.5-SNAPSHOT</version> + <version>4.5</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r294 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by tchemit＠users.nuiton.org 25 Dec '13

25 Dec '13

Author: tchemit Date: 2013-12-25 17:58:50 +0100 (Wed, 25 Dec 2013) New Revision: 294 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/294 Log: refs #2987: updates mavenpom to 4.5 + tidy poms and site.xml Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-gwt/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -11,6 +10,9 @@ <artifactId>nuiton-gwt</artifactId> + <name>Nuiton Web :: Nuiton GWT</name> + <description>Extra classes for GWT based applications</description> + <dependencies>  @@ -21,9 +23,6 @@ </dependencies> - <name>Nuiton Web :: Nuiton GWT</name> - <description>Extra classes for GWT based applications</description> - <build> <plugins> <plugin> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-rss/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -23,7 +23,6 @@ #L% --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -33,7 +32,21 @@ </parent> <artifactId>nuiton-rss</artifactId> + <packaging>war</packaging> + <name>Nuiton Web :: Nuiton RSS</name> + <description>Servlet pouvant etre appeler depuis du JS pour recuperer un + flux RSS + </description> + <inceptionYear>2008</inceptionYear> + + <properties> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <dependencies> <dependency> @@ -84,34 +97,7 @@ </dependencies> - <name>Nuiton Web :: Nuiton RSS</name> - <description>Servlet pouvant etre appeler depuis du JS pour recuperer un - flux RSS - </description> - <inceptionYear>2008</inceptionYear> - - <packaging>war</packaging> - - <properties> - -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - <build> - - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </plugin> - - </plugins> - <pluginManagement> <plugins> @@ -137,6 +123,16 @@ </plugins> </pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </plugin> + + </plugins> </build> <profiles> @@ -205,5 +201,4 @@ </profile> </profiles> - </project> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-security/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -10,7 +9,11 @@ </parent> <artifactId>nuiton-security</artifactId> + <packaging>jar</packaging> + <name>Nuiton Web :: Nuiton Security</name> + <description>Security module based on ToPIA</description> + <properties>  @@ -72,11 +75,6 @@ </dependency> </dependencies> - <name>Nuiton Web :: Nuiton Security</name> - <description>Security module based on ToPIA</description> - - <packaging>jar</packaging> - <build> <plugins> <plugin> @@ -121,4 +119,5 @@ </plugin> </plugins> </build> + </project> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-struts2/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-tapestry/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -11,6 +10,9 @@ <artifactId>nuiton-tapestry</artifactId> + <name>Nuiton Web :: Nuiton Tapestry</name> + <description>Extra classes for Tapestry based applications</description> + <dependencies> <dependency> @@ -55,9 +57,6 @@ </dependencies> - <name>Nuiton Web :: Nuiton Tapestry</name> - <description>Extra classes for Tapestry based applications</description> - <build> <plugins> <plugin> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-web/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,6 +11,17 @@ <artifactId>nuiton-web</artifactId> + <name>Nuiton Web :: Nuiton Web</name> + <description>Usefull classes for web developpement.</description> + <inceptionYear>2011</inceptionYear> + + <properties> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <dependencies>  @@ -57,17 +67,6 @@ </dependencies> - <name>Nuiton Web :: Nuiton Web</name> - <description>Usefull classes for web developpement.</description> - <inceptionYear>2011</inceptionYear> - - <properties> - -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - <build> </build> @@ -114,5 +113,4 @@ </profile> </profiles> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,7 +11,56 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> <version>1.15-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Nuiton Web</name> + <description>Common ressources for web applications</description> + <url>http://maven-site.nuiton.org/nuiton-web/</url> + <inceptionYear>2010</inceptionYear> + + <developers> + <developer> + <id>fdesbois</id> + <name>Florian DESBOIS</name> + <email>fdesbois(a)codelutin.com</email> + <organization>Code Lutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>bleny</id> + <name>Brendan Le Ny</name> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + <modules> <module>nuiton-web</module> <module>nuiton-struts2</module> @@ -22,6 +70,58 @@ <module>nuiton-security</module> </modules> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + </developerConnection> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> + </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + + <properties> + +  + <projectId>nuiton-web</projectId> + + <eugeneVersion>2.7.3</eugeneVersion> + + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + + <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + +  + <tapestryVersion>5.2.4</tapestryVersion>  + <slf4jVersion>1.7.5</slf4jVersion> + +  + <gwtVersion>2.2.0</gwtVersion> + <gwtPluginVersion>2.2.0</gwtPluginVersion> + +  + <struts2Version>2.3.16</struts2Version> + + <shiroVersion>1.2.2</shiroVersion> + <servletApiVersion>2.5</servletApiVersion> + <jettyVersion>${jettyPluginVersion}</jettyVersion> + <windstoneVersion>0.9.10-hudson-24</windstoneVersion> + +  + <siteLocales>en,fr</siteLocales> + +  + <license.licenseName>lgpl_v3</license.licenseName> + + </properties> + <dependencyManagement> <dependencies> @@ -197,96 +297,13 @@ </dependencyManagement> - <name>Nuiton Web</name> - <description>Common ressources for web applications</description> - <inceptionYear>2010</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-web/</url> - - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>fdesbois(a)codelutin.com</email> - <organization>Code Lutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>jcouteau</id> - <name>Jean Couteau</name> - <email>couteau(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>bleny</id> - <name>Brendan Le Ny</name> - <email>bleny(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <packaging>pom</packaging> - - <properties> - -  - <projectId>nuiton-web</projectId> - - <eugeneVersion>2.7.3</eugeneVersion> - - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> - - <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> - -  - <tapestryVersion>5.2.4</tapestryVersion>  - <slf4jVersion>1.7.5</slf4jVersion> - -  - <gwtVersion>2.2.0</gwtVersion> - <gwtPluginVersion>2.2.0</gwtPluginVersion> - -  - <struts2Version>2.3.16</struts2Version> - - <shiroVersion>1.2.2</shiroVersion> - <servletApiVersion>2.5</servletApiVersion> - <jettyVersion>${jettyPluginVersion}</jettyVersion> - <windstoneVersion>0.9.10-hudson-24</windstoneVersion> - -  - <siteLocales>en,fr</siteLocales> - -  - <license.licenseName>lgpl_v3</license.licenseName> - - </properties> - <build> - + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <pluginManagement> <plugins> @@ -320,13 +337,6 @@ </plugin> </plugins> </pluginManagement> - - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> </build> <reporting> @@ -334,21 +344,6 @@ <excludeDefaults>true</excludeDefaults> </reporting> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> - <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk - </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> - </scm> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - <profiles> <profile> <id>reporting</id>

1 0

r293 - in trunk: . nuiton-gwt nuiton-rss nuiton-rss/src/site nuiton-struts2 nuiton-struts2/src/site nuiton-tapestry nuiton-web nuiton-web/src/site src/site
by tchemit＠users.nuiton.org 25 Dec '13

25 Dec '13

Author: tchemit Date: 2013-12-25 17:56:23 +0100 (Wed, 25 Dec 2013) New Revision: 293 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/293 Log: refs #2987: updates mavenpom to 4.5 + tidy poms and site.xml Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-rss/src/site/site_fr.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/site/site_fr.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/nuiton-web/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-gwt/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -25,20 +21,9 @@ </dependencies> -  -  -  - <name>Nuiton Web :: Nuiton GWT</name> <description>Extra classes for GWT based applications</description> -  -  -  - - <packaging>jar</packaging> - - <build> <plugins> <plugin> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-rss/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -26,10 +26,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -88,21 +84,12 @@ </dependencies> - -  -  -  - <name>Nuiton Web :: Nuiton RSS</name> <description>Servlet pouvant etre appeler depuis du JS pour recuperer un flux RSS </description> <inceptionYear>2008</inceptionYear> -  -  -  - <packaging>war</packaging> <properties> @@ -152,10 +139,6 @@ </pluginManagement> </build> -  -  -  - <profiles> <profile> <id>reporting</id> Modified: trunk/nuiton-rss/src/site/site_fr.xml =================================================================== --- trunk/nuiton-rss/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-rss/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -61,7 +61,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -73,7 +73,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-struts2/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> Modified: trunk/nuiton-struts2/src/site/site_fr.xml =================================================================== --- trunk/nuiton-struts2/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-struts2/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -61,7 +61,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -73,7 +73,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-tapestry/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -59,20 +55,9 @@ </dependencies> -  -  -  - <name>Nuiton Web :: Nuiton Tapestry</name> <description>Extra classes for Tapestry based applications</description> -  -  -  - - <packaging>jar</packaging> - - <build> <plugins> <plugin> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-web/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -4,10 +4,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -61,19 +57,10 @@ </dependencies> - -  -  -  - <name>Nuiton Web :: Nuiton Web</name> <description>Usefull classes for web developpement.</description> <inceptionYear>2011</inceptionYear> -  -  -  - <properties>  @@ -85,10 +72,6 @@ </build> -  -  -  - <profiles>  Modified: trunk/nuiton-web/src/site/site_fr.xml =================================================================== --- trunk/nuiton-web/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-web/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -63,7 +63,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -75,7 +75,10 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",MonitoringFilter.html,TopiaFilter.html,WarLauncher.html," + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,14 +3,10 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.4</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.web</groupId> @@ -201,16 +197,11 @@ </dependencyManagement> -  -  -  - <name>Nuiton Web</name> <description>Common ressources for web applications</description> <inceptionYear>2010</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-web/</url> -  <developers> <developer> <id>fdesbois</id> @@ -254,10 +245,6 @@ </developer> </developers> -  -  -  - <packaging>pom</packaging> <properties> @@ -347,16 +334,12 @@ <excludeDefaults>true</excludeDefaults> </reporting> -  -  -  - <scm> <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -30,7 +30,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -84,7 +84,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -96,7 +96,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer>

1 0

r292 - in trunk: . nuiton-security/src/main/java/org/nuiton/web/security nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor nuiton-web/src/main/java/org/nuiton/web/filter nuiton-web/src/site/apt
by tchemit＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: tchemit Date: 2013-12-20 17:56:21 +0100 (Fri, 20 Dec 2013) New Revision: 292 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/292 Log: refs #2979: Use topia 3.0-alpha > 7 Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm trunk/pom.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -46,10 +46,10 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.nuiton.config.ApplicationConfig; -import org.nuiton.topia.TopiaApplicationContextCache; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.persistence.TopiaApplicationContextCache; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.util.TopiaUtil; import org.nuiton.web.SecurityEntityEnum; import org.nuiton.web.SecurityTopiaApplicationContext; import org.nuiton.web.SecurityTopiaPersistenceContext; @@ -93,7 +93,7 @@ } // get topia root context - config.setOption(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); + config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); Properties props = config.getFlatOptions(); rootContext = TopiaApplicationContextCache.getContext(props, CREATE_SECURITY_APPLICATION_CONTEXT); initSchema(rootContext); Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -36,7 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.web.struts2.interceptor.OpenTopiaTransactionInterceptor; /** Close a TopiaTransaction instance stored in the servlet context. Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2013-12-20 16:56:21 UTC (rev 292) @@ -34,10 +34,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; -import org.nuiton.topia.framework.TopiaTransactionAware; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaTransaction; +import org.nuiton.topia.persistence.TopiaTransactionAware; import org.nuiton.web.struts2.filter.CloseTopiaTransactionFilter; import com.opensymphony.xwork2.ActionInvocation; Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -24,7 +24,7 @@ */ package org.nuiton.web.filter; -import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaPersistenceContext; /** * Implementation of the {@link TypedTopiaTransactionFilter} using the Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -28,10 +28,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Transaction; -import org.nuiton.topia.AbstractTopiaPersistenceContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; +import org.nuiton.topia.persistence.TopiaApplicationContext; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaTransaction; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -67,7 +68,7 @@ * </li> * <li>{@code unusedMethods}: This parameters configure a set of method names * which should be by-pass when the proxied transaction was not still open (via a - * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. + * {@link TopiaApplicationContext#newPersistenceContext()}. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onUnusedMethod(Object, Method, Object[])}. * <p/> @@ -159,7 +160,7 @@ protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; protected TypedTopiaTransactionFilter(Class<PersistenceContext> persistenceContextType) { - if (persistenceContextType==null) { + if (persistenceContextType == null) { throw new NullPointerException("persistenceContextType can't be null"); } if (!persistenceContextType.isInterface()) { Modified: trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm 2013-12-20 16:56:21 UTC (rev 292) @@ -14,7 +14,7 @@ package fr.ifremer.echobase.ui; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/pom.xml 2013-12-20 16:56:21 UTC (rev 292) @@ -272,7 +272,7 @@ <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-alpha-7</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r291 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: tchemit Date: 2013-12-20 01:00:38 +0100 (Fri, 20 Dec 2013) New Revision: 291 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/291 Log: fixes #2975: Add a new filter to deal with typed persistence context Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-12 10:41:25 UTC (rev 290) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) @@ -24,381 +24,19 @@ */ package org.nuiton.web.filter; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.Transaction; -import org.nuiton.topia.AbstractTopiaPersistenceContext; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; -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 java.io.IOException; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - /** - * <h2>Purpose of this filter</h2> - * This filter purpose is to inject in the request a transaction from - * {@link org.nuiton.topia.TopiaPersistenceContext} and deal with the complete lifecycle of a topia - * transaction while a request. - * <p/> - * The injected transaction will be closed (if was really opened) at the end of - * the request. - * <h2>Configuration of the filter</h2> - * The filter accepts two configuration parameters: - * <ul> - * <li>{@code excludeMethods}: This parameters configure a set of method names - * which should never be called on the proxied transaction. - * When a such method is called on the transaction then the filter will pass in - * the hook {@link #onExcludeMethod(Object, Method, Object[])}. - * <p/> - * Default implementation of this hook is to throw an exception. - * </li> - * <li>{@code unusedMethods}: This parameters configure a set of method names - * which should be by-pass when the proxied transaction was not still open (via a - * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. - * When a such method is called on the transaction then the filter will pass in - * the hook {@link #onUnusedMethod(Object, Method, Object[])}. - * <p/> - * Default implementation of this hook is to not return null values. - * </li> - * </ul> - * <h2>Obtain the transaction</h2> - * The (proxied) transaction is pushed as an attribute in the servlet request. - * <p/> - * The attribute name is defined by field {@link #requestAttributeName} - * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be - * changed. - * <p/> - * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : - * <pre> - * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); - * </pre> - * <p/> - * If you prefer to not use this nice method, you can also do this: - * <pre> - * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); - * </pre> - * <p/> - * Or - * <pre> - * TopiaContext tx = (TopiaContext) request.getAttribute(modifiedAttributeName); - * </pre> + * Implementation of the {@link TypedTopiaTransactionFilter} using the + * {@link TopiaPersistenceContext} as type. * * @author tchemit <chemit(a)codelutin.com> * @since 1.6 */ -public abstract class TopiaTransactionFilter implements Filter { +public abstract class TopiaTransactionFilter extends TypedTopiaTransactionFilter<TopiaPersistenceContext> { - public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = - "topiaTransaction"; - - public static final String[] DEFAULT_EXCLUDE_METHODS = { - "beginTransaction", - "closeContext", - "clear" - }; - - public static final String[] DEFAULT_UNUSED_METHODS = { - "toString", - "isClosed", - "closeContext", - "clear", - "equals", - "hashCode", - "finalize", - "getClass" - }; - - /** Logger. */ - private static final Log log = - LogFactory.getLog(TopiaTransactionFilter.class); - - /** names of methods to forbid access while using proxy. */ - protected Set<String> excludeMethods; - - /** names of methods to by-pass if no transaction opened on proxy. */ - protected Set<String> unusedMethods; - - /** - * Name of the request attribute where to push the transaction. - * <p/> - * By default will use value of - * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. - * - * @since 1.10 - */ - protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; - - public Set<String> getExcludeMethods() { - return excludeMethods; + public TopiaTransactionFilter() { + super(TopiaPersistenceContext.class); } - public Set<String> getUnusedMethods() { - return unusedMethods; - } - - /** - * to change the {@link #requestAttributeName}. - * - * @param requestAttributeName new name of the request attribute - * where to push the transaction. - * @since 1.10 - */ - public void setRequestAttributeName(String requestAttributeName) { - this.requestAttributeName = requestAttributeName; - } - - public static TopiaPersistenceContext getTransaction(ServletRequest request) { - TopiaPersistenceContext topiaContext = (TopiaPersistenceContext) - request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); - return topiaContext; - } - - /** - * Method to open a new transaction. - * - * @param request incoming request - * @return the new freshly opened transaction - * @throws TopiaException if any problem while opening a new transaction - */ - protected abstract TopiaPersistenceContext beginTransaction(ServletRequest request) throws TopiaException; - - @Override - public void destroy() { - } - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - String methodsFromConfig; - - methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); - String[] methods; - if (StringUtils.isNotEmpty(methodsFromConfig)) { - methods = methodsFromConfig.split(","); - } else { - methods = DEFAULT_EXCLUDE_METHODS; - } - excludeMethods = new HashSet<String>(Arrays.asList(methods)); - - methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); - if (StringUtils.isNotEmpty(methodsFromConfig)) { - methods = methodsFromConfig.split(","); - } else { - methods = DEFAULT_UNUSED_METHODS; - } - unusedMethods = new HashSet<String>(Arrays.asList(methods)); - } - - @Override - public void doFilter(ServletRequest request, - ServletResponse response, - FilterChain chain) throws IOException, ServletException { - - // creates a proxy of a lazy transaction - - TopiaTransactionProxyInvocationHandler proxyInvocationHandler = - new TopiaTransactionProxyInvocationHandler(request); - - TopiaPersistenceContext proxy = (TopiaPersistenceContext) Proxy.newProxyInstance( - getClass().getClassLoader(), - new Class<?>[]{TopiaPersistenceContext.class, - TopiaTransaction.class}, - proxyInvocationHandler - ); - - // push it in request as an attribute - request.setAttribute(requestAttributeName, proxy); - try { - - // chain to next filter - chain.doFilter(request, response); - } finally { - - // close the real transaction - onCloseTransaction(proxyInvocationHandler.transaction); - } - } - - /** - * Hook method called when a method with his name in - * {@link #excludeMethods} was invoked on the proxied transaction. - * - * @param proxy proxied transaction - * @param method method invoked - * @param args arguments of the invoked method - * @return the return code of the method - * @throws Throwable if any error to do. - */ - protected Object onExcludeMethod(Object proxy, - Method method, - Object[] args) throws Throwable { - - // not authorized - throw new IllegalAccessException( - "Not allowed to access method " + method.getName() + " on " + - proxy); - } - - /** - * Hook method to close the topia transaction of the request at the end of - * the request when all filter has been consumed. - * - * @param transaction the transaction to close (can be null if transaction - * was not required while the current request) - * @since 1.9.1 - */ - protected void onCloseTransaction(TopiaPersistenceContext transaction) { - if (transaction == null) { - if (log.isTraceEnabled()) { - log.trace("no transaction to close"); - } - } else if (transaction.isClosed()) { - if (log.isTraceEnabled()) { - log.trace("transaction " + transaction + " is already closed"); - } - } else { - if (log.isDebugEnabled()) { - log.debug("closing transaction " + transaction); - } - // let's rollback transaction if the transaction was not rollbacked nor committed - // as the topia context close context does not affect hibernate transaction - // so if something bad happen then we will always have a - Transaction tx = ((AbstractTopiaPersistenceContext) transaction).getHibernateSupport().getHibernateSession().getTransaction(); - if (!tx.wasCommitted() && !tx.wasRolledBack()) { - if (log.isDebugEnabled()) { - log.debug("rollback transaction!"); - } - tx.rollback(); - } - transaction.closeContext(); - } - } - - /** - * Hook method called when a method with his name in - * {@link #unusedMethods} was invoked on the proxied transaction - * while the underlying transaction is still not opened. - * - * @param proxy the proxy itself - * @param method method invoked - * @param args arguments of the invoked method - * @return the return code of the method - * @throws Throwable if any error to do. - */ - protected Object onUnusedMethod(Object proxy, - Method method, - Object[] args) throws Throwable { - - // by-pass method since no transaction found - - String methodName = method.getName(); - if (log.isDebugEnabled()) { - log.debug("Skip execution of method " + methodName + - " since no transaction is instanciated."); - } - - Set<String> methods = getUnusedMethods(); - if (methods.contains("toString")) { - - return "No transaction opened yet for this proxy"; - } - - if (methods.contains("isClosed")) { - - return false; - } - - if (methods.contains("equals")) { - - return false; - } - - if (methods.contains("hashCode")) { - - return 0; - } - - if (methods.contains("getClass")) { - - return TopiaPersistenceContext.class; - } - - return null; - } - - /** - * Handler of a proxy on a {@link TopiaPersistenceContext}. - * - * @see #excludeMethods - */ - public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { - - /** Incoming request that creates this handler. */ - protected final ServletRequest request; - - /** Target to use for the proxy. */ - protected TopiaPersistenceContext transaction; - - protected TopiaTransactionProxyInvocationHandler(ServletRequest request) { - this.request = request; - } - - @Override - public Object invoke(Object proxy, - Method method, - Object[] args) throws Throwable { - - String methodName = method.getName(); - - if (getExcludeMethods().contains(methodName)) { - - Object result = onExcludeMethod(proxy, method, args); - return result; - } - - if (transaction == null) { - - if (log.isTraceEnabled()) { - log.trace("transaction started due to a call to " + methodName); - } - - if (getUnusedMethods().contains(methodName)) { - - Object result = onUnusedMethod(proxy, method, args); - return result; - } - - // first time transaction is required, create its - transaction = beginTransaction(request); - - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } - } - - // can invoke the method on the transaction - try { - Object result = method.invoke(transaction, args); - return result; - } catch (Exception eee) { - if (log.isErrorEnabled()) { - log.error("Could not execute method " + method.getName(), eee); - } - throw eee; - } - } - } - } Copied: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java (from rev 290, trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java) =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) @@ -0,0 +1,425 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.web.filter; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Transaction; +import org.nuiton.topia.AbstractTopiaPersistenceContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.TopiaTransaction; + +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 java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * <h2>Purpose of this filter</h2> + * This filter purpose is to inject in the request a transaction from + * {@link TopiaPersistenceContext} and deal with the complete lifecycle of a topia + * transaction while a request. + * <p/> + * The injected transaction will be closed (if was really opened) at the end of + * the request. + * <h2>Configuration of the filter</h2> + * The filter accepts two configuration parameters: + * <ul> + * <li>{@code excludeMethods}: This parameters configure a set of method names + * which should never be called on the proxied transaction. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onExcludeMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to throw an exception. + * </li> + * <li>{@code unusedMethods}: This parameters configure a set of method names + * which should be by-pass when the proxied transaction was not still open (via a + * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onUnusedMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to not return null values. + * </li> + * </ul> + * <h2>Obtain the transaction</h2> + * The (proxied) transaction is pushed as an attribute in the servlet request. + * <p/> + * The attribute name is defined by field {@link #requestAttributeName} + * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be + * changed. + * <p/> + * A convience method is created here to obtain the transaction {@link #getPersistenceContext(ServletRequest)} : + * <pre> + * PersistenceContext tx = TypedTopiaTransactionFilter.getPersistenceContext(ServletRequest); + * </pre> + * <p/> + * If you prefer to not use this nice method, you can also do this: + * <pre> + * PersistenceContext tx = (PersistenceContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + * </pre> + * <p/> + * Or + * <pre> + * PersistenceContext tx = (PersistenceContext) request.getAttribute(modifiedAttributeName); + * </pre> + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.15 + */ +public abstract class TypedTopiaTransactionFilter<PersistenceContext extends TopiaPersistenceContext> implements Filter { + + public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = + "topiaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "beginTransaction", + "closeContext", + "clear" + }; + + public static final String[] DEFAULT_UNUSED_METHODS = { + "toString", + "isClosed", + "closeContext", + "clear", + "equals", + "hashCode", + "finalize", + "getClass" + }; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TypedTopiaTransactionFilter.class); + + public static <PersistenceContext extends TopiaPersistenceContext> PersistenceContext getPersistenceContext(ServletRequest request) { + PersistenceContext topiaContext = (PersistenceContext) + request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + return topiaContext; + } + + /** + * @deprecated since 1.16, use now {@link #getPersistenceContext(ServletRequest)} + */ + @Deprecated + public static <PersistenceContext extends TopiaPersistenceContext> PersistenceContext getTransaction(ServletRequest request) { + PersistenceContext topiaContext = getPersistenceContext(request); + return topiaContext; + } + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + /** names of methods to by-pass if no transaction opened on proxy. */ + protected Set<String> unusedMethods; + + protected final Class<PersistenceContext> persistenceContextType; + + /** + * Name of the request attribute where to push the transaction. + * <p/> + * By default will use value of + * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. + * + * @since 1.10 + */ + protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; + + protected TypedTopiaTransactionFilter(Class<PersistenceContext> persistenceContextType) { + if (persistenceContextType==null) { + throw new NullPointerException("persistenceContextType can't be null"); + } + if (!persistenceContextType.isInterface()) { + throw new IllegalArgumentException("persistenceContextType must be an interface"); + } + this.persistenceContextType = persistenceContextType; + } + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public Set<String> getUnusedMethods() { + return unusedMethods; + } + + /** + * to change the {@link #requestAttributeName}. + * + * @param requestAttributeName new name of the request attribute + * where to push the transaction. + * @since 1.10 + */ + public void setRequestAttributeName(String requestAttributeName) { + this.requestAttributeName = requestAttributeName; + } + + /** + * Method to open a new transaction. + * + * @param request incoming request + * @return the new freshly opened transaction + * @throws TopiaException if any problem while opening a new transaction + */ + protected abstract PersistenceContext beginTransaction(ServletRequest request) throws TopiaException; + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + String methodsFromConfig; + + methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); + String[] methods; + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_EXCLUDE_METHODS; + } + excludeMethods = new HashSet<String>(Arrays.asList(methods)); + + methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_UNUSED_METHODS; + } + unusedMethods = new HashSet<String>(Arrays.asList(methods)); + } + + @Override + public void doFilter(ServletRequest request, + ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + // creates a proxy of a lazy transaction + + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(request); + + PersistenceContext proxy = (PersistenceContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{persistenceContextType, + TopiaTransaction.class}, + proxyInvocationHandler + ); + + // push it in request as an attribute + request.setAttribute(requestAttributeName, proxy); + try { + + // chain to next filter + chain.doFilter(request, response); + } finally { + + // close the real transaction + onCloseTransaction(proxyInvocationHandler.transaction); + } + } + + /** + * Hook method called when a method with his name in + * {@link #excludeMethods} was invoked on the proxied transaction. + * + * @param proxy proxied transaction + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onExcludeMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + method.getName() + " on " + + proxy); + } + + /** + * Hook method to close the topia transaction of the request at the end of + * the request when all filter has been consumed. + * + * @param transaction the transaction to close (can be null if transaction + * was not required while the current request) + * @since 1.9.1 + */ + protected void onCloseTransaction(PersistenceContext transaction) { + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing transaction " + transaction); + } + // let's rollback transaction if the transaction was not rollbacked nor committed + // as the topia context close context does not affect hibernate transaction + // so if something bad happen then we will always have a + Transaction tx = ((AbstractTopiaPersistenceContext) transaction).getHibernateSupport().getHibernateSession().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); + } + tx.rollback(); + } + transaction.closeContext(); + } + } + + /** + * Hook method called when a method with his name in + * {@link #unusedMethods} was invoked on the proxied transaction + * while the underlying transaction is still not opened. + * + * @param proxy the proxy itself + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onUnusedMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // by-pass method since no transaction found + + String methodName = method.getName(); + if (log.isDebugEnabled()) { + log.debug("Skip execution of method " + methodName + + " since no transaction is instanciated."); + } + + Set<String> methods = getUnusedMethods(); + if (methods.contains("toString")) { + + return "No transaction opened yet for this proxy"; + } + + if (methods.contains("isClosed")) { + + return false; + } + + if (methods.contains("equals")) { + + return false; + } + + if (methods.contains("hashCode")) { + + return 0; + } + + if (methods.contains("getClass")) { + + return persistenceContextType; + } + + return null; + } + + /** + * Handler of a proxy on a {@link TopiaPersistenceContext}. + * + * @see #excludeMethods + */ + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Incoming request that creates this handler. */ + protected final ServletRequest request; + + /** Target to use for the proxy. */ + protected PersistenceContext transaction; + + protected TopiaTransactionProxyInvocationHandler(ServletRequest request) { + this.request = request; + } + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + Object result = onExcludeMethod(proxy, method, args); + return result; + } + + if (transaction == null) { + + if (log.isTraceEnabled()) { + log.trace("transaction started due to a call to " + methodName); + } + + if (getUnusedMethods().contains(methodName)) { + + Object result = onUnusedMethod(proxy, method, args); + return result; + } + + // first time transaction is required, create its + transaction = beginTransaction(request); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + + // can invoke the method on the transaction + try { + Object result = method.invoke(transaction, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + } + +}

1 0

[ANN] - Nuiton Web 1.15-alpha-1 released
by nuiton.org Release Notification 12 Dec '13

12 Dec '13

The Nuiton Web team is pleased to announce the nuiton-web-parent-1.15-alpha-1 release! Common ressources for web applications Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-web/ Changes ------- Changes in this version include: New features: o Let nuiton-web be ToPIA 3.0 compliant Issue: 2936. Thanks to Arnaud Thimel. Resolved by athimel. Changes: o Update to Struts 2.3.16 Issue: 2963. Thanks to Arnaud Thimel. Resolved by athimel. o Update to Nuiton-utils 3.0-alpha-1 Issue: 2962. Thanks to Arnaud Thimel. Resolved by athimel. o Update to Mavenpom 4.4 Issue: 2961. Thanks to Arnaud Thimel. Resolved by athimel. Downloads --------- For a manual installation, you can download files here: http://nuiton.org/projects/nuiton-web/files * nuiton-rss-1.15-alpha-1-deps.zip - http://nuiton.org/attachments/download/978 * nuiton-rss-1.15-alpha-1-full.zip - http://nuiton.org/attachments/download/979 * nuiton-web-1.15-alpha-1-deps.zip - http://nuiton.org/attachments/download/980 * nuiton-web-1.15-alpha-1-full.zip - http://nuiton.org/attachments/download/981 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.web|nuiton-web-parent|1… Have fun! -Nuiton Web team

1 0

r290 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 11:41:25 +0100 (Thu, 12 Dec 2013) New Revision: 290 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/290 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-gwt/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-rss/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-security/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-struts2/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-tapestry/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-web/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -352,11 +352,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r289 - in tags: . nuiton-web-1.15-alpha-1
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 11:41:19 +0100 (Thu, 12 Dec 2013) New Revision: 289 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/289 Log: [maven-release-plugin] copy for tag nuiton-web-1.15-alpha-1 Added: tags/nuiton-web-1.15-alpha-1/ Property changes on: tags/nuiton-web-1.15-alpha-1 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r288 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 11:41:15 +0100 (Thu, 12 Dec 2013) New Revision: 288 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/288 Log: [maven-release-plugin] prepare release nuiton-web-1.15-alpha-1 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-gwt/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-rss/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -22,8 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -34,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-security/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-struts2/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-tapestry/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-web/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -16,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> <modules> <module>nuiton-web</module> @@ -353,11 +352,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r287 - trunk/nuiton-security
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:39:56 +0100 (Thu, 12 Dec 2013) New Revision: 287 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/287 Log: Add missing SVN properties Modified: trunk/nuiton-security/pom.xml Property changes on: trunk/nuiton-security/pom.xml ___________________________________________________________________ Added: svn:eol-style + native

1 0

r286 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:39:25 +0100 (Thu, 12 Dec 2013) New Revision: 286 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/286 Log: Fix some invalid POM indentation Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-gwt/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -22,7 +23,6 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> </dependency> - </dependencies> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-rss/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-security/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.15-SNAPSHOT</version> + </parent> - <artifactId>nuiton-security</artifactId> + <artifactId>nuiton-security</artifactId> <properties> @@ -17,108 +18,108 @@ <skipPostRelease>false</skipPostRelease> </properties> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + </dependencies> - <name>Nuiton Web :: Nuiton Security</name> - <description>Security module based on ToPIA</description> + <name>Nuiton Web :: Nuiton Security</name> + <description>Security module based on ToPIA</description> - <packaging>jar</packaging> + <packaging>jar</packaging> - <build> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <executions> - <execution> - <id>eugene-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs>zargo</inputs> - <fullPackagePath>org.nuiton.web</fullPackagePath> - <defaultPackage>org.nuiton.web</defaultPackage> - <templates>org.nuiton.topia.templates.TopiaMetaTransformer</templates> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-templates</artifactId> - <version>${topiaVersion}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <executions> + <execution> + <id>eugene-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs>zargo</inputs> + <fullPackagePath>org.nuiton.web</fullPackagePath> + <defaultPackage>org.nuiton.web</defaultPackage> + <templates>org.nuiton.topia.templates.TopiaMetaTransformer</templates> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-templates</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> </project> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-struts2/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +18,7 @@ <name>Nuiton Web :: Nuiton Struts 2</name> <description>Extra classes for Struts 2 based applications</description> - + <dependencies> <dependency> @@ -51,13 +52,13 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> </dependency> <dependency> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-tapestry/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-web/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -110,10 +111,10 @@ </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.2</version> - <scope>provided</scope> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.2</version> + <scope>provided</scope> </dependency>  @@ -184,7 +185,7 @@ </exclusion> </exclusions> </dependency> - +  <dependency> <groupId>org.apache.shiro</groupId>

1 0

r285 - trunk/nuiton-security
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:36:02 +0100 (Thu, 12 Dec 2013) New Revision: 285 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/285 Log: Remove svn:mime-type property on nuiton-security/pom.xml Add Guava dependency Modified: trunk/nuiton-security/pom.xml Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Property changes on: trunk/nuiton-security/pom.xml ___________________________________________________________________ Deleted: svn:mime-type - application/xml

1 0

r284 - trunk/nuiton-security/src/license
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:30:22 +0100 (Thu, 12 Dec 2013) New Revision: 284 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/284 Log: Set javassist license (nuiton-security module) Modified: trunk/nuiton-security/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-security/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-security/src/license/THIRD-PARTY.properties 2013-12-12 10:26:12 UTC (rev 283) +++ trunk/nuiton-security/src/license/THIRD-PARTY.properties 2013-12-12 10:30:22 UTC (rev 284) @@ -21,5 +21,6 @@ antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.11.0.GA=MPL 1.1 javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

Build failed in Jenkins: nuiton-web » Nuiton Web :: Nuiton Security #150
by admin+hudson＠codelutin.com 12 Dec '13

12 Dec '13

See <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> Changes: [Arnaud Thimel] fixes #2936 nuiton-web is now ToPIA 3.0 compliant ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Security 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-security --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.3:generate (eugene-generation) @ nuiton-security --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (2 KB at 7.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (5 KB at 151.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (95 KB at 1779.2 KB/sec) [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> to <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] Generate one file in 25.713ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> INFO [pool-1-thread-1 for channel] (Resource.java:296) getURLs - search URLs pattern: .*/default-uml14.xmi in 55 urls in 819.776ms [INFO] Copy file <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> to <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] Generate one file in 1.645s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.String] : the tagvalue 'String' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.nuiton.web.security.SecurityRole.attribute.permissions.tagvalue.lazy] : this tagvalue 'lazy' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.nuiton.web.security.SecurityUser.attribute.securityRole.tagvalue.lazy] : this tagvalue 'lazy' is unkown. INFO [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:270) loadModelProperties - 3 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] No file generated. [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1 for channel] (EntityTransformer.java:131) transformFromClass - [SecurityUser] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1 for channel] (EntityTransformer.java:131) transformFromClass - [SecurityRole] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…,> PatternSet [includes: {}, excludes: {**/*.java}]}} [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (default) @ nuiton-security --- [INFO] start entry basedir:<http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…,> includes:[**/*.java] [INFO] 12 file(s) to process (among 12 files) [INFO] Parsing is done. [treated file(s) : 2/12](total time:29.536ms) ( ~ 2.461ms / file) [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserValidation (default) @ nuiton-security --- [INFO] Load rules file validation.rules [INFO] Nothing was parsed - all files are up to date. [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (default) @ nuiton-security >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ nuiton-security --- [INFO] config - basedir : <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 98831ns [INFO] import getter validation.getter in 56439ns [INFO] Copying nuiton-security.properties to <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] Copying nuiton-security.properties to <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (default) @ nuiton-security <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (default) @ nuiton-security --- [INFO] config - src basedir : <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] config - out basedir : <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [WARNING] bundle fr_FR contains 4/4 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 4/4 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-security --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 2 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-security --- [INFO] Compiling 29 source files to <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…>:[49,24] org.nuiton.topia.TopiaContextFactory in org.nuiton.topia has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…>:[98,60] findByLogin(java.lang.String) in org.nuiton.web.security.GeneratedSecurityUserTopiaDao has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…>:[95,26] org.nuiton.topia.TopiaContextFactory in org.nuiton.topia has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…>:[97,23] org.nuiton.topia.TopiaContextFactory in org.nuiton.topia has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…>: Recompile with -Xlint:unchecked for details. [INFO] 7 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-security/…>:[97,42] cannot find symbol symbol: method getContext(java.util.Properties,com.google.common.base.Function<java.util.Properties,org.nuiton.web.SecurityTopiaApplicationContext>) location: class org.nuiton.topia.TopiaContextFactory [INFO] 1 error [INFO] -------------------------------------------------------------

1 9

Build failed in Jenkins: nuiton-web #150
by admin+hudson＠codelutin.com 12 Dec '13

12 Dec '13

See <http://ci.nuiton.org/jenkins/job/nuiton-web/150/changes> Changes: [Arnaud Thimel] Add Rome License [Arnaud Thimel] fixes #2936 nuiton-web is now ToPIA 3.0 compliant ------------------------------------------ [...truncated 460 lines...] [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-gwt --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] [INFO] --- gwt-maven-plugin:2.2.0:resources (default) @ nuiton-gwt --- [INFO] auto discovered modules [org.nuiton.web.gwt.NuitonGWT] [INFO] 15 source files from GWT module org.nuiton.web.gwt.NuitonGWT [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-gwt --- [INFO] Compiling 14 source files to <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/clas…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/main/ja…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/main/ja…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ nuiton-gwt --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/sure…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ nuiton-gwt --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/src/test/re…> [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ nuiton-gwt --- [INFO] No sources to compile [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ nuiton-gwt --- [INFO] No tests to run. [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ nuiton-gwt --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/nuit…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ nuiton-gwt --- [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ nuiton-gwt >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-gwt --- [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ nuiton-gwt <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ nuiton-gwt --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/nuit…> [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ nuiton-gwt --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/nuit…> to /var/local/maven/data/repository/org/nuiton/web/nuiton-gwt/1.15-SNAPSHOT/nuiton-gwt-1.15-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/pom.xml> to /var/local/maven/data/repository/org/nuiton/web/nuiton-gwt/1.15-SNAPSHOT/nuiton-gwt-1.15-SNAPSHOT.pom [INFO] Installing <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/nuit…> to /var/local/maven/data/repository/org/nuiton/web/nuiton-gwt/1.15-SNAPSHOT/nuiton-gwt-1.15-SNAPSHOT-sources.jar [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Security 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-security --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.3:generate (eugene-generation) @ nuiton-security --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (2 KB at 7.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (5 KB at 151.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/topia/topia-… (95 KB at 1779.2 KB/sec) [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…> to <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] Generate one file in 25.713ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> INFO [pool-1-thread-1 for channel] (Resource.java:296) getURLs - search URLs pattern: .*/default-uml14.xmi in 55 urls in 819.776ms [INFO] Copy file <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> to <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] Generate one file in 1.645s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagvalue.String] : the tagvalue 'String' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.nuiton.web.security.SecurityRole.attribute.permissions.tagvalue.lazy] : this tagvalue 'lazy' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [org.nuiton.web.security.SecurityUser.attribute.securityRole.tagvalue.lazy] : this tagvalue 'lazy' is unkown. INFO [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:270) loadModelProperties - 3 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] No file generated. [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1 for channel] (EntityTransformer.java:131) transformFromClass - [SecurityUser] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ WARN [pool-1-thread-1 for channel] (EntityTransformer.java:131) transformFromClass - [SecurityRole] Will generate constants with NO prefix, not a good idea... Use 'constantPrefix' tagvalue in your xmi properties. For example for all the model : model.tagvalue.constantPrefix=PROPERTY_ [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…,> PatternSet [includes: {}, excludes: {**/*.java}]}} [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (default) @ nuiton-security --- [INFO] start entry basedir:<http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…,> includes:[**/*.java] [INFO] 12 file(s) to process (among 12 files) [INFO] Parsing is done. [treated file(s) : 2/12](total time:29.536ms) ( ~ 2.461ms / file) [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserValidation (default) @ nuiton-security --- [INFO] Load rules file validation.rules [INFO] Nothing was parsed - all files are up to date. [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (default) @ nuiton-security >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ nuiton-security --- [INFO] config - basedir : <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 98831ns [INFO] import getter validation.getter in 56439ns [INFO] Copying nuiton-security.properties to <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] Copying nuiton-security.properties to <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (default) @ nuiton-security <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (default) @ nuiton-security --- [INFO] config - src basedir : <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…> [INFO] config - out basedir : <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [WARNING] bundle fr_FR contains 4/4 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 4/4 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-security --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 2 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-security --- [INFO] Compiling 29 source files to <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[49,24] org.nuiton.topia.TopiaContextFactory in org.nuiton.topia has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[98,60] findByLogin(java.lang.String) in org.nuiton.web.security.GeneratedSecurityUserTopiaDao has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[95,26] org.nuiton.topia.TopiaContextFactory in org.nuiton.topia has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[97,23] org.nuiton.topia.TopiaContextFactory in org.nuiton.topia has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/target…>: Recompile with -Xlint:unchecked for details. [INFO] 7 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[97,42] cannot find symbol symbol: method getContext(java.util.Properties,com.google.common.base.Function<java.util.Properties,org.nuiton.web.SecurityTopiaApplicationContext>) location: class org.nuiton.topia.TopiaContextFactory [INFO] 1 error [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Nuiton Web ........................................ SUCCESS [2.340s] [INFO] Nuiton Web :: Nuiton Web .......................... SUCCESS [3.129s] [INFO] Nuiton Web :: Nuiton Struts 2 ..................... SUCCESS [1.957s] [INFO] Nuiton Web :: Nuiton Tapestry ..................... SUCCESS [0.995s] [INFO] Nuiton Web :: Nuiton RSS .......................... SUCCESS [2.783s] [INFO] Nuiton Web :: Nuiton GWT .......................... SUCCESS [3.135s] [INFO] Nuiton Web :: Nuiton Security ..................... FAILURE [3.664s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 19.592s [INFO] Finished at: Thu Nov 28 11:26:51 CET 2013 [INFO] Final Memory: 40M/282M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project nuiton-security: Compilation failure [ERROR] <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[97,42] cannot find symbol [ERROR] symbol: method getContext(java.util.Properties,com.google.common.base.Function<java.util.Properties,org.nuiton.web.SecurityTopiaApplicationContext>) [ERROR] location: class org.nuiton.topia.TopiaContextFactory [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project nuiton-security: Compilation failure <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[97,42] cannot find symbol symbol: method getContext(java.util.Properties,com.google.common.base.Function<java.util.Properties,org.nuiton.web.SecurityTopiaApplicationContext>) location: class org.nuiton.topia.TopiaContextFactory at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/src/ma…>:[97,42] cannot find symbol symbol: method getContext(java.util.Properties,com.google.common.base.Function<java.util.Properties,org.nuiton.web.SecurityTopiaApplicationContext>) location: class org.nuiton.topia.TopiaContextFactory at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :nuiton-security [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/pom.xml> to org.nuiton.web/nuiton-struts2/1.15-SNAPSHOT/nuiton-struts2-1.15-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-struts2/target/…> to org.nuiton.web/nuiton-struts2/1.15-SNAPSHOT/nuiton-struts2-1.15-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/pom.xml> to org.nuiton.web/nuiton-gwt/1.15-SNAPSHOT/nuiton-gwt-1.15-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/nuit…> to org.nuiton.web/nuiton-gwt/1.15-SNAPSHOT/nuiton-gwt-1.15-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-gwt/target/nuit…> to org.nuiton.web/nuiton-gwt/1.15-SNAPSHOT/nuiton-gwt-1.15-SNAPSHOT-sources.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/pom.xml> to org.nuiton.web/nuiton-web-parent/1.15-SNAPSHOT/nuiton-web-parent-1.15-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/target/nuiton-web-pare…> to org.nuiton.web/nuiton-web-parent/1.15-SNAPSHOT/nuiton-web-parent-1.15-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/pom.xml> to org.nuiton.web/nuiton-web/1.15-SNAPSHOT/nuiton-web-1.15-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-web/target/nuit…> to org.nuiton.web/nuiton-web/1.15-SNAPSHOT/nuiton-web-1.15-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/pom.xml> to org.nuiton.web/nuiton-rss/1.15-SNAPSHOT/nuiton-rss-1.15-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-rss/target/nuit…> to org.nuiton.web/nuiton-rss/1.15-SNAPSHOT/nuiton-rss-1.15-SNAPSHOT.war [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-security/pom.xml> to org.nuiton.web/nuiton-security/1.15-SNAPSHOT/nuiton-security-1.15-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-tapestry/pom.xml> to org.nuiton.web/nuiton-tapestry/1.15-SNAPSHOT/nuiton-tapestry-1.15-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/nuiton-web/ws/trunk/nuiton-tapestry/target…> to org.nuiton.web/nuiton-tapestry/1.15-SNAPSHOT/nuiton-tapestry-1.15-SNAPSHOT.jar Sending e-mails to: nuiton-web-commits(a)list.nuiton.org null athimel(a)codelutin.com channel stopped

1 9

r283 - trunk/nuiton-struts2/src/license
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:26:12 +0100 (Thu, 12 Dec 2013) New Revision: 283 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/283 Log: Set javassist license Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2013-12-12 10:15:52 UTC (rev 282) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2013-12-12 10:26:12 UTC (rev 283) @@ -23,5 +23,6 @@ antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.11.0.GA=MPL 1.1 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

r282 - trunk
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:15:52 +0100 (Thu, 12 Dec 2013) New Revision: 282 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/282 Log: fixes #2963 Update to Struts 2.3.16 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:13:58 UTC (rev 281) +++ trunk/pom.xml 2013-12-12 10:15:52 UTC (rev 282) @@ -283,7 +283,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.15.3</struts2Version> + <struts2Version>2.3.16</struts2Version> <shiroVersion>1.2.2</shiroVersion> <servletApiVersion>2.5</servletApiVersion>

1 0

r281 - trunk
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:13:58 +0100 (Thu, 12 Dec 2013) New Revision: 281 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/281 Log: fixes #2962 Update to Nuiton-utils 3.0-alpha-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:13:35 UTC (rev 280) +++ trunk/pom.xml 2013-12-12 10:13:58 UTC (rev 281) @@ -268,7 +268,7 @@ <eugeneVersion>2.7.3</eugeneVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion>

1 0

r280 - trunk/nuiton-security/src/main/java/org/nuiton/web/security
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:13:35 +0100 (Thu, 12 Dec 2013) New Revision: 280 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/280 Log: refs #2936 Introduce TopiaApplicationContextCache Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-12 09:47:20 UTC (rev 279) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-12 10:13:35 UTC (rev 280) @@ -46,6 +46,7 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.nuiton.config.ApplicationConfig; +import org.nuiton.topia.TopiaApplicationContextCache; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaUtil; @@ -94,7 +95,7 @@ // get topia root context config.setOption(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); Properties props = config.getFlatOptions(); - rootContext = TopiaContextFactory.getContext(props, CREATE_SECURITY_APPLICATION_CONTEXT); + rootContext = TopiaApplicationContextCache.getContext(props, CREATE_SECURITY_APPLICATION_CONTEXT); initSchema(rootContext); getServletContext().setAttribute(ROOT_CONTEXT_CONTEXT, rootContext);

1 0

r279 - trunk
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 10:47:20 +0100 (Thu, 12 Dec 2013) New Revision: 279 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/279 Log: Update to Mavenpom 4.4 Update to Topia 3.0-alpha-7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-27 16:43:44 UTC (rev 278) +++ trunk/pom.xml 2013-12-12 09:47:20 UTC (rev 279) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.3</version> + <version>4.4</version> </parent> <groupId>org.nuiton.web</groupId> @@ -272,7 +272,7 @@ <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-alpha-7</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r278 - trunk/nuiton-rss/src/license
by athimel＠users.nuiton.org 27 Nov '13

27 Nov '13

Author: athimel Date: 2013-11-27 17:43:44 +0100 (Wed, 27 Nov 2013) New Revision: 278 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/278 Log: Add Rome License Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2013-11-27 16:20:15 UTC (rev 277) +++ trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2013-11-27 16:43:44 UTC (rev 278) @@ -20,3 +20,4 @@ #Wed Oct 24 14:20:44 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +rome--rome--1.0=The Apache Software License, Version 2.0

1 0

r277 - in trunk: . nuiton-security nuiton-security/src/main/java/org/nuiton/web/security nuiton-security/src/main/java/org/nuiton/web/security/actions nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor nuiton-web/src/main/java/org/nuiton/web/filter
by athimel＠users.nuiton.org 27 Nov '13

27 Nov '13

Author: athimel Date: 2013-11-27 17:20:15 +0100 (Wed, 27 Nov 2013) New Revision: 277 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/277 Log: fixes #2936 nuiton-web is now ToPIA 3.0 compliant Modified: trunk/nuiton-security/pom.xml trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java trunk/pom.xml Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-11-27 16:20:15 UTC (rev 277) @@ -45,13 +45,16 @@ import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; -import org.nuiton.topia.TopiaContext; +import org.nuiton.config.ApplicationConfig; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaUtil; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.web.SecurityDAOHelper; +import org.nuiton.web.SecurityEntityEnum; +import org.nuiton.web.SecurityTopiaApplicationContext; +import org.nuiton.web.SecurityTopiaPersistenceContext; +import com.google.common.base.Function; + /** * Servlet filter used to filter requested url. * @@ -63,15 +66,21 @@ public static final String APP_CONFIG_CONTEXT = SecurityShiroFilter.class.getName() + "#" + ApplicationConfig.class.getName(); - public static final String ROOT_CONTEXT_CONTEXT = SecurityShiroFilter.class.getName() + "#" + TopiaContext.class.getName(); + public static final String ROOT_CONTEXT_CONTEXT = SecurityShiroFilter.class.getName() + "#" + SecurityTopiaApplicationContext.class.getName(); public static final String ANON_LOGIN = "anonymous"; public static final String SESSION_REQUESTED_URL = "securityRequestedUrl"; + protected static final Function<Properties,SecurityTopiaApplicationContext> CREATE_SECURITY_APPLICATION_CONTEXT = new Function<Properties, SecurityTopiaApplicationContext>() { + @Override + public SecurityTopiaApplicationContext apply(Properties input) { + return new SecurityTopiaApplicationContext(input); + } + }; protected ApplicationConfig config; - protected TopiaContext rootContext; + protected SecurityTopiaApplicationContext rootContext; @Override public void init() throws Exception { @@ -83,9 +92,9 @@ } // get topia root context - config.setOption(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, SecurityDAOHelper.getImplementationClassesAsString()); + config.setOption(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); Properties props = config.getFlatOptions(); - rootContext = TopiaContextFactory.getContext(props); + rootContext = TopiaContextFactory.getContext(props, CREATE_SECURITY_APPLICATION_CONTEXT); initSchema(rootContext); getServletContext().setAttribute(ROOT_CONTEXT_CONTEXT, rootContext); @@ -102,9 +111,9 @@ SecurityUtils.setSecurityManager(securityManager); } - protected static void initSchema(TopiaContext rootContext) throws TopiaException { - TopiaContext transaction = rootContext.beginTransaction(); - boolean testTable = TopiaUtil.isSchemaExist(transaction, SecurityUserImpl.class.getName()); + protected static void initSchema(SecurityTopiaApplicationContext rootContext) throws TopiaException { + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + boolean testTable = TopiaUtil.isSchemaExist(transaction.getHibernateSupport(), SecurityUserImpl.class.getName()); transaction.closeContext(); if (!testTable) { if (log.isInfoEnabled()) { @@ -113,11 +122,11 @@ rootContext.createSchema(); // create anon user - TopiaContext transaction2 = rootContext.beginTransaction(); - SecurityUserDAO securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction2); + SecurityTopiaPersistenceContext transaction2 = rootContext.newPersistenceContext(); + SecurityUserTopiaDao securityUserDAO = transaction2.getSecurityUserDao(); SecurityUser anonUser = securityUserDAO.create(); anonUser.setLogin(ANON_LOGIN); - transaction2.commitTransaction(); + transaction2.commit(); transaction2.closeContext(); } else { if (log.isDebugEnabled()) { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-11-27 16:20:15 UTC (rev 277) @@ -41,12 +41,10 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.config.ApplicationConfig; import org.nuiton.util.StringUtil; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.web.SecurityDAOHelper; +import org.nuiton.web.SecurityTopiaApplicationContext; +import org.nuiton.web.SecurityTopiaPersistenceContext; /** * Topia shiro realm finding user in database. @@ -57,14 +55,14 @@ private static final Log log = LogFactory.getLog(TopiaSecurityRealm.class); - protected TopiaContext rootContext; + protected SecurityTopiaApplicationContext rootContext; protected ApplicationConfig config; /** Authorization cache (invalidated at login). */ protected transient Map<String, SimpleAuthorizationInfo> authorizationCache; - public TopiaSecurityRealm(TopiaContext rootContext, ApplicationConfig config) { + public TopiaSecurityRealm(SecurityTopiaApplicationContext rootContext, ApplicationConfig config) { this.rootContext = rootContext; this.config = config; authorizationCache = new HashMap<String, SimpleAuthorizationInfo>(); @@ -88,10 +86,10 @@ SimpleAuthorizationInfo result = authorizationCache.get(login); if (result == null) { Properties props = config.getFlatOptions(); - TopiaContext transaction = null; + SecurityTopiaPersistenceContext transaction = null; try { - transaction = rootContext.beginTransaction(); - SecurityUserDAO securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + transaction = rootContext.newPersistenceContext(); + SecurityUserTopiaDao securityUserDAO = transaction.getSecurityUserDao(); if (log.isDebugEnabled()) { log.debug("Build autorisation list for user : " + login); @@ -158,11 +156,7 @@ } } finally { if (transaction != null) { - try { - transaction.closeContext(); - } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); - } + transaction.closeContext(); } } } else { @@ -185,12 +179,12 @@ } AuthenticationInfo result = null; - TopiaContext transaction = null; + SecurityTopiaPersistenceContext transaction = null; try { - transaction = rootContext.beginTransaction(); - SecurityUserDAO securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + transaction = rootContext.newPersistenceContext(); + SecurityUserTopiaDao securityUserDAO = transaction.getSecurityUserDao(); - SecurityUser securityUser = securityUserDAO.findByLogin(login); + SecurityUser securityUser = securityUserDAO.forLoginEquals(login).findUnique(); if (securityUser != null) { if (login.equals(SecurityShiroFilter.ANON_LOGIN)) { result = new SimpleAuthenticationInfo(securityUser.getLogin(), @@ -204,15 +198,9 @@ authorizationCache.remove(login); } - } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); } finally { if (transaction != null) { - try { - transaction.closeContext(); - } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); - } + transaction.closeContext(); } } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2013-11-27 16:20:15 UTC (rev 277) @@ -30,8 +30,8 @@ import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.util.ServletContextAware; -import org.nuiton.topia.TopiaContext; -import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.web.SecurityTopiaApplicationContext; import org.nuiton.web.security.SecurityShiroFilter; import com.opensymphony.xwork2.ActionSupport; @@ -41,7 +41,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = -1097798007319592593L; - protected TopiaContext rootContext; + protected SecurityTopiaApplicationContext rootContext; protected ApplicationConfig config; protected Map<String, String[]> actionParameters; @@ -53,7 +53,7 @@ @Override public void setServletContext(ServletContext context) { config = (ApplicationConfig)context.getAttribute(SecurityShiroFilter.APP_CONFIG_CONTEXT); - rootContext = (TopiaContext)context.getAttribute(SecurityShiroFilter.ROOT_CONTEXT_CONTEXT); + rootContext = (SecurityTopiaApplicationContext)context.getAttribute(SecurityShiroFilter.ROOT_CONTEXT_CONTEXT); } /** Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java 2013-11-27 16:20:15 UTC (rev 277) @@ -26,14 +26,14 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; -import org.nuiton.web.security.SecurityUserDAO; +import org.nuiton.web.security.SecurityUserTopiaDao; public class LogoutAction extends AbstractAction { /** serialVersionUID. */ private static final long serialVersionUID = 1L; - protected SecurityUserDAO securityUserDAO; + protected SecurityUserTopiaDao securityUserDAO; @Override public String execute() throws Exception { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2013-11-27 16:20:15 UTC (rev 277) @@ -27,13 +27,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.web.SecurityDAOHelper; +import org.nuiton.web.SecurityTopiaPersistenceContext; import org.nuiton.web.security.SecurityRole; -import org.nuiton.web.security.SecurityRoleDAO; import org.nuiton.web.security.SecurityRoleImpl; +import org.nuiton.web.security.SecurityRoleTopiaDao; public class RoleAction extends AbstractAction { @@ -42,7 +39,7 @@ private static final Log log = LogFactory.getLog(RoleAction.class); - protected SecurityRoleDAO securityRoleDAO; + protected SecurityRoleTopiaDao securityRoleDAO; protected SecurityRole role; @@ -50,14 +47,10 @@ if (role == null) { String roleId = getParameter("roleId"); if (StringUtils.isNotBlank(roleId)) { - try { - TopiaContext transaction = rootContext.beginTransaction(); - securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); - role = securityRoleDAO.findByTopiaId(roleId); - transaction.closeContext(); - } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); - } + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityRoleDAO = transaction.getSecurityRoleDao(); + role = securityRoleDAO.findByTopiaId(roleId); + transaction.closeContext(); } else { role = new SecurityRoleImpl(); } @@ -69,11 +62,11 @@ try { String roleId = getParameter("roleId"); if (StringUtils.isNotBlank(roleId)) { - TopiaContext transaction = rootContext.beginTransaction(); - securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityRoleDAO = transaction.getSecurityRoleDao(); SecurityRole role = securityRoleDAO.findByTopiaId(roleId); securityRoleDAO.delete(role); - transaction.commitTransaction(); + transaction.commit(); transaction.closeContext(); } @@ -91,14 +84,14 @@ String result = super.execute(); try { - TopiaContext transaction = rootContext.beginTransaction(); - securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityRoleDAO = transaction.getSecurityRoleDao(); if (getRole().getTopiaId() == null) { securityRoleDAO.create(getRole()); } else { securityRoleDAO.update(getRole()); } - transaction.commitTransaction(); + transaction.commit(); transaction.closeContext(); } catch (Exception ex) { addActionError(ex.getMessage()); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2013-11-27 16:20:15 UTC (rev 277) @@ -32,20 +32,19 @@ import java.util.Properties; import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.TopiaContext; -import org.nuiton.web.SecurityDAOHelper; +import org.nuiton.web.SecurityTopiaPersistenceContext; import org.nuiton.web.security.SecurityRole; -import org.nuiton.web.security.SecurityRoleDAO; -import org.nuiton.web.security.SecurityUserDAO; +import org.nuiton.web.security.SecurityRoleTopiaDao; +import org.nuiton.web.security.SecurityUserTopiaDao; public class RolePermissionsAction extends AbstractAction { /** serialVersionUID. */ private static final long serialVersionUID = 1L; - protected SecurityUserDAO securityUserDAO; + protected SecurityUserTopiaDao securityUserDAO; - protected SecurityRoleDAO securityRoleDAO; + protected SecurityRoleTopiaDao securityRoleDAO; /** Id categories with name. */ protected Map<String, String> categories; @@ -60,9 +59,9 @@ @Override public String input() throws Exception { - TopiaContext transaction = rootContext.beginTransaction(); - securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); - roles = securityRoleDAO.findAllWithOrder(SecurityRole.NAME); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityRoleDAO = transaction.getSecurityRoleDao(); + roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.NAME).findAll(); transaction.closeContext(); categories = new HashMap<String, String>(); @@ -123,8 +122,8 @@ result = input(); } else { try { - TopiaContext transaction = rootContext.beginTransaction(); - securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityRoleDAO = transaction.getSecurityRoleDao(); for (String roleId : roleIds) { SecurityRole securityRole = securityRoleDAO.findByTopiaId(roleId); securityRole.clearPermissions(); @@ -136,7 +135,7 @@ } } } - transaction.commitTransaction(); + transaction.commit(); } catch (Exception ex) { addActionError(ex.getMessage()); result = input(); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2013-11-27 16:20:15 UTC (rev 277) @@ -24,19 +24,17 @@ package org.nuiton.web.security.actions; -import static org.nuiton.i18n.I18n._; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.StringUtil; -import org.nuiton.web.SecurityDAOHelper; +import org.nuiton.web.SecurityTopiaPersistenceContext; import org.nuiton.web.security.SecurityUser; -import org.nuiton.web.security.SecurityUserDAO; import org.nuiton.web.security.SecurityUserImpl; +import org.nuiton.web.security.SecurityUserTopiaDao; +import static org.nuiton.i18n.I18n._; + public class UserAction extends AbstractAction { /** serialVersionUID. */ @@ -44,7 +42,7 @@ private static final Log log = LogFactory.getLog(UserAction.class); - protected SecurityUserDAO securityUserDAO; + protected SecurityUserTopiaDao securityUserDAO; protected SecurityUser user; @@ -56,14 +54,10 @@ if (user == null) { String roleId = getParameter("userId"); if (StringUtils.isNotBlank(roleId)) { - try { - TopiaContext transaction = rootContext.beginTransaction(); - securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); - user = securityUserDAO.findByTopiaId(roleId); - transaction.closeContext(); - } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); - } + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityUserDAO = transaction.getSecurityUserDao(); + user = securityUserDAO.findByTopiaId(roleId); + transaction.closeContext(); } else { user = new SecurityUserImpl(); } @@ -83,11 +77,11 @@ try { String roleId = getParameter("userId"); if (StringUtils.isNotBlank(roleId)) { - TopiaContext transaction = rootContext.beginTransaction(); - securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityUserDAO = transaction.getSecurityUserDao(); SecurityUser user = securityUserDAO.findByTopiaId(roleId); securityUserDAO.delete(user); - transaction.commitTransaction(); + transaction.commit(); transaction.closeContext(); } } catch (Exception ex) { @@ -113,8 +107,8 @@ String result = super.execute(); try { - TopiaContext transaction = rootContext.beginTransaction(); - securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityUserDAO = transaction.getSecurityUserDao(); SecurityUser user = getUser(); if (StringUtils.isNotBlank(password)) { @@ -126,7 +120,7 @@ } else { securityUserDAO.update(user); } - transaction.commitTransaction(); + transaction.commit(); transaction.closeContext(); } catch (Exception ex) { addActionError(ex.getMessage()); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2013-11-27 16:20:15 UTC (rev 277) @@ -26,21 +26,20 @@ import java.util.List; -import org.nuiton.topia.TopiaContext; -import org.nuiton.web.SecurityDAOHelper; +import org.nuiton.web.SecurityTopiaPersistenceContext; import org.nuiton.web.security.SecurityRole; -import org.nuiton.web.security.SecurityRoleDAO; +import org.nuiton.web.security.SecurityRoleTopiaDao; import org.nuiton.web.security.SecurityUser; -import org.nuiton.web.security.SecurityUserDAO; +import org.nuiton.web.security.SecurityUserTopiaDao; public class UserRolesAction extends AbstractAction { /** serialVersionUID. */ private static final long serialVersionUID = 1L; - protected SecurityUserDAO securityUserDAO; + protected SecurityUserTopiaDao securityUserDAO; - protected SecurityRoleDAO securityRoleDAO; + protected SecurityRoleTopiaDao securityRoleDAO; protected List<SecurityUser> users; @@ -50,11 +49,11 @@ @Override public String input() throws Exception { - TopiaContext transaction = rootContext.beginTransaction(); - securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); - securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); - users = securityUserDAO.findAllWithOrder(SecurityUser.LOGIN); - roles = securityRoleDAO.findAllWithOrder(SecurityRole.NAME); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityUserDAO = transaction.getSecurityUserDao(); + securityRoleDAO = transaction.getSecurityRoleDao(); + users = securityUserDAO.newQueryBuilder().setOrderByArguments(SecurityUser.LOGIN).findAll(); + roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.NAME).findAll(); transaction.closeContext(); return super.input(); } @@ -79,9 +78,9 @@ result = input(); } else { try { - TopiaContext transaction = rootContext.beginTransaction(); - securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); - securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); + SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); + securityUserDAO = transaction.getSecurityUserDao(); + securityRoleDAO = transaction.getSecurityRoleDao(); for (String userId : userIds) { SecurityUser securityUser = securityUserDAO.findByTopiaId(userId); securityUser.clearSecurityRole(); @@ -94,7 +93,7 @@ } } } - transaction.commitTransaction(); + transaction.commit(); transaction.closeContext(); } catch (Exception ex) { addActionError(ex.getMessage()); Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2013-11-27 16:20:15 UTC (rev 277) @@ -25,12 +25,7 @@ package org.nuiton.web.struts2.filter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.web.struts2.interceptor.OpenTopiaTransactionInterceptor; +import java.io.IOException; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -38,8 +33,12 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import java.io.IOException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.web.struts2.interceptor.OpenTopiaTransactionInterceptor; + /** Close a TopiaTransaction instance stored in the servlet context. * * The main usage is to close a transaction opened by the @@ -62,7 +61,7 @@ try { filterChain.doFilter(servletRequest, servletResponse); } finally { - TopiaContext transaction = (TopiaContext) + TopiaPersistenceContext transaction = (TopiaPersistenceContext) servletRequest.getAttribute( OpenTopiaTransactionInterceptor.TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); @@ -78,11 +77,7 @@ if (log.isDebugEnabled()) { log.debug("close transaction " + transaction); } - try { - transaction.closeContext(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + transaction.closeContext(); } } } Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2013-11-27 16:20:15 UTC (rev 277) @@ -24,24 +24,25 @@ */ package org.nuiton.web.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.TextParseUtil; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.TopiaTransaction; import org.nuiton.topia.framework.TopiaTransactionAware; import org.nuiton.web.struts2.filter.CloseTopiaTransactionFilter; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.TextParseUtil; /** *  @@ -123,7 +124,7 @@ * @return the new freshly opened transaction * @throws TopiaException if any problem while opening a new transaction */ - protected abstract TopiaContext beginTransaction() throws TopiaException; + protected abstract TopiaPersistenceContext beginTransaction() throws TopiaException; @Override public void init() { @@ -160,10 +161,10 @@ TopiaTransactionProxyInvocationHandler proxyInvocationHandler = new TopiaTransactionProxyInvocationHandler(); - TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + TopiaPersistenceContext proxy = (TopiaPersistenceContext) Proxy.newProxyInstance( getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, + new Class<?>[]{TopiaPersistenceContext.class, + TopiaTransaction.class}, proxyInvocationHandler ); @@ -174,16 +175,16 @@ } /** - * Handler of a proxy on a {@link TopiaContext}. + * Handler of a proxy on a {@link TopiaPersistenceContext}. * * @see #excludeMethods */ public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { /** Target to use for the proxy. */ - protected TopiaContext transaction; + protected TopiaPersistenceContext transaction; - public TopiaContext getTransaction() { + public TopiaPersistenceContext getTransaction() { return transaction; } Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-11-27 16:20:15 UTC (rev 277) @@ -28,10 +28,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Transaction; -import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.AbstractTopiaPersistenceContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.TopiaTransaction; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -50,7 +50,7 @@ /** * <h2>Purpose of this filter</h2> * This filter purpose is to inject in the request a transaction from - * {@link TopiaContext} and deal with the complete lifecycle of a topia + * {@link org.nuiton.topia.TopiaPersistenceContext} and deal with the complete lifecycle of a topia * transaction while a request. * <p/> * The injected transaction will be closed (if was really opened) at the end of @@ -66,7 +66,8 @@ * Default implementation of this hook is to throw an exception. * </li> * <li>{@code unusedMethods}: This parameters configure a set of method names - * which should be by-pass when the proxied transaction was not still open (via a {@link TopiaContext#beginTransaction()}. + * which should be by-pass when the proxied transaction was not still open (via a + * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onUnusedMethod(Object, Method, Object[])}. * <p/> @@ -159,8 +160,8 @@ this.requestAttributeName = requestAttributeName; } - public static TopiaContext getTransaction(ServletRequest request) { - TopiaContext topiaContext = (TopiaContext) + public static TopiaPersistenceContext getTransaction(ServletRequest request) { + TopiaPersistenceContext topiaContext = (TopiaPersistenceContext) request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); return topiaContext; } @@ -170,9 +171,9 @@ * * @param request incoming request * @return the new freshly opened transaction - * @throws TopiaRuntimeException if any problem while opening a new transaction + * @throws TopiaException if any problem while opening a new transaction */ - protected abstract TopiaContext beginTransaction(ServletRequest request) throws TopiaRuntimeException; + protected abstract TopiaPersistenceContext beginTransaction(ServletRequest request) throws TopiaException; @Override public void destroy() { @@ -210,10 +211,10 @@ TopiaTransactionProxyInvocationHandler proxyInvocationHandler = new TopiaTransactionProxyInvocationHandler(request); - TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + TopiaPersistenceContext proxy = (TopiaPersistenceContext) Proxy.newProxyInstance( getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, + new Class<?>[]{TopiaPersistenceContext.class, + TopiaTransaction.class}, proxyInvocationHandler ); @@ -258,7 +259,7 @@ * was not required while the current request) * @since 1.9.1 */ - protected void onCloseTransaction(TopiaContext transaction) { + protected void onCloseTransaction(TopiaPersistenceContext transaction) { if (transaction == null) { if (log.isTraceEnabled()) { log.trace("no transaction to close"); @@ -271,21 +272,17 @@ if (log.isDebugEnabled()) { log.debug("closing transaction " + transaction); } - try { - // let's rollback transaction if the transaction was not rollbacked nor committed - // as the topia context close context does not affect hibernate transaction - // so if something bad happen then we will always have a - Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); - if (!tx.wasCommitted() && !tx.wasRolledBack()) { - if (log.isDebugEnabled()) { - log.debug("rollback transaction!"); - } - tx.rollback(); + // let's rollback transaction if the transaction was not rollbacked nor committed + // as the topia context close context does not affect hibernate transaction + // so if something bad happen then we will always have a + Transaction tx = ((AbstractTopiaPersistenceContext) transaction).getHibernateSupport().getHibernateSession().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); } - transaction.closeContext(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + tx.rollback(); } + transaction.closeContext(); } } @@ -335,14 +332,14 @@ if (methods.contains("getClass")) { - return TopiaContext.class; + return TopiaPersistenceContext.class; } return null; } /** - * Handler of a proxy on a {@link TopiaContext}. + * Handler of a proxy on a {@link TopiaPersistenceContext}. * * @see #excludeMethods */ @@ -352,7 +349,7 @@ protected final ServletRequest request; /** Target to use for the proxy. */ - protected TopiaContext transaction; + protected TopiaPersistenceContext transaction; protected TopiaTransactionProxyInvocationHandler(ServletRequest request) { this.request = request; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-14 08:51:31 UTC (rev 276) +++ trunk/pom.xml 2013-11-27 16:20:15 UTC (rev 277) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.3</version> </parent> <groupId>org.nuiton.web</groupId> @@ -92,7 +92,7 @@ <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> - <version>0.9</version> + <version>1.0</version> <exclusions> <exclusion> <groupId>jdom</groupId> @@ -133,7 +133,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonConfigVersion}</version> </dependency>  @@ -265,14 +265,17 @@  <projectId>nuiton-web</projectId> - <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> + <eugeneVersion>2.7.3</eugeneVersion> + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.8-rc-1</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion>  - <tapestryVersion>5.2.4</tapestryVersion> + <tapestryVersion>5.2.4</tapestryVersion>  <slf4jVersion>1.7.5</slf4jVersion>  @@ -280,9 +283,9 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.14</struts2Version> + <struts2Version>2.3.15.3</struts2Version> - <shiroVersion>1.2.1</shiroVersion> + <shiroVersion>1.2.2</shiroVersion> <servletApiVersion>2.5</servletApiVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <windstoneVersion>0.9.10-hudson-24</windstoneVersion> @@ -326,7 +329,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>2.6.1</version> + <version>${eugeneVersion}</version> </plugin> </plugins> </pluginManagement>

1 0

r276 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by bleny＠users.nuiton.org 14 Oct '13

14 Oct '13

Author: bleny Date: 2013-10-14 10:51:31 +0200 (Mon, 14 Oct 2013) New Revision: 276 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/276 Log: fix typos in I18nTextProvider javadoc Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2013-08-09 09:03:45 UTC (rev 275) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2013-10-14 08:51:31 UTC (rev 276) @@ -39,7 +39,7 @@ /** * Struts2's TextProvider implementation using nuiton's i18n. * - * To use this text provider add the two following lines in your strust.xml : + * To use this text provider add the two following lines in your struts.xml : * <pre> * <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider" /> <constant name="struts.xworkTextProvider" value="i18nTextProvider" />

1 0

r275 - in trunk: . nuiton-security
by tchemit＠users.nuiton.org 09 Aug '13

09 Aug '13

Author: tchemit Date: 2013-08-09 11:03:45 +0200 (Fri, 09 Aug 2013) New Revision: 275 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/275 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/nuiton-security/pom.xml trunk/pom.xml Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-02 14:32:57 UTC (rev 274) +++ trunk/pom.xml 2013-08-09 09:03:45 UTC (rev 275) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.11</version> + <version>4.0</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r274 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 02 Jul '13

02 Jul '13

Author: maven-release Date: 2013-07-02 16:32:57 +0200 (Tue, 02 Jul 2013) New Revision: 274 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/274 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-07-02 14:32:53 UTC (rev 273) +++ trunk/nuiton-gwt/pom.xml 2013-07-02 14:32:57 UTC (rev 274) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-07-02 14:32:53 UTC (rev 273) +++ trunk/nuiton-rss/pom.xml 2013-07-02 14:32:57 UTC (rev 274) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-07-02 14:32:53 UTC (rev 273) +++ trunk/nuiton-struts2/pom.xml 2013-07-02 14:32:57 UTC (rev 274) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-07-02 14:32:53 UTC (rev 273) +++ trunk/nuiton-tapestry/pom.xml 2013-07-02 14:32:57 UTC (rev 274) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-07-02 14:32:53 UTC (rev 273) +++ trunk/nuiton-web/pom.xml 2013-07-02 14:32:57 UTC (rev 274) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-02 14:32:53 UTC (rev 273) +++ trunk/pom.xml 2013-07-02 14:32:57 UTC (rev 274) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14</version> + <version>1.15-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.14</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.14 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r273 - in tags: . nuiton-web-1.14
by maven-release＠users.nuiton.org 02 Jul '13

02 Jul '13

Author: maven-release Date: 2013-07-02 16:32:53 +0200 (Tue, 02 Jul 2013) New Revision: 273 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/273 Log: [maven-release-plugin] copy for tag nuiton-web-1.14 Added: tags/nuiton-web-1.14/ Property changes on: tags/nuiton-web-1.14 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r272 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 02 Jul '13

02 Jul '13

Author: maven-release Date: 2013-07-02 16:32:49 +0200 (Tue, 02 Jul 2013) New Revision: 272 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/272 Log: [maven-release-plugin] prepare release nuiton-web-1.14 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-07-02 14:31:28 UTC (rev 271) +++ trunk/nuiton-gwt/pom.xml 2013-07-02 14:32:49 UTC (rev 272) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14-SNAPSHOT</version> + <version>1.14</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-07-02 14:31:28 UTC (rev 271) +++ trunk/nuiton-rss/pom.xml 2013-07-02 14:32:49 UTC (rev 272) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14-SNAPSHOT</version> + <version>1.14</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-07-02 14:31:28 UTC (rev 271) +++ trunk/nuiton-struts2/pom.xml 2013-07-02 14:32:49 UTC (rev 272) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14-SNAPSHOT</version> + <version>1.14</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-07-02 14:31:28 UTC (rev 271) +++ trunk/nuiton-tapestry/pom.xml 2013-07-02 14:32:49 UTC (rev 272) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14-SNAPSHOT</version> + <version>1.14</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-07-02 14:31:28 UTC (rev 271) +++ trunk/nuiton-web/pom.xml 2013-07-02 14:32:49 UTC (rev 272) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14-SNAPSHOT</version> + <version>1.14</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-02 14:31:28 UTC (rev 271) +++ trunk/pom.xml 2013-07-02 14:32:49 UTC (rev 272) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.14-SNAPSHOT</version> + <version>1.14</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.14</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.14 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r271 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by echatellier＠users.nuiton.org 02 Jul '13

02 Jul '13

Author: echatellier Date: 2013-07-02 16:31:28 +0200 (Tue, 02 Jul 2013) New Revision: 271 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/271 Log: Remove guava dependency Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2013-06-19 14:05:02 UTC (rev 270) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2013-07-02 14:31:28 UTC (rev 271) @@ -30,7 +30,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.util.StrutsTypeConverter; -import com.google.common.base.Strings; import com.opensymphony.xwork2.conversion.TypeConversionException; /** @@ -53,7 +52,7 @@ string = string.replace(",", "."); Double parsedValue; - if (Strings.isNullOrEmpty(string)) { + if (string == null || string.isEmpty()) { if (double.class.equals(aClass)) { parsedValue = 0.; } else {

1 0

r270 - in trunk: nuiton-security nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by athimel＠users.nuiton.org 19 Jun '13

19 Jun '13

Author: athimel Date: 2013-06-19 16:05:02 +0200 (Wed, 19 Jun 2013) New Revision: 270 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/270 Log: fixes #2721 Add 'double' converter in nuiton-struts2 Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java Modified: trunk/nuiton-security/ Property changes on: trunk/nuiton-security ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.iml Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2013-06-19 14:05:02 UTC (rev 270) @@ -0,0 +1,85 @@ +package org.nuiton.web.struts2.converters; + +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import java.util.Arrays; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.apache.struts2.util.StrutsTypeConverter; + +import com.google.common.base.Strings; +import com.opensymphony.xwork2.conversion.TypeConversionException; + +/** + * Let user input either "0.1" or "0,1" as a double value. To use this converter, add the following lines in your + * <code>classpath:xwork-conversion.properties</code> file : + * + * <pre> + * java.lang.Double=org.nuiton.web.struts2.converters.DoubleConverter + * double=org.nuiton.web.struts2.converters.DoubleConverter + * </pre> + * + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class DoubleConverter extends StrutsTypeConverter { + + @Override + public Object convertFromString(Map map, String[] strings, Class aClass) { + if (strings.length == 1) { + String string = strings[0]; + string = string.replace(",", "."); + + Double parsedValue; + if (Strings.isNullOrEmpty(string)) { + if (double.class.equals(aClass)) { + parsedValue = 0.; + } else { + parsedValue = null; + } + } else { + parsedValue = Double.parseDouble(string); + } + return parsedValue; + } else { + throw new TypeConversionException("strings=" + Arrays.toString(strings)); + } + } + + @Override + public String convertToString(Map map, Object o) { + Double d = (Double) o; + + String string; + if (d == null) { + string = StringUtils.EMPTY; + } else { + string = d.toString(); + } + + return string; + } + +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r269 - trunk
by tchemit＠users.nuiton.org 26 May '13

26 May '13

Author: tchemit Date: 2013-05-26 08:53:22 +0200 (Sun, 26 May 2013) New Revision: 269 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/269 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 09:05:57 UTC (rev 268) +++ trunk/pom.xml 2013-05-26 06:53:22 UTC (rev 269) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.10</version> + <version>3.4.11</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r268 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 30 Apr '13

30 Apr '13

Author: maven-release Date: 2013-04-30 11:05:57 +0200 (Tue, 30 Apr 2013) New Revision: 268 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/268 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-gwt/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-rss/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-struts2/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-tapestry/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-web/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.13</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.13 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r267 - in tags: . nuiton-web-1.13
by maven-release＠users.nuiton.org 30 Apr '13

30 Apr '13

Author: maven-release Date: 2013-04-30 11:05:55 +0200 (Tue, 30 Apr 2013) New Revision: 267 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/267 Log: [maven-release-plugin] copy for tag nuiton-web-1.13 Added: tags/nuiton-web-1.13/ Property changes on: tags/nuiton-web-1.13 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r266 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 30 Apr '13

30 Apr '13

Author: maven-release Date: 2013-04-30 11:05:53 +0200 (Tue, 30 Apr 2013) New Revision: 266 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/266 Log: [maven-release-plugin] prepare release nuiton-web-1.13 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-gwt/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-rss/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-struts2/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-tapestry/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-web/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.13</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.13 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r265 - in trunk: nuiton-security nuiton-security/src/license nuiton-security/src/main/java/org/nuiton/web/security nuiton-security/src/main/java/org/nuiton/web/security/actions nuiton-security/src/main/resources nuiton-security/src/main/resources/WEB-INF/security nuiton-security/src/main/resources/i18n nuiton-security/src/main/xmi nuiton-security/src/site nuiton-security/src/site/apt nuiton-security/src/site/resources/img nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib nuiton
by tchemit＠users.nuiton.org 30 Apr '13

30 Apr '13

Author: tchemit Date: 2013-04-30 11:03:49 +0200 (Tue, 30 Apr 2013) New Revision: 265 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/265 Log: - add missing svn properties - fix license headers Modified: trunk/nuiton-security/LICENSE.txt trunk/nuiton-security/README.txt trunk/nuiton-security/changelog.txt trunk/nuiton-security/pom.xml trunk/nuiton-security/src/license/THIRD-PARTY.properties trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties trunk/nuiton-security/src/main/resources/struts.xml trunk/nuiton-security/src/main/xmi/security.properties trunk/nuiton-security/src/main/xmi/security.zargo trunk/nuiton-security/src/site/apt/index.apt trunk/nuiton-security/src/site/resources/img/permissions.png trunk/nuiton-security/src/site/resources/img/roles.png trunk/nuiton-security/src/site/site.xml trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java Property changes on: trunk/nuiton-security/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-security/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/struts.xml =================================================================== --- trunk/nuiton-security/src/main/resources/struts.xml 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/struts.xml 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <!-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/xmi/security.properties =================================================================== --- trunk/nuiton-security/src/main/xmi/security.properties 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/xmi/security.properties 2013-04-30 09:03:49 UTC (rev 265) @@ -1,8 +1,8 @@ ### # #%L # Nuiton Web :: Nuiton Security -# $Id:$ -# $HeadURL:$ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2012 CodeLutin, Chatellier Eric # %% Property changes on: trunk/nuiton-security/src/main/xmi/security.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/xmi/security.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/site/apt/index.apt =================================================================== --- trunk/nuiton-security/src/site/apt/index.apt 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/site/apt/index.apt 2013-04-30 09:03:49 UTC (rev 265) @@ -2,8 +2,8 @@ ~~ #%L ~~ Nuiton Web :: Nuiton Security ~~ -~~ $Id: index.apt 152 2011-12-01 17:16:59Z athimel $ -~~ $HeadURL: http://svn.nuiton.org/svn/nuiton-web/trunk/nuiton-struts2/src/site/apt/inde… $ +~~ $Id$ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2012 CodeLutin, Chatellier Eric ~~ %% Property changes on: trunk/nuiton-security/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/site/resources/img/permissions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-security/src/site/resources/img/roles.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/site/site.xml =================================================================== (Binary files differ) Property changes on: trunk/nuiton-security/src/site/site.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java 2013-04-30 09:03:49 UTC (rev 265) @@ -23,7 +23,7 @@ * #L% */ /* - * $Id: FieldError.java 805635 2009-08-19 00:18:54Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java 2013-04-30 09:03:49 UTC (rev 265) @@ -23,7 +23,7 @@ * #L% */ /* - * $Id: FieldErrorTag.java 805635 2009-08-19 00:18:54Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-04-30 09:03:49 UTC (rev 265) @@ -3,8 +3,8 @@ /* * #%L * Nuiton Web :: Nuiton Web - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r264 - in trunk: . nuiton-web/src/site/apt
by tchemit＠users.nuiton.org 30 Apr '13

30 Apr '13

Author: tchemit Date: 2013-04-30 10:53:32 +0200 (Tue, 30 Apr 2013) New Revision: 264 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/264 Log: fixes #2680: Updates struts2 to 2.3.14 refs #2675: Customize JettyLauncher port and contextPath Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm trunk/pom.xml Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2013-04-29 18:54:33 UTC (rev 263) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2013-04-30 08:53:32 UTC (rev 264) @@ -108,6 +108,20 @@ </plugin> -------------------------------------------------------------------- +** Extra configuration + + You can since version 1.13 configure the port and the contextPath when + starting the executable war. + + To change the port, use the <<--port>> option and to change the + contextPath use the <<--path>> option. + + In next example we change both: + +-------------------------------------------------------------------- +java -jar mywar.war --port 8889 --contextPath /mycontextPath +-------------------------------------------------------------------- + * Use Winstone war launcher ** Maven configuration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 18:54:33 UTC (rev 263) +++ trunk/pom.xml 2013-04-30 08:53:32 UTC (rev 264) @@ -280,7 +280,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.12</struts2Version> + <struts2Version>2.3.14</struts2Version> <shiroVersion>1.2.1</shiroVersion> <servletApiVersion>2.5</servletApiVersion>

1 0

r263 - trunk
by tchemit＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: tchemit Date: 2013-04-29 20:54:33 +0200 (Mon, 29 Apr 2013) New Revision: 263 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/263 Log: fixes #2676: Updates nuiton-utils to 2.6.12 fixes #2677: Updates slf4j to 1.7.5 fixes #2678: Updates ToPIA to 2.8-rc-1 fixes #2679: Updates mavenpom to 3.4.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 18:51:54 UTC (rev 262) +++ trunk/pom.xml 2013-04-29 18:54:33 UTC (rev 263) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.8</version> + <version>3.4.10</version> </parent> <groupId>org.nuiton.web</groupId> @@ -266,14 +266,14 @@ <projectId>nuiton-web</projectId> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.7.1</topiaVersion> + <topiaVersion>2.8-rc-1</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> - <slf4jVersion>1.7.3</slf4jVersion> + <slf4jVersion>1.7.5</slf4jVersion>  <gwtVersion>2.2.0</gwtVersion>

1 0

r262 - trunk/nuiton-web/src/main/java/org/nuiton/web/war
by tchemit＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: tchemit Date: 2013-04-29 20:51:54 +0200 (Mon, 29 Apr 2013) New Revision: 262 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/262 Log: fixes #2675: Customize JettyLauncher port and contextPath Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java 2013-04-29 13:05:12 UTC (rev 261) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java 2013-04-29 18:51:54 UTC (rev 262) @@ -57,12 +57,11 @@ /** * War main class launcher (jetty based). - * + * <p/> * To use it : - * java -jar app-xxx.war - * + * java -jar app-xxx.war + * * @author chatellier - * @version $Id$ * @since 1.0 */ public class JettyLauncher implements ActionListener, MouseListener { @@ -76,26 +75,34 @@ /** Default port. */ protected int port = 8888; + /** + * Default context path. + * + * @since 1.13 + */ + protected String contextPath = "/"; + /** Server name. */ protected String serverName; - + /** * Main method (used by war in manifest). - * + * * @param args args * @throws Exception */ - public static void main(String[] args) throws Exception { + public static void main(String... args) throws Exception { JettyLauncher launcher = new JettyLauncher(); + launcher.configure(args); launcher.readInformation(); - launcher.startServer(args); + launcher.startServer(); launcher.installSystemTray(); launcher.openBrowser(); } /** * Parse WEB-INF/web.xml file and get server display name. - * + * * @since 1.1.3 */ protected void readInformation() { @@ -120,9 +127,9 @@ /** * Read input stream as string. - * + * <p/> * Code from commons io. - * + * * @param stream stream to read * @return content as string * @since 1.1.3 @@ -142,13 +149,26 @@ return sw.toString(); } + protected void configure(String... args) throws Exception { + + for (int i = 0; i < args.length; i++) { + if ("--port".equals(args[i])) + port = Integer.parseInt(args[++i]); + else if ("--path".equals(args[i])) { + contextPath = args[++i]; + if (!contextPath.startsWith("/")) { + contextPath = "/" + contextPath; + } + } + } + } + /** * Launch servlet container. - * - * @param args args + * * @throws Exception */ - protected void startServer(String[] args) throws Exception { + protected void startServer() throws Exception { System.out.println("Starting server embedded mode..."); String fqnLauncherFile = JettyLauncher.class.getName().replaceAll("\\.", "/") + ".class"; @@ -168,10 +188,10 @@ jettyServer.setConnectors(new Connector[]{connector}); WebAppContext webappcontext = new WebAppContext(); - webappcontext.setContextPath("/"); + webappcontext.setContextPath(contextPath); webappcontext.setWar(me.getAbsolutePath()); - HandlerCollection handlers= new HandlerCollection(); + HandlerCollection handlers = new HandlerCollection(); handlers.setHandlers(new Handler[]{webappcontext, new DefaultHandler()}); jettyServer.setHandler(handlers); @@ -179,15 +199,13 @@ // build server uri try { - serverUri = new URI("http://localhost:" + port); + serverUri = new URI("http://localhost:" + port + contextPath); } catch (URISyntaxException e) { e.printStackTrace(); } } - /** - * Shutdown server. - */ + /** Shutdown server. */ protected void stopServer() { if (jettyServer != null) { try { @@ -199,9 +217,7 @@ } } - /** - * Install system tray to stop server. - */ + /** Install system tray to stop server. */ protected void installSystemTray() { if (SystemTray.isSupported()) { // build menu @@ -251,8 +267,8 @@ /** * Open browser. - * - * @throws IOException + * + * @throws IOException */ protected void openBrowser() { if (Desktop.isDesktopSupported() && serverUri != null) {

1 0

r261 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 15:05:12 +0200 (Mon, 29 Apr 2013) New Revision: 261 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/261 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-gwt/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-rss/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-struts2/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-tapestry/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/nuiton-web/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 13:05:10 UTC (rev 260) +++ trunk/pom.xml 2013-04-29 13:05:12 UTC (rev 261) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.13-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r260 - in tags: . nuiton-web-1.12
by maven-release＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 15:05:10 +0200 (Mon, 29 Apr 2013) New Revision: 260 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/260 Log: [maven-release-plugin] copy for tag nuiton-web-1.12 Added: tags/nuiton-web-1.12/ Property changes on: tags/nuiton-web-1.12 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r259 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: maven-release Date: 2013-04-29 15:05:08 +0200 (Mon, 29 Apr 2013) New Revision: 259 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/259 Log: [maven-release-plugin] prepare release nuiton-web-1.12 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-gwt/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-rss/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-struts2/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-tapestry/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/nuiton-web/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-22 11:16:53 UTC (rev 258) +++ trunk/pom.xml 2013-04-29 13:05:08 UTC (rev 259) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r258 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org 22 Mar '13

22 Mar '13

Author: bleny Date: 2013-03-22 12:16:53 +0100 (Fri, 22 Mar 2013) New Revision: 258 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/258 Log: refs #2593 Introduce JpaTransactionFilter: getTransaction() must not be called without saving reference, let DAO layer deal with it Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-20 14:33:52 UTC (rev 257) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-22 11:16:53 UTC (rev 258) @@ -360,8 +360,6 @@ // first time entityManager is required, create its entityManager = createEntityManager(request); - entityManager.getTransaction().begin(); - if (log.isDebugEnabled()) { log.debug("created entityManager " + entityManager); }

1 0

r257 - in trunk/nuiton-security/src/main: java/org/nuiton/web/security java/org/nuiton/web/security/actions resources
by echatellier＠users.nuiton.org 20 Mar '13

20 Mar '13

Author: echatellier Date: 2013-03-20 15:33:52 +0100 (Wed, 20 Mar 2013) New Revision: 257 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/257 Log: fixes #2618: Redirect user to referer page if user ask for login page by himself fixes #2617: Cache user shiro autorization Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/resources/struts.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-20 14:33:52 UTC (rev 257) @@ -66,9 +66,9 @@ public static final String ROOT_CONTEXT_CONTEXT = SecurityShiroFilter.class.getName() + "#" + TopiaContext.class.getName(); public static final String ANON_LOGIN = "anonymous"; - - public static final String SESSION_SAVED_URL = "savedUrl"; + public static final String SESSION_REQUESTED_URL = "securityRequestedUrl"; + protected ApplicationConfig config; protected TopiaContext rootContext; @@ -138,14 +138,20 @@ } // to have permission, a user must be authenticated - if (!subjectUser.isAuthenticated()) { + // can't use !subjectUser.isAuthenticated() here (for cache purpose) + if (subjectUser.getPrincipal() == null) { subjectUser.login(new UsernamePasswordToken(ANON_LOGIN, "")); } + // configuration + String loginUrl = config.getOption("topia.security.loginurl"); + // get permission from requested uri without context path HttpServletRequest httpServletRequest = ((HttpServletRequest)servletRequest); String contextPath = httpServletRequest.getContextPath(); String uri = httpServletRequest.getRequestURI(); + // removing jsession id from url + uri = uri.replaceFirst(";(jsessionid|JSESSIONID)=[\\w-]*", ""); if (uri.startsWith(contextPath)) { uri = uri.substring(contextPath.length()); } @@ -160,13 +166,22 @@ // dans ca cas, il faut sauvegarder la page d'avant comme url // de retour (seulement s'il n'y a pas deja une valeur de retour) Session session = subjectUser.getSession(); - if (uri.equals(config.getOption("topia.security.loginurl"))) { - if (session.getAttribute(SESSION_SAVED_URL) == null) { - String referrer = httpServletRequest.getHeader("referer"); - session.setAttribute(SESSION_SAVED_URL, referrer); + if (uri.equals(loginUrl)) { + // il ne faut pas ecraser l'url intercepter lors + // de la redirection vers la page de login + if (session.getAttribute(SESSION_REQUESTED_URL) == null) { + String referer = httpServletRequest.getHeader("referer"); + if (referer != null) { + // removing jsession id from url + referer = referer.replaceFirst(";(jsessionid|JSESSIONID)=[\\w-]*", ""); + if (!referer.endsWith(loginUrl)) { + if (log.isDebugEnabled()) { + log.debug("Remembering referer as " + referer); + } + session.setAttribute(SESSION_REQUESTED_URL, referer); + } + } } - } else { - session.removeAttribute(SESSION_SAVED_URL); } // on devrait appeler simplement super.doFilterInternal(servletRequest, servletResponse, chain); @@ -187,8 +202,9 @@ if (log.isDebugEnabled()) { log.debug("User is NOT permitted to access " + perm); } - // anon n'est pas considéré comme authenticated - if (ANON_LOGIN.equals(subjectUser.getPrincipal())) { + if (subjectUser.isAuthenticated()) { + ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); + } else { if (log.isDebugEnabled()) { log.debug("Redirecting user to login page"); } @@ -198,11 +214,9 @@ if (httpServletRequest.getQueryString() != null) { requestURL.append('?').append(httpServletRequest.getQueryString()); } - session.setAttribute(SESSION_SAVED_URL, requestURL.toString()); + session.setAttribute(SESSION_REQUESTED_URL, requestURL.toString()); String redirect = contextPath + config.getOption("topia.security.loginurl"); ((HttpServletResponse)servletResponse).sendRedirect(redirect); - } else { - ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); } } } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-20 14:33:52 UTC (rev 257) @@ -24,6 +24,8 @@ package org.nuiton.web.security; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; import org.apache.commons.lang3.StringUtils; @@ -42,8 +44,8 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.util.StringUtil; import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; /** @@ -59,10 +61,13 @@ protected ApplicationConfig config; + /** Authorization cache (invalidated at login). */ + protected transient Map<String, SimpleAuthorizationInfo> authorizationCache; + public TopiaSecurityRealm(TopiaContext rootContext, ApplicationConfig config) { this.rootContext = rootContext; this.config = config; - + authorizationCache = new HashMap<String, SimpleAuthorizationInfo>(); setCredentialsMatcher(this); } @@ -79,42 +84,43 @@ @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - SimpleAuthorizationInfo result = null; - - Properties props = config.getFlatOptions(); - TopiaContext transaction = null; - try { - String login = (String) principals.getPrimaryPrincipal(); - transaction = rootContext.beginTransaction(); - SecurityUserDAO securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); - - if (log.isDebugEnabled()) { - log.debug("Build autorisation list for user : " + login); - } - - SecurityUser securityUser = securityUserDAO.findByLogin(login); - result = new SimpleAuthorizationInfo(); - for (SecurityRole role : securityUser.getSecurityRole()) { - for (String permission : role.getPermissions()) { - //result.addStringPermission(permission); - if (log.isDebugEnabled()) { - log.debug("- add permission : " + permission); - } - - for (String prop : props.stringPropertyNames()) { - if (prop.startsWith("topia.security.permission.")) { - String endProp = StringUtils.removeStart(prop, "topia.security.permission."); - String[] subs = endProp.split("\\."); - if (subs.length == 3) { - if (subs[2].equals("perm")) { - if (subs[1].equals(permission)) { - String perms = props.getProperty(prop); - // use ; separator because shiro use , - String[] permTab = perms.split("\\s*\\;\\s*"); - for (String perm : permTab) { - result.addStringPermission(perm); - if (log.isDebugEnabled()) { - log.debug(" string permission : " + perm); + String login = (String) principals.getPrimaryPrincipal(); + SimpleAuthorizationInfo result = authorizationCache.get(login); + if (result == null) { + Properties props = config.getFlatOptions(); + TopiaContext transaction = null; + try { + transaction = rootContext.beginTransaction(); + SecurityUserDAO securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + + if (log.isDebugEnabled()) { + log.debug("Build autorisation list for user : " + login); + } + + SecurityUser securityUser = securityUserDAO.findByLogin(login); + result = new SimpleAuthorizationInfo(); + for (SecurityRole role : securityUser.getSecurityRole()) { + for (String permission : role.getPermissions()) { + //result.addStringPermission(permission); + if (log.isDebugEnabled()) { + log.debug("- add permission : " + permission); + } + + for (String prop : props.stringPropertyNames()) { + if (prop.startsWith("topia.security.permission.")) { + String endProp = StringUtils.removeStart(prop, "topia.security.permission."); + String[] subs = endProp.split("\\."); + if (subs.length == 3) { + if (subs[2].equals("perm")) { + if (subs[1].equals(permission)) { + String perms = props.getProperty(prop); + // use ; separator because shiro use , + String[] permTab = perms.split("\\s*\\;\\s*"); + for (String perm : permTab) { + result.addStringPermission(perm); + if (log.isDebugEnabled()) { + log.debug(" string permission : " + perm); + } } } } @@ -123,40 +129,47 @@ } } } - } + + // si seul l'utilisateur anon existe + // on lui offre une promotion + if (login.equals(SecurityShiroFilter.ANON_LOGIN) && securityUserDAO.count() == 1) { + result.addStringPermission("*"); + if (log.isDebugEnabled()) { + log.debug("Grant all rigth (*) because no user exists"); + } + } + + // si la securité est desactivee, + if (config.getOptionAsBoolean("topia.security.disable")) { + result.addStringPermission("*"); + } + + // ajout de l'url de login et logout quand meme !!! + result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.loginurl"), + config.getOption("topia.security.separators"))); + result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.logouturl"), + config.getOption("topia.security.separators"))); - // si seul l'utilisateur anon existe - // on lui offre une promotion - if (login.equals(SecurityShiroFilter.ANON_LOGIN) && securityUserDAO.count() == 1) { - result.addStringPermission("*"); - if (log.isDebugEnabled()) { - log.debug("Grant all rigth (*) because no user exists"); + // cache authorization + authorizationCache.put(login, result); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't get user permission", ex); } + } finally { + if (transaction != null) { + try { + transaction.closeContext(); + } catch (TopiaException ex) { + throw new TopiaRuntimeException(ex); + } + } } - - // si la securité est desactivee, - if (config.getOptionAsBoolean("topia.security.disable")) { - result.addStringPermission("*"); + } else { + if (log.isTraceEnabled()) { + log.trace("Using autorisation from cache for " + login); } - - // ajout de l'url de login et logout quand meme !!! - result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.loginurl"), - config.getOption("topia.security.separators"))); - result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.logouturl"), - config.getOption("topia.security.separators"))); - - } catch (Exception ex) { - - } finally { - if (transaction != null) { - try { - transaction.closeContext(); - } catch (TopiaException ex) { - throw new TopiaRuntimeException(ex); - } - } } - return result; } @@ -186,6 +199,9 @@ result = new SimpleAuthenticationInfo(securityUser.getLogin(), securityUser.getPassword(), getName()); } + + // invalidate cache for login + authorizationCache.remove(login); } } catch (TopiaException ex) { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2013-03-20 14:33:52 UTC (rev 257) @@ -26,9 +26,6 @@ import static org.nuiton.i18n.I18n._; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.SecurityUtils; @@ -40,11 +37,9 @@ import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; -import org.apache.struts2.interceptor.ServletRequestAware; -import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.web.security.SecurityShiroFilter; -public class LoginAction extends AbstractAction implements ServletRequestAware, ServletResponseAware { +public class LoginAction extends AbstractAction { private static final Log log = LogFactory.getLog(LoginAction.class); @@ -55,19 +50,8 @@ protected String password; - protected HttpServletRequest request; - protected HttpServletResponse response; + protected String savedUrl; - @Override - public void setServletRequest(HttpServletRequest request) { - this.request = request; - } - - @Override - public void setServletResponse(HttpServletResponse response) { - this.response = response; - } - public void setLogin(String login) { this.login = login; } @@ -78,7 +62,7 @@ @Override public String execute() throws Exception { - String result = null; + String result = SUCCESS; if (login == null || password == null) { result = input(); @@ -87,18 +71,19 @@ Subject currentUser = SecurityUtils.getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(login, password); currentUser.login(token); - result = SUCCESS; - + // marche pas :( //SavedRequest savedRequest = WebUtils.getAndClearSavedRequest(request); Session session = currentUser.getSession(); - String requestURL = (String)session.getAttribute(SecurityShiroFilter.SESSION_SAVED_URL); - if (request != null) { // can be + savedUrl = (String)session.getAttribute(SecurityShiroFilter.SESSION_REQUESTED_URL); + if (savedUrl != null) { // can be if (log.isDebugEnabled()) { - log.debug("Redirecting to saved url " + requestURL); + log.debug("Redirecting to saved url " + savedUrl); } - session.removeAttribute(SecurityShiroFilter.SESSION_SAVED_URL); - response.sendRedirect(requestURL); + session.removeAttribute(SecurityShiroFilter.SESSION_REQUESTED_URL); + result = "redirect"; + } else { + result = SUCCESS; } } catch (UnknownAccountException ex) { addActionError(_("Identifiant ou mot de passe invalide !")); @@ -125,4 +110,8 @@ return result; } + public String getSavedUrl() { + return savedUrl; + } + } Modified: trunk/nuiton-security/src/main/resources/struts.xml =================================================================== --- trunk/nuiton-security/src/main/resources/struts.xml 2013-03-19 17:14:04 UTC (rev 256) +++ trunk/nuiton-security/src/main/resources/struts.xml 2013-03-20 14:33:52 UTC (rev 257) @@ -58,6 +58,7 @@ <result name="success" type="redirectAction"> <param name="actionName">user-roles</param> </result> + <result name="redirect" type="redirect">${savedUrl}</result> </action> <action name="logout" class="org.nuiton.web.security.actions.LogoutAction"> <result name="success" type="redirectAction">

1 0

r256 - in trunk/nuiton-security/src/main: java/org/nuiton/web/security resources resources/WEB-INF/security
by echatellier＠users.nuiton.org 19 Mar '13

19 Mar '13

Author: echatellier Date: 2013-03-19 18:14:04 +0100 (Tue, 19 Mar 2013) New Revision: 256 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/256 Log: Correction de l'?\195?\169tat 'connect?\195?\169' de l'utilisateur annonyme. Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp trunk/nuiton-security/src/main/resources/struts.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -52,6 +52,11 @@ import org.nuiton.util.config.ApplicationConfig; import org.nuiton.web.SecurityDAOHelper; +/** + * Servlet filter used to filter requested url. + * + * @author Eric Chatellier + */ public class SecurityShiroFilter extends AbstractShiroFilter { private static final Log log = LogFactory.getLog(SecurityShiroFilter.class); @@ -151,6 +156,19 @@ log.debug("User is permitted to access " + perm); } + // on peu demander explicitement la page de login + // dans ca cas, il faut sauvegarder la page d'avant comme url + // de retour (seulement s'il n'y a pas deja une valeur de retour) + Session session = subjectUser.getSession(); + if (uri.equals(config.getOption("topia.security.loginurl"))) { + if (session.getAttribute(SESSION_SAVED_URL) == null) { + String referrer = httpServletRequest.getHeader("referer"); + session.setAttribute(SESSION_SAVED_URL, referrer); + } + } else { + session.removeAttribute(SESSION_SAVED_URL); + } + // on devrait appeler simplement super.doFilterInternal(servletRequest, servletResponse, chain); // mais on ne peut pas car il recreer un nouveau Subject // et n'utilise pas le notre :( Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -34,8 +34,12 @@ import org.apache.shiro.subject.SubjectContext; import org.apache.shiro.web.mgt.DefaultWebSubjectFactory; import org.apache.shiro.web.subject.WebSubjectContext; -import org.apache.shiro.web.subject.support.WebDelegatingSubject; +/** + * Redefine subject factory method to instanciate {@link TopiaWebSubject}. + * + * @author Eric Chatellier + */ public class SecuritySubjectFactory extends DefaultWebSubjectFactory { @Override @@ -50,16 +54,11 @@ PrincipalCollection principals = wsc.resolvePrincipals(); boolean authenticated = wsc.resolveAuthenticated(); - // dans le cas du module securité, on va dire que non - if (authenticated && SecurityShiroFilter.ANON_LOGIN.equals(principals.getPrimaryPrincipal())) { - authenticated = false; - } - String host = wsc.resolveHost(); ServletRequest request = wsc.resolveServletRequest(); ServletResponse response = wsc.resolveServletResponse(); - return new WebDelegatingSubject(principals, authenticated, host, session, sessionEnabled, + return new TopiaWebSubject(principals, authenticated, host, session, sessionEnabled, request, response, securityManager); } } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -24,6 +24,11 @@ package org.nuiton.web.security; +/** + * Security related utils method. + * + * @author Eric Chatellier + */ public class SecurityUtil { /** Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -46,6 +46,11 @@ import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; +/** + * Topia shiro realm finding user in database. + * + * @author Eric Chatellier + */ public class TopiaSecurityRealm extends AuthorizingRealm implements CredentialsMatcher { private static final Log log = LogFactory.getLog(TopiaSecurityRealm.class); Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java (rev 0) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java 2013-03-19 17:14:04 UTC (rev 256) @@ -0,0 +1,54 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.web.security; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.apache.shiro.mgt.SecurityManager; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.PrincipalCollection; +import org.apache.shiro.web.subject.support.WebDelegatingSubject; + +/** + * Classe redefinie pour surcharger la methode {@code isAuthenticated()} + * car la methode login() la passe obligatoirement a {@code true}. + * + * @author Eric Chatellier + */ +public class TopiaWebSubject extends WebDelegatingSubject { + + public TopiaWebSubject(PrincipalCollection principals, boolean authenticated, + String host, Session session, boolean sessionEnabled, + ServletRequest request, ServletResponse response, + SecurityManager securityManager) { + super(principals, authenticated, host, session, sessionEnabled, request, response, securityManager); + } + + @Override + public boolean isAuthenticated() { + boolean result = super.isAuthenticated() && !SecurityShiroFilter.ANON_LOGIN.equals(principals.getPrimaryPrincipal()); + return result; + } +} Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -42,21 +42,23 @@ <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> </s:iterator> <table class="security-table"> - <tr> - <td class="security-empty" /> - <s:iterator value="roles"> - <td><a href="<s:url action='role!input' namespace='/security'> - <s:param name="roleId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="name" /> - </a></td> - </s:iterator> - </tr> <s:iterator value="categories.keys" var="category"> <s:set name="categoryName" value="categories.get(#category)" /> <tr> <th colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></th> </tr> + + <tr class="security-roles"> + <td class="security-empty" /> + <s:iterator value="roles"> + <td><a href="<s:url action='role!input' namespace='/security'> + <s:param name="roleId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="name" /> + </a></td> + </s:iterator> + </tr> + <s:iterator value="categoryPermissions.get(#category)" var="categoryPermission"> <s:set name="permissionName" value="permissions.get(#categoryPermission)" /> <tr> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -39,13 +39,13 @@ <form action="<s:url action="user-roles" namespace="/security" />" method="post" class="security-form"> <table class="security-table"> <tr> - <td colspan="2" class="security-empty"/> + <td class="security-empty"/> <s:if test="!roles.empty"> <th colspan="<s:property value="roles.size()" />">Rôles</th> </s:if> </tr> <tr> - <td colspan="2" class="security-empty"/> + <th class="vertical">Utilisateurs</th> <s:iterator value="roles"> <td> <a href="<s:url action='role!input' namespace='/security'> @@ -59,9 +59,6 @@ <s:iterator value="users" var="user" status="userStatus"> <input type="hidden" name="userIds" value="<s:property value="topiaId" />" /> <tr> - <s:if test="#userStatus.first"> - <th rowspan="<s:property value="users.size()" />" class="vertical">Utilisateurs</th> - </s:if> <td> <s:if test="login == @org.nuiton.web.security.SecurityShiroFilter@ANON_LOGIN"> <s:property value="login" /> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Modified: trunk/nuiton-security/src/main/resources/struts.xml =================================================================== --- trunk/nuiton-security/src/main/resources/struts.xml 2013-03-18 10:55:58 UTC (rev 255) +++ trunk/nuiton-security/src/main/resources/struts.xml 2013-03-19 17:14:04 UTC (rev 256) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -27,7 +27,7 @@ <struts> <package name="org.nuiton.web.secu.actions" namespace="/security" extends="struts-default"> - <default-action-ref name="user-roles"/> + <default-action-ref name="user-roles"/> <action name="user-roles" class="org.nuiton.web.security.actions.UserRolesAction"> <result name="input">/WEB-INF/security/user-roles.jsp</result>

1 0

r255 - trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 11:55:58 +0100 (Mon, 18 Mar 2013) New Revision: 255 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/255 Log: Fix deprecated code Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2013-03-18 09:45:21 UTC (rev 254) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2013-03-18 10:55:58 UTC (rev 255) @@ -31,7 +31,7 @@ import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.util.ServletContextAware; import org.nuiton.topia.TopiaContext; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.web.security.SecurityShiroFilter; import com.opensymphony.xwork2.ActionSupport;

1 0

r254 - in trunk: . nuiton-security nuiton-security/src/main/java/org/nuiton/web/security nuiton-struts2
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 10:45:21 +0100 (Mon, 18 Mar 2013) New Revision: 254 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/254 Log: Fix dependencies and deprecated code Modified: trunk/nuiton-security/pom.xml trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-struts2/pom.xml trunk/pom.xml Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-03-18 09:45:21 UTC (rev 254) @@ -49,7 +49,7 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaUtil; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.web.SecurityDAOHelper; public class SecurityShiroFilter extends AbstractShiroFilter { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-03-18 09:45:21 UTC (rev 254) @@ -42,7 +42,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/nuiton-struts2/pom.xml 2013-03-18 09:45:21 UTC (rev 254) @@ -36,11 +36,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> @@ -56,11 +51,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 09:41:31 UTC (rev 253) +++ trunk/pom.xml 2013-03-18 09:45:21 UTC (rev 254) @@ -79,7 +79,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>${slf4jVersion}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency>  @@ -130,6 +130,11 @@ <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency>  <dependency>

1 0

r253 - trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 10:41:31 +0100 (Mon, 18 Mar 2013) New Revision: 253 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/253 Log: Fix deprecated code Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java 2013-03-18 09:37:08 UTC (rev 252) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java 2013-03-18 09:41:31 UTC (rev 253) @@ -24,16 +24,17 @@ */ package org.nuiton.web.struts2; -import com.opensymphony.xwork2.LocaleProvider; -import junit.framework.Assert; +import java.util.Arrays; +import java.util.Locale; + import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; -import java.util.Arrays; -import java.util.Locale; +import com.opensymphony.xwork2.LocaleProvider; public class I18nTextProviderTest {

1 0

r252 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 10:37:08 +0100 (Mon, 18 Mar 2013) New Revision: 252 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/252 Log: fixes #2611: Remove deprected FilterPagerUtil from nuiton-struts Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java 2013-03-18 09:34:18 UTC (rev 251) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/FilterPagerUtil.java 2013-03-18 09:37:08 UTC (rev 252) @@ -1,356 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.web.struts2; - -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.util.PagerUtil; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -/** - * Will me removed soon, do not use this class. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.9.2 - * @deprecated since 1.11, was moved in ToPIA project at org.nuiton.topia.persistence.TopiaFilterPagerUtil. - */ -@Deprecated -public class FilterPagerUtil extends PagerUtil { - - protected FilterPagerUtil() { - } - - public static TopiaQuery addPagerToQuery(TopiaQuery query, - FilterPagerBean pager) { - PagerUtil.computeRecordIndexesAndPagesNumber(pager); - query.setLimit(pager.getRecordStartIndex(), - pager.getRecordEndIndex() - 1); - - if (StringUtils.isNotEmpty(pager.getSortColumn())) { - if (pager.isSortAscendant()) { - query.addOrder(pager.getSortColumn()); - } else { - query.addOrderDesc(pager.getSortColumn()); - } - } - return query; - } - - public static <E> List<E> getPageFromList(List<E> elements, - FilterPagerBean pager) { - - PagerUtil.computeRecordIndexesAndPagesNumber(pager); - List<E> subList = getPage(elements, pager.getPageIndex(), pager.getPageSize()); - List<E> result = new ArrayList<E>(subList); - - return result; - } - - public static FilterPagerBean newFilterPagerBean() { - return new FilterPagerBean(); - } - - public static class FilterPagerBean extends PagerBean { - - private static final long serialVersionUID = 1L; - - // sorting order - asc or desc - protected boolean sortAscendant; - - // get index row - i.e. user click to sort. - protected String sortColumn; - - protected FilterOperationGroup groupOp; - - private List<FilterRule> rules; - - public boolean canFilter() { - return groupOp != null && CollectionUtils.isNotEmpty(rules); - } - - public FilterOperationGroup getGroupOp() { - return groupOp; - } - - public void setGroupOp(FilterOperationGroup groupOp) { - this.groupOp = groupOp; - } - - public List<FilterRule> getRules() { - return rules; - } - - public void setRules(List<FilterRule> rules) { - this.rules = rules; - } - - public boolean isSortAscendant() { - return sortAscendant; - } - - public void setSortAscendant(boolean sortAscendant) { - this.sortAscendant = sortAscendant; - } - - public String getSortColumn() { - return sortColumn; - } - - public void setSortColumn(String sortColumn) { - this.sortColumn = sortColumn; - } - } - - public static class FilterRule implements Serializable { - - private static final long serialVersionUID = 1L; - - protected final FilterOperation op; - - protected final String field; - - protected final String data; - - public FilterRule(FilterOperation op, - String field, - String data) { - this.op = op; - this.field = field; - this.data = data; - } - - public FilterOperation getOp() { - return op; - } - - public String getField() { - return field; - } - - public String getData() { - return data; - } - } - - public enum FilterOperationGroup { - OR, AND - } - - public enum FilterOperation { - /** Equals operator. */ - eq { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " = :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Not equals operator. */ - ne { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " != :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Contains operator. */ - cn { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " like :" + paramName; - filterParams.put(paramName, "%" + data + "%"); - return ruleFilter; - } - }, - /** Not contains operator. */ - nc { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " not like :" + paramName; - filterParams.put(paramName, "%" + data + "%"); - return ruleFilter; - } - }, - /** Begins with operator. */ - bw { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " like :" + paramName; - filterParams.put(paramName, data + "%"); - return ruleFilter; - } - }, - /** Not between with operator. */ - bn { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " not like :" + paramName; - filterParams.put(paramName, data + "%"); - return ruleFilter; - } - }, - /** Ends with operator. */ - ew { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " like :" + paramName; - filterParams.put(paramName, "%" + data); - return ruleFilter; - } - }, - /** Not End with operator. */ - en { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " not like :" + paramName; - filterParams.put(paramName, "%" + data); - return ruleFilter; - } - }, - /** Lesser than operator. */ - lt { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " < :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Lesser or equals operator. */ - le { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " <= :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Greater than operator. */ - gt { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " > :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Greater or equals operator. */ - ge { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " >= :" + paramName; - filterParams.put(paramName, data); - return ruleFilter; - } - }, - /** Is null operator. */ - nu { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " is null"; - return ruleFilter; - } - }, - /** Is not null operator. */ - nn { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - String ruleFilter = propertyName + " is not null"; - return ruleFilter; - } - }, - /** Is among operator. */ - in { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - throw new UnsupportedOperationException(); - } - }, - /** Not is among operator. */ - ni { - @Override - public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { - throw new UnsupportedOperationException(); - } - }; - - public abstract String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams); - } - - - public static FilterPagerBeanBuilder newFilterPagerBeanBuilder(String operationGroup) { - FilterOperationGroup operationGroup1 = FilterOperationGroup.valueOf(operationGroup); - FilterPagerBeanBuilder builder = new FilterPagerBeanBuilder(operationGroup1); - return builder; - } - - public static class FilterPagerBeanBuilder { - - protected final FilterOperationGroup groupOp; - - protected final List<FilterRule> rules; - - public FilterPagerBeanBuilder(FilterOperationGroup groupOp) { - this.groupOp = groupOp; - rules = new LinkedList<FilterRule>(); - } - - public FilterPagerBeanBuilder addOperations(Collection<Map<String, String>> operations) { - for (Map<String, String> operation : operations) { - addRule(operation); - } - return this; - } - - public FilterPagerBeanBuilder addRule(Map<String, String> ruleMap) { - String op = ruleMap.get("op"); - String property = ruleMap.get("field"); - String value = ruleMap.get("data"); - FilterOperation operator = FilterOperation.valueOf(op); - return addRule(new FilterRule(operator, property, value)); - } - - public FilterPagerBeanBuilder addRule(FilterRule rule) { - rules.add(rule); - return this; - } - - public void flush(FilterPagerBean bean) { - bean.setGroupOp(groupOp); - bean.setRules(rules); - } - - - } -}

1 0

r251 - trunk
by echatellier＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: echatellier Date: 2013-03-18 10:34:18 +0100 (Mon, 18 Mar 2013) New Revision: 251 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/251 Log: fixes #2606: Update to struts 2.3.12 fixes #2607: Update to slf4j 1.7.3 fixes #2608: Update to topia 2.7.1 fixes #2609: Update to nuiton-utils 2.6.11 fixes #2610: Update to eugene 2.6.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-14 15:29:53 UTC (rev 250) +++ trunk/pom.xml 2013-03-18 09:34:18 UTC (rev 251) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <version>3.4.8</version> </parent> <groupId>org.nuiton.web</groupId> @@ -261,21 +261,21 @@ <projectId>nuiton-web</projectId> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.7</topiaVersion> + <topiaVersion>2.7.1</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <slf4jVersion>1.7.3</slf4jVersion>  <gwtVersion>2.2.0</gwtVersion> <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.4.1</struts2Version> + <struts2Version>2.3.12</struts2Version> <shiroVersion>1.2.1</shiroVersion> <servletApiVersion>2.5</servletApiVersion> @@ -321,7 +321,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>2.5</version> + <version>2.6.1</version> </plugin> </plugins> </pluginManagement>

1 0

r250 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org 14 Mar '13

14 Mar '13

Author: bleny Date: 2013-03-14 16:29:53 +0100 (Thu, 14 Mar 2013) New Revision: 250 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/250 Log: file header for JpaTransactionFilter Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-14 15:26:30 UTC (rev 249) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-14 15:29:53 UTC (rev 250) @@ -1,11 +1,12 @@ +package org.nuiton.web.filter; + /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id: TopiaTransactionFilter.java 187 2012-02-20 11:49:09Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2/nuiton-web… $ + * $Id:$ + * $HeadURL:$ * %% - * Copyright (C) 2011 CodeLutin + * Copyright (C) 2011 - 2013 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.web.filter; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log;

1 0

r249 - in trunk: . nuiton-web nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org 14 Mar '13

14 Mar '13

Author: bleny Date: 2013-03-14 16:26:30 +0100 (Thu, 14 Mar 2013) New Revision: 249 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/249 Log: fixes #2593: Introduce JpaTransactionFilter Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java Modified: trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-03-14 15:06:26 UTC (rev 248) +++ trunk/nuiton-web/pom.xml 2013-03-14 15:26:30 UTC (rev 249) @@ -45,6 +45,11 @@ </dependency> <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-14 15:26:30 UTC (rev 249) @@ -0,0 +1,383 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id: TopiaTransactionFilter.java 187 2012-02-20 11:49:09Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2/nuiton-web… $ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.web.filter; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.persistence.EntityManager; +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 java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * <h2>Purpose of this filter</h2> + * This filter purpose is to inject in the request a entityManager from + * {@link EntityManager} and deal with the complete lifecycle of a JPA + * entityManager while a request. + * <p/> + * The injected JPA entityManager will be closed (if was really opened) at the end of + * the request. + * <h2>Configuration of the filter</h2> + * The filter accepts two configuration parameters: + * <ul> + * <li>{@code excludeMethods}: This parameters configure a set of method names + * which should never be called on the proxied entityManager. + * When a such method is called on the entityManager then the filter will pass in + * the hook {@link #onExcludeMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to throw an exception. + * </li> + * <li>{@code unusedMethods}: This parameters configure a set of method names + * which should be by-pass when the proxied entityManager was not still open + * (via a {@link EntityManager#}. + * When a such method is called on the entityManager then the filter will pass in + * the hook {@link #onUnusedMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to not return null values. + * </li> + * </ul> + * <h2>Obtain the entityManager</h2> + * The (proxied) entityManager is pushed as an attribute in the servlet request. + * <p/> + * The attribute name is defined by field {@link #requestAttributeName} + * (default value is {@link #JPA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be + * changed. + * <p/> + * A convience method is created here to obtain the entityManager {@link #getTransaction(ServletRequest)} : + * <pre> + * EntityManager em = JpaTransactionFilter.getTransaction(ServletRequest); + * </pre> + * <p/> + * If you prefer to not use this nice method, you can also do this: + * <pre> + * EntityManager em = (EntityManager) request.getAttribute(JpaTransactionFilter#JPA_TRANSACTION_REQUEST_ATTRIBUTE); + * </pre> + * <p/> + * Or + * <pre> + * EntityManager em = (EntityManager) request.getAttribute(modifiedAttributeName); + * </pre> + * + * @author tchemit, bleny + * @since 1.13 + */ +public abstract class JpaTransactionFilter implements Filter { + + public static final String JPA_TRANSACTION_REQUEST_ATTRIBUTE = + "jpaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "close" + }; + + public static final String[] DEFAULT_UNUSED_METHODS = { + "toString", + "isOpen", + "clear", + "equals", + "hashCode", + "finalize", + "getClass" + }; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(JpaTransactionFilter.class); + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + /** names of methods to by-pass if no entityManager opened on proxy. */ + protected Set<String> unusedMethods; + + /** + * Name of the request attribute where to push the entityManager. + * <p/> + * By default will use value of + * {@link #JPA_TRANSACTION_REQUEST_ATTRIBUTE}. + */ + protected String requestAttributeName = JPA_TRANSACTION_REQUEST_ATTRIBUTE; + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public Set<String> getUnusedMethods() { + return unusedMethods; + } + + /** + * to change the {@link #requestAttributeName}. + * + * @param requestAttributeName new name of the request attribute + * where to push the entityManager. + */ + public void setRequestAttributeName(String requestAttributeName) { + this.requestAttributeName = requestAttributeName; + } + + public static EntityManager getTransaction(ServletRequest request) { + EntityManager entityManager = (EntityManager) + request.getAttribute(JPA_TRANSACTION_REQUEST_ATTRIBUTE); + return entityManager; + } + + /** + * Method to open a new entityManager. + * + * @param request incoming request + * @return the new freshly opened entityManager + */ + protected abstract EntityManager createEntityManager(ServletRequest request); + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + String methodsFromConfig; + + methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); + String[] methods; + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_EXCLUDE_METHODS; + } + excludeMethods = new HashSet<String>(Arrays.asList(methods)); + + methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_UNUSED_METHODS; + } + unusedMethods = new HashSet<String>(Arrays.asList(methods)); + } + + @Override + public void doFilter(ServletRequest request, + ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + // creates a proxy of a lazy entityManager + + JpaTransactionProxyInvocationHandler proxyInvocationHandler = + new JpaTransactionProxyInvocationHandler(request); + + EntityManager proxy = (EntityManager) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{EntityManager.class}, + proxyInvocationHandler + ); + + // push it in request as an attribute + request.setAttribute(requestAttributeName, proxy); + try { + + // chain to next filter + chain.doFilter(request, response); + } finally { + + // close the real entityManager + onCloseTransaction(proxyInvocationHandler.entityManager); + } + } + + /** + * Hook method called when a method with his name in + * {@link #excludeMethods} was invoked on the proxied entityManager. + * + * @param proxy proxied entityManager + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onExcludeMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + method.getName() + " on " + + proxy); + } + + /** + * Hook method to close the topia entityManager of the request at the end of + * the request when all filter has been consumed. + * + * @param entityManager the entityManager to close (can be null if entityManager + * was not required while the current request) + */ + protected void onCloseTransaction(EntityManager entityManager) { + if (entityManager == null) { + if (log.isTraceEnabled()) { + log.trace("no entityManager to close"); + } + } else if ( ! entityManager.isOpen()) { + if (log.isTraceEnabled()) { + log.trace("entityManager " + entityManager + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing entityManager " + entityManager); + } + entityManager.close(); + } + } + + /** + * Hook method called when a method with his name in + * {@link #unusedMethods} was invoked on the proxied entityManager + * while the underlying entityManager is still not opened. + * + * @param proxy the proxy itself + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onUnusedMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // by-pass method since no entityManager found + + String methodName = method.getName(); + if (log.isDebugEnabled()) { + log.debug("Skip execution of method " + methodName + + " since no entityManager is created"); + } + + Set<String> methods = getUnusedMethods(); + if (methods.contains("toString")) { + + return "No entityManager opened yet for this proxy"; + } + + if (methods.contains("isOpen")) { + + return true; + } + + if (methods.contains("equals")) { + + return false; + } + + if (methods.contains("hashCode")) { + + return 0; + } + + if (methods.contains("getClass")) { + + return EntityManager.class; + } + + return null; + } + + /** + * Handler of a proxy on a {@link EntityManager}. + * + * @see #excludeMethods + */ + public class JpaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Incoming request that creates this handler. */ + protected final ServletRequest request; + + /** Target to use for the proxy. */ + protected EntityManager entityManager; + + protected JpaTransactionProxyInvocationHandler(ServletRequest request) { + this.request = request; + } + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + Object result = onExcludeMethod(proxy, method, args); + return result; + } + + if (entityManager == null) { + + if (log.isTraceEnabled()) { + log.trace("entityManager started due to a call to " + methodName); + } + + if (getUnusedMethods().contains(methodName)) { + + Object result = onUnusedMethod(proxy, method, args); + return result; + } + + // first time entityManager is required, create its + entityManager = createEntityManager(request); + + entityManager.getTransaction().begin(); + + if (log.isDebugEnabled()) { + log.debug("created entityManager " + entityManager); + } + } + + // can invoke the method on the entityManager + try { + Object result = method.invoke(entityManager, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + } + +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-14 15:06:26 UTC (rev 248) +++ trunk/pom.xml 2013-03-14 15:26:30 UTC (rev 249) @@ -146,6 +146,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.1.Final</version> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>com.google.gwt</groupId>

1 0

r248 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org 14 Mar '13

14 Mar '13

Author: bleny Date: 2013-03-14 16:06:26 +0100 (Thu, 14 Mar 2013) New Revision: 248 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/248 Log: fixes #2594 excluded and unused methods parameter value is ignored in TopiaTransactionFilter Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-03-11 12:08:35 UTC (rev 247) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-03-14 15:06:26 UTC (rev 248) @@ -182,8 +182,7 @@ public void init(FilterConfig filterConfig) throws ServletException { String methodsFromConfig; - methodsFromConfig = filterConfig.getInitParameter("execludeMethods"); - + methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); String[] methods; if (StringUtils.isNotEmpty(methodsFromConfig)) { methods = methodsFromConfig.split(","); @@ -192,9 +191,7 @@ } excludeMethods = new HashSet<String>(Arrays.asList(methods)); - methodsFromConfig = - filterConfig.getInitParameter("unusedMethods "); - + methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); if (StringUtils.isNotEmpty(methodsFromConfig)) { methods = methodsFromConfig.split(","); } else {

1 0

r247 - trunk/nuiton-security/src/main/resources/WEB-INF/security
by echatellier＠users.nuiton.org 11 Mar '13

11 Mar '13

Author: echatellier Date: 2013-03-11 13:08:35 +0100 (Mon, 11 Mar 2013) New Revision: 247 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/247 Log: Fix test Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-12-29 11:29:30 UTC (rev 246) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-03-11 12:08:35 UTC (rev 247) @@ -34,7 +34,7 @@ <div class="security-div"> <h1>Sécurité</h1> - <s:if test='%{role.topiaId != null}'> + <s:if test='%{user.topiaId != null}'> <h2>Modification d'un utilisateur</h2> </s:if> <s:else>

1 0

r246 - trunk
by tchemit＠users.nuiton.org 29 Dec '12

29 Dec '12

Author: tchemit Date: 2012-12-29 12:29:30 +0100 (Sat, 29 Dec 2012) New Revision: 246 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/246 Log: Update mavenpom4redmineAndCentral to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-19 13:04:58 UTC (rev 245) +++ trunk/pom.xml 2012-12-29 11:29:30 UTC (rev 246) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4</version> + <version>3.4.7</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r245 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 19 Dec '12

19 Dec '12

Author: echatellier Date: 2012-12-19 14:04:58 +0100 (Wed, 19 Dec 2012) New Revision: 245 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/245 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-gwt/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-rss/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-struts2/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-tapestry/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-web/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -337,11 +337,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r244 - in tags: . nuiton-web-1.12-beta-2
by echatellier＠users.nuiton.org 19 Dec '12

19 Dec '12

Author: echatellier Date: 2012-12-19 14:04:56 +0100 (Wed, 19 Dec 2012) New Revision: 244 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/244 Log: [maven-release-plugin] copy for tag nuiton-web-1.12-beta-2 Added: tags/nuiton-web-1.12-beta-2/ Property changes on: tags/nuiton-web-1.12-beta-2 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r243 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 19 Dec '12

19 Dec '12

Author: echatellier Date: 2012-12-19 14:04:53 +0100 (Wed, 19 Dec 2012) New Revision: 243 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/243 Log: [maven-release-plugin] prepare release nuiton-web-1.12-beta-2 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-gwt/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-rss/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-struts2/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-tapestry/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-web/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> <modules> <module>nuiton-web</module> @@ -337,11 +337,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r242 - trunk/nuiton-security/src/main/java/org/nuiton/web/security
by echatellier＠users.nuiton.org 05 Dec '12

05 Dec '12

Author: echatellier Date: 2012-12-05 15:26:56 +0100 (Wed, 05 Dec 2012) New Revision: 242 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/242 Log: Fix page refresh to get real user rights content Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-11-26 15:27:14 UTC (rev 241) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-12-05 14:26:56 UTC (rev 242) @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.Properties; +import java.util.concurrent.Callable; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -122,7 +123,7 @@ @Override protected void doFilterInternal(ServletRequest servletRequest, - ServletResponse servletResponse, FilterChain chain) + ServletResponse servletResponse, final FilterChain chain) throws ServletException, IOException { // get subject @@ -149,7 +150,21 @@ if (log.isDebugEnabled()) { log.debug("User is permitted to access " + perm); } - super.doFilterInternal(servletRequest, servletResponse, chain); + + // on devrait appeler simplement super.doFilterInternal(servletRequest, servletResponse, chain); + // mais on ne peut pas car il recreer un nouveau Subject + // et n'utilise pas le notre :( + final ServletRequest request = prepareServletRequest(servletRequest, servletResponse, chain); + final ServletResponse response = prepareServletResponse(request, servletResponse, chain); + //noinspection unchecked + subjectUser.execute(new Callable() { + public Object call() throws Exception { + updateSessionLastAccessTime(request, response); + executeChain(request, response, chain); + return null; + } + }); + } else { if (log.isDebugEnabled()) { log.debug("User is NOT permitted to access " + perm);

1 0

r241 - in trunk/nuiton-security/src/main/java/org/nuiton/web/security: . actions
by echatellier＠users.nuiton.org 26 Nov '12

26 Nov '12

Author: echatellier Date: 2012-11-26 16:27:14 +0100 (Mon, 26 Nov 2012) New Revision: 241 Url: http://nuiton.org/repositories/revision/nuiton-web/241 Log: Take care of context path in uri Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-11-26 15:27:14 UTC (rev 241) @@ -136,8 +136,13 @@ subjectUser.login(new UsernamePasswordToken(ANON_LOGIN, "")); } - // get permission - String uri = ((HttpServletRequest)servletRequest).getRequestURI(); + // get permission from requested uri without context path + HttpServletRequest httpServletRequest = ((HttpServletRequest)servletRequest); + String contextPath = httpServletRequest.getContextPath(); + String uri = httpServletRequest.getRequestURI(); + if (uri.startsWith(contextPath)) { + uri = uri.substring(contextPath.length()); + } String perm = SecurityUtil.convertToShiroPerm(uri, config.getOption("topia.security.separators")); if (subjectUser.isPermitted("url" + perm)) { @@ -156,13 +161,13 @@ } // save request and redirect to login Session session = subjectUser.getSession(); - HttpServletRequest httpServletRequest = (HttpServletRequest)servletRequest; StringBuffer requestURL = new StringBuffer(httpServletRequest.getRequestURL()); if (httpServletRequest.getQueryString() != null) { requestURL.append('?').append(httpServletRequest.getQueryString()); } session.setAttribute(SESSION_SAVED_URL, requestURL.toString()); - ((HttpServletResponse)servletResponse).sendRedirect(config.getOption("topia.security.loginurl")); + String redirect = contextPath + config.getOption("topia.security.loginurl"); + ((HttpServletResponse)servletResponse).sendRedirect(redirect); } else { ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-11-26 15:27:14 UTC (rev 241) @@ -36,7 +36,6 @@ import com.opensymphony.xwork2.ActionSupport; - public class AbstractAction extends ActionSupport implements ServletContextAware, ParameterAware { /** serialVersionUID. */ Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-11-26 15:27:14 UTC (rev 241) @@ -22,7 +22,6 @@ * #L% */ - package org.nuiton.web.security.actions; import org.apache.commons.lang3.StringUtils;

1 0

r240 - trunk/nuiton-security/src/main/resources/WEB-INF/security
by echatellier＠users.nuiton.org 23 Nov '12

23 Nov '12

Author: echatellier Date: 2012-11-23 13:34:40 +0100 (Fri, 23 Nov 2012) New Revision: 240 Url: http://nuiton.org/repositories/revision/nuiton-web/240 Log: Correction des class/cssClass Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -37,7 +37,7 @@ <h2>Permissions des rôles</h2> - <form action="<s:url action="role-permissions" namespace="/security" />" method="post" class="security-form"> + <form action="<s:url action="role-permissions" namespace="/security" />" method="post" cssClass="security-form"> <s:iterator value="roles"> <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> </s:iterator> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -41,20 +41,19 @@ <h2>Nouveau rôle</h2> </s:else> - <s:form action="role" namespace="/security" class="security-form"> + <s:form action="role" namespace="/security" cssClass="security-form"> <s:actionerror /> <s:hidden name="roleId" value="%{role.topiaId}" /> <s:textfield label="Nom" name="role.name" value="%{role.name}"/> <s:submit label="Valider" /> </s:form> + + <s:if test='%{role.topiaId != null}'> + <s:a action="role!delete" namespace="/security" cssClass="delete"> + <s:param name="roleId"><s:property value="role.topiaId" /></s:param> + Supprimer + </s:a> + </s:if> </div> - - <s:if test='%{role.topiaId != null}'> - <s:a action="role!delete" namespace="/security" class="delete"> - <s:param name="roleId"><s:property value="role.topiaId" /></s:param> - Supprimer - </s:a> - </s:if> - </body> </html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -41,7 +41,7 @@ <h2>Nouveau utilisateur</h2> </s:else> - <s:form action="user" namespace="/security" class="security-form"> + <s:form action="user" namespace="/security" cssClass="security-form"> <s:actionerror /> <s:hidden name="userId" value="%{user.topiaId}" /> <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> @@ -51,7 +51,7 @@ </s:form> <s:if test='%{user.topiaId != null}'> - <s:a action="user!delete" namespace="/security" class="delete"> + <s:a action="user!delete" namespace="/security" cssClass="delete"> <s:param name="userId"><s:property value="user.topiaId" /></s:param> Supprimer </s:a>

1 0

r239 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 17:13:41 +0100 (Fri, 16 Nov 2012) New Revision: 239 Url: http://nuiton.org/repositories/revision/nuiton-web/239 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 15:34:51 UTC (rev 238) +++ trunk/pom.xml 2012-11-16 16:13:41 UTC (rev 239) @@ -341,7 +341,7 @@ <developerConnection> scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r238 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 16:34:51 +0100 (Fri, 16 Nov 2012) New Revision: 238 Url: http://nuiton.org/repositories/revision/nuiton-web/238 Log: Update mavenpom4redmineAndCentral to 3.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-31 08:58:23 UTC (rev 237) +++ trunk/pom.xml 2012-11-16 15:34:51 UTC (rev 238) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r237 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 31 Oct '12

31 Oct '12

Author: echatellier Date: 2012-10-31 09:58:23 +0100 (Wed, 31 Oct 2012) New Revision: 237 Url: http://nuiton.org/repositories/revision/nuiton-web/237 Log: Oops, wrong version name Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-gwt/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-rss/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-struts2/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-tapestry/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-web/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> <modules> <module>nuiton-web</module>

1 0

r236 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:26:37 +0100 (Tue, 30 Oct 2012) New Revision: 236 Url: http://nuiton.org/repositories/revision/nuiton-web/236 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-gwt/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-rss/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-struts2/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-web/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> <modules> <module>nuiton-web</module> @@ -337,11 +337,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-1 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.12-b…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r235 - in tags: . nuiton-web-1.12-beta-1
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:26:34 +0100 (Tue, 30 Oct 2012) New Revision: 235 Url: http://nuiton.org/repositories/revision/nuiton-web/235 Log: [maven-release-plugin] copy for tag nuiton-web-1.12-beta-1 Added: tags/nuiton-web-1.12-beta-1/ Property changes on: tags/nuiton-web-1.12-beta-1 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r234 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:26:31 +0100 (Tue, 30 Oct 2012) New Revision: 234 Url: http://nuiton.org/repositories/revision/nuiton-web/234 Log: [maven-release-plugin] prepare release nuiton-web-1.12-beta-1 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-gwt/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-rss/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-struts2/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-web/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> <modules> <module>nuiton-web</module> @@ -337,11 +337,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.12-b…</url> </scm> <distributionManagement>

1 0

r233 - in trunk: nuiton-rss/src/license nuiton-security/src/main/resources/WEB-INF/security
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:12:15 +0100 (Tue, 30 Oct 2012) New Revision: 233 Url: http://nuiton.org/repositories/revision/nuiton-web/233 Log: Fix headers Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2012-10-30 16:12:15 UTC (rev 233) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache Software License Like # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -11,13 +10,13 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - Similar to Apache License but with the acknowledgment clause removed # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Feb 19 12:50:29 CET 2012 +#Wed Oct 24 14:20:44 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -org.jdom--jdom--1.1=Apache Software License Like Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -32,4 +44,4 @@ </s:form> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -77,4 +89,4 @@ </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -45,4 +57,4 @@ </s:if> </body> -</html> \ No newline at end of file +</html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -91,4 +103,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -46,4 +58,4 @@ </s:if> </div> </body> -</html> \ No newline at end of file +</html>

1 0

r232 - trunk
by tchemit＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:44:27 +0100 (Tue, 30 Oct 2012) New Revision: 232 Url: http://nuiton.org/repositories/revision/nuiton-web/232 Log: Update mavenpom4redmineAndCentral to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:43:59 UTC (rev 231) +++ trunk/pom.xml 2012-10-30 07:44:27 UTC (rev 232) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r231 - trunk
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 13:43:59 +0200 (Fri, 26 Oct 2012) New Revision: 231 Url: http://nuiton.org/repositories/revision/nuiton-web/231 Log: Update mavenpom4redmineAndCentral to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-24 15:05:53 UTC (rev 230) +++ trunk/pom.xml 2012-10-26 11:43:59 UTC (rev 231) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r230 - in trunk/nuiton-security/src/main: java/org/nuiton/web/security java/org/nuiton/web/security/actions resources/WEB-INF/security resources/i18n
by echatellier＠users.nuiton.org 24 Oct '12

24 Oct '12

Author: echatellier Date: 2012-10-24 17:05:53 +0200 (Wed, 24 Oct 2012) New Revision: 230 Url: http://nuiton.org/repositories/revision/nuiton-web/230 Log: Encode password using md5 hash Add user and role delete action Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-24 15:05:53 UTC (rev 230) @@ -59,7 +59,7 @@ public static final String ROOT_CONTEXT_CONTEXT = SecurityShiroFilter.class.getName() + "#" + TopiaContext.class.getName(); - protected static final String ANON_LOGIN = "anonymous"; + public static final String ANON_LOGIN = "anonymous"; public static final String SESSION_SAVED_URL = "savedUrl"; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-24 15:05:53 UTC (rev 230) @@ -34,6 +34,7 @@ import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.SimpleAuthenticationInfo; import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.authc.credential.CredentialsMatcher; import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; @@ -42,9 +43,10 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; -public class TopiaSecurityRealm extends AuthorizingRealm { +public class TopiaSecurityRealm extends AuthorizingRealm implements CredentialsMatcher { private static final Log log = LogFactory.getLog(TopiaSecurityRealm.class); @@ -55,9 +57,21 @@ public TopiaSecurityRealm(TopiaContext rootContext, ApplicationConfig config) { this.rootContext = rootContext; this.config = config; + + setCredentialsMatcher(this); } @Override + public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) { + char[] tokenCredentials = (char[]) token.getCredentials(); + String submittedPassword = String.valueOf(tokenCredentials); + String submittedHashedPassword = StringUtil.encodeMD5(submittedPassword); + + String expectedHashedPassword = (String) info.getCredentials(); + return expectedHashedPassword.equals(submittedHashedPassword); + } + + @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { SimpleAuthorizationInfo result = null; @@ -162,7 +176,7 @@ if (securityUser != null) { if (login.equals(SecurityShiroFilter.ANON_LOGIN)) { result = new SimpleAuthenticationInfo(securityUser.getLogin(), - "", getName()); + StringUtil.encodeMD5(""), getName()); } else { result = new SimpleAuthenticationInfo(securityUser.getLogin(), securityUser.getPassword(), getName()); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-10-24 15:05:53 UTC (rev 230) @@ -26,6 +26,8 @@ package org.nuiton.web.security.actions; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; @@ -39,6 +41,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(RoleAction.class); + protected SecurityRoleDAO securityRoleDAO; protected SecurityRole role; @@ -48,7 +52,10 @@ String roleId = getParameter("roleId"); if (StringUtils.isNotBlank(roleId)) { try { + TopiaContext transaction = rootContext.beginTransaction(); + securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); role = securityRoleDAO.findByTopiaId(roleId); + transaction.closeContext(); } catch (TopiaException ex) { throw new TopiaRuntimeException(ex); } @@ -59,6 +66,27 @@ return role; } + public String delete() throws Exception { + try { + String roleId = getParameter("roleId"); + if (StringUtils.isNotBlank(roleId)) { + TopiaContext transaction = rootContext.beginTransaction(); + securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); + SecurityRole role = securityRoleDAO.findByTopiaId(roleId); + securityRoleDAO.delete(role); + transaction.commitTransaction(); + transaction.closeContext(); + } + + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't delete role", ex); + } + } + + return SUCCESS; + } + @Override public String execute() throws Exception { String result = super.execute(); @@ -66,10 +94,10 @@ try { TopiaContext transaction = rootContext.beginTransaction(); securityRoleDAO = SecurityDAOHelper.getSecurityRoleDAO(transaction); - if (role.getTopiaId() == null) { - securityRoleDAO.create(role); + if (getRole().getTopiaId() == null) { + securityRoleDAO.create(getRole()); } else { - securityRoleDAO.update(role); + securityRoleDAO.update(getRole()); } transaction.commitTransaction(); transaction.closeContext(); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-24 15:05:53 UTC (rev 230) @@ -24,10 +24,14 @@ package org.nuiton.web.security.actions; +import static org.nuiton.i18n.I18n._; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityDAOHelper; import org.nuiton.web.security.SecurityUser; import org.nuiton.web.security.SecurityUserDAO; @@ -38,16 +42,25 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(UserAction.class); + protected SecurityUserDAO securityUserDAO; protected SecurityUser user; + protected String password; + + protected String confirm; + public SecurityUser getUser() { if (user == null) { String roleId = getParameter("userId"); if (StringUtils.isNotBlank(roleId)) { try { + TopiaContext transaction = rootContext.beginTransaction(); + securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); user = securityUserDAO.findByTopiaId(roleId); + transaction.closeContext(); } catch (TopiaException ex) { throw new TopiaRuntimeException(ex); } @@ -58,13 +71,56 @@ return user; } + public void setPassword(String password) { + this.password = password; + } + + public void setConfirm(String confirm) { + this.confirm = confirm; + } + + public String delete() throws Exception { + try { + String roleId = getParameter("userId"); + if (StringUtils.isNotBlank(roleId)) { + TopiaContext transaction = rootContext.beginTransaction(); + securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + SecurityUser user = securityUserDAO.findByTopiaId(roleId); + securityUserDAO.delete(user); + transaction.commitTransaction(); + transaction.closeContext(); + } + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't delete user", ex); + } + } + + return SUCCESS; + } + @Override + public void validate() { + if (StringUtils.isNotBlank(password)) { + if (!password.equals(confirm)) { + addActionError(_("Les mots de passes ne sont pas identiques !")); + } + } + } + + @Override public String execute() throws Exception { String result = super.execute(); try { TopiaContext transaction = rootContext.beginTransaction(); securityUserDAO = SecurityDAOHelper.getSecurityUserDAO(transaction); + + SecurityUser user = getUser(); + if (StringUtils.isNotBlank(password)) { + String md5Password = StringUtil.encodeMD5(password); + user.setPassword(md5Password); + } if (user.getTopiaId() == null) { securityUserDAO.create(user); } else { Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-24 15:05:53 UTC (rev 230) @@ -1,24 +1,12 @@ <%-- #%L - Nuiton Web :: Nuiton Security + SGQ :: Web $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012 Herboristerie Cailleau %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + Herboristerie Cailleau - Tous droits réservés #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-24 15:05:53 UTC (rev 230) @@ -1,24 +1,12 @@ <%-- #%L - Nuiton Web :: Nuiton Security + SGQ :: Web $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012 Herboristerie Cailleau %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + Herboristerie Cailleau - Tous droits réservés #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-24 15:05:53 UTC (rev 230) @@ -1,24 +1,12 @@ <%-- #%L - Nuiton Web :: Nuiton Security + SGQ :: Web $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012 Herboristerie Cailleau %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + Herboristerie Cailleau - Tous droits réservés #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -33,14 +21,14 @@ <div class="security-div"> <h1>Sécurité</h1> - - <s:if test='%{product.topiaId != null}'> - <h2>Nouveau rôle</h2> + + <s:if test='%{role.topiaId != null}'> + <h2>Modification d'un rôle</h2> </s:if> <s:else> - <h2>Modification d'un rôle</h2> + <h2>Nouveau rôle</h2> </s:else> - + <s:form action="role" namespace="/security" class="security-form"> <s:actionerror /> <s:hidden name="roleId" value="%{role.topiaId}" /> @@ -49,5 +37,12 @@ </s:form> </div> + <s:if test='%{role.topiaId != null}'> + <s:a action="role!delete" namespace="/security" class="delete"> + <s:param name="roleId"><s:property value="role.topiaId" /></s:param> + Supprimer + </s:a> + </s:if> + </body> </html> \ No newline at end of file Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-24 15:05:53 UTC (rev 230) @@ -1,24 +1,12 @@ <%-- #%L - Nuiton Web :: Nuiton Security + SGQ :: Web $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012 Herboristerie Cailleau %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + Herboristerie Cailleau - Tous droits réservés #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -63,11 +51,16 @@ <th rowspan="<s:property value="users.size()" />" class="vertical">Utilisateurs</th> </s:if> <td> - <a href="<s:url action='user!input' namespace='/security'> - <s:param name="userId"><s:property value="topiaId" /></s:param> - </s:url>"> + <s:if test="login == @org.nuiton.web.security.SecurityShiroFilter@ANON_LOGIN"> <s:property value="login" /> - </a> + </s:if> + <s:else> + <a href="<s:url action='user!input' namespace='/security'> + <s:param name="userId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="login" /> + </a> + </s:else> </td> <s:iterator value="roles" var="role"> <td> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-24 15:05:53 UTC (rev 230) @@ -1,24 +1,12 @@ <%-- #%L - Nuiton Web :: Nuiton Security + SGQ :: Web $Id:$ $HeadURL:$ %% - Copyright (C) 2012 CodeLutin, Chatellier Eric + Copyright (C) 2012 Herboristerie Cailleau %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + Herboristerie Cailleau - Tous droits réservés #L% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -26,7 +14,7 @@ <%@taglib uri="/struts-tags" prefix="s" %> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>Secu</title> + <title>Sécurité</title> </head> <body> @@ -34,14 +22,28 @@ <div class="security-div"> <h1>Sécurité</h1> - <h2>Nouvel utilisateur</h2> + <s:if test='%{role.topiaId != null}'> + <h2>Modification d'un utilisateur</h2> + </s:if> + <s:else> + <h2>Nouveau utilisateur</h2> + </s:else> + <s:form action="user" namespace="/security" class="security-form"> <s:actionerror /> <s:hidden name="userId" value="%{user.topiaId}" /> <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> - <s:password label="Mot de passe" name="user.password" value="%{user.password}" /> + <s:password label="Mot de passe" name="password" /> + <s:password label="Confirmation" name="confirm" /> <s:submit label="Valider" /> </s:form> + + <s:if test='%{user.topiaId != null}'> + <s:a action="user!delete" namespace="/security" class="delete"> + <s:param name="userId"><s:property value="user.topiaId" /></s:param> + Supprimer + </s:a> + </s:if> </div> </body> </html> \ No newline at end of file Modified: trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties =================================================================== --- trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties 2012-10-24 15:05:53 UTC (rev 230) @@ -1,3 +1,4 @@ Compte\ bloqué.\ Contacter\ un\ administrateur= Identifiant\ ou\ mot\ de\ passe\ invalide\ \!= +Les\ mots\ de\ passes\ ne\ sont\ pas\ identiques\ \!= Nombre\ de\ tentatives\ dépassé= Modified: trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties =================================================================== --- trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties 2012-10-24 12:43:58 UTC (rev 229) +++ trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties 2012-10-24 15:05:53 UTC (rev 230) @@ -1,3 +1,4 @@ Compte\ bloqué.\ Contacter\ un\ administrateur= Identifiant\ ou\ mot\ de\ passe\ invalide\ \!= +Les\ mots\ de\ passes\ ne\ sont\ pas\ identiques\ \!= Nombre\ de\ tentatives\ dépassé=

1 0

r229 - in trunk/nuiton-security: . src src/license src/main/java/org/nuiton/web/security src/main/java/org/nuiton/web/security/actions src/main/resources src/main/resources/WEB-INF/security src/main/xmi
by echatellier＠users.nuiton.org 24 Oct '12

24 Oct '12

Author: echatellier Date: 2012-10-24 14:43:58 +0200 (Wed, 24 Oct 2012) New Revision: 229 Url: http://nuiton.org/repositories/revision/nuiton-web/229 Log: Fix headers, third party and deps Added: trunk/nuiton-security/src/license/ trunk/nuiton-security/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-security/LICENSE.txt trunk/nuiton-security/pom.xml trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp trunk/nuiton-security/src/main/resources/struts.xml trunk/nuiton-security/src/main/xmi/security.properties Modified: trunk/nuiton-security/LICENSE.txt =================================================================== --- trunk/nuiton-security/LICENSE.txt 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/LICENSE.txt 2012-10-24 12:43:58 UTC (rev 229) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Added: trunk/nuiton-security/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-security/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-security/src/license/THIRD-PARTY.properties 2012-10-24 12:43:58 UTC (rev 229) @@ -0,0 +1,25 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - GNU Library or Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - The Apache Software License, Version 2.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Oct 24 14:21:56 CEST 2012 +antlr--antlr--2.7.6=BSD License +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security; import java.io.IOException; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security; import javax.servlet.ServletRequest; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security; public class SecurityUtil { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security; import java.util.Properties; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security.actions; import java.util.Map; @@ -12,6 +36,7 @@ import com.opensymphony.xwork2.ActionSupport; + public class AbstractAction extends ActionSupport implements ServletContextAware, ParameterAware { /** serialVersionUID. */ Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security.actions; import static org.nuiton.i18n.I18n._; @@ -2,3 +26,2 @@ -import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; @@ -17,8 +40,6 @@ import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; -import org.apache.shiro.web.util.SavedRequest; -import org.apache.shiro.web.util.WebUtils; import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.web.security.SecurityShiroFilter; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security.actions; import org.apache.shiro.SecurityUtils; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,28 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + + package org.nuiton.web.security.actions; import org.apache.commons.lang3.StringUtils; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security.actions; import java.util.ArrayList; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security.actions; import org.apache.commons.lang3.StringUtils; Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Security + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + package org.nuiton.web.security.actions; import java.util.List; Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,26 @@ +<%-- + #%L + Nuiton Web :: Nuiton Security + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2012 CodeLutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@taglib uri="/struts-tags" prefix="s" %> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,26 @@ +<%-- + #%L + Nuiton Web :: Nuiton Security + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2012 CodeLutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@taglib uri="/struts-tags" prefix="s" %> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,26 @@ +<%-- + #%L + Nuiton Web :: Nuiton Security + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2012 CodeLutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@taglib uri="/struts-tags" prefix="s" %> @@ -10,8 +33,13 @@ <div class="security-div"> <h1>Sécurité</h1> - - <h2>Nouveau Rôle</h2> + + <s:if test='%{product.topiaId != null}'> + <h2>Nouveau rôle</h2> + </s:if> + <s:else> + <h2>Modification d'un rôle</h2> + </s:else> <s:form action="role" namespace="/security" class="security-form"> <s:actionerror /> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,26 @@ +<%-- + #%L + Nuiton Web :: Nuiton Security + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2012 CodeLutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@taglib uri="/struts-tags" prefix="s" %> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,26 @@ +<%-- + #%L + Nuiton Web :: Nuiton Security + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2012 CodeLutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@taglib uri="/struts-tags" prefix="s" %> Modified: trunk/nuiton-security/src/main/resources/struts.xml =================================================================== --- trunk/nuiton-security/src/main/resources/struts.xml 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/resources/struts.xml 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,26 @@ + <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN" "http://struts.apache.org/dtds/struts-2.3.dtd"> Modified: trunk/nuiton-security/src/main/xmi/security.properties =================================================================== --- trunk/nuiton-security/src/main/xmi/security.properties 2012-10-23 15:29:49 UTC (rev 228) +++ trunk/nuiton-security/src/main/xmi/security.properties 2012-10-24 12:43:58 UTC (rev 229) @@ -1,3 +1,26 @@ +### +# #%L +# Nuiton Web :: Nuiton Security +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 CodeLutin, Chatellier Eric +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### model.tagvalue.String=text org.nuiton.web.security.SecurityUser.attribute.securityRole.tagvalue.lazy=false org.nuiton.web.security.SecurityRole.attribute.permissions.tagvalue.lazy=false

1 0

r228 - trunk/nuiton-security/src/main/java/org/nuiton/web/security
by echatellier＠users.nuiton.org 23 Oct '12

23 Oct '12

Author: echatellier Date: 2012-10-23 17:29:49 +0200 (Tue, 23 Oct 2012) New Revision: 228 Url: http://nuiton.org/repositories/revision/nuiton-web/228 Log: Add configuration option to split url on various characters Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-19 13:11:36 UTC (rev 227) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-23 15:29:49 UTC (rev 228) @@ -114,13 +114,9 @@ // get permission String uri = ((HttpServletRequest)servletRequest).getRequestURI(); - String perm = "url" + uri.replace('/', ':'); - // cas de la permission url: qui est equivalente a url:* - if (perm.endsWith(":")) { - perm += "/"; - } + String perm = SecurityUtil.convertToShiroPerm(uri, config.getOption("topia.security.separators")); - if (subjectUser.isPermitted(perm)) { + if (subjectUser.isPermitted("url" + perm)) { if (log.isDebugEnabled()) { log.debug("User is permitted to access " + perm); } @@ -136,7 +132,12 @@ } // save request and redirect to login Session session = subjectUser.getSession(); - session.setAttribute(SESSION_SAVED_URL, ((HttpServletRequest)servletRequest).getRequestURL().toString()); + HttpServletRequest httpServletRequest = (HttpServletRequest)servletRequest; + StringBuffer requestURL = new StringBuffer(httpServletRequest.getRequestURL()); + if (httpServletRequest.getQueryString() != null) { + requestURL.append('?').append(httpServletRequest.getQueryString()); + } + session.setAttribute(SESSION_SAVED_URL, requestURL.toString()); ((HttpServletResponse)servletResponse).sendRedirect(config.getOption("topia.security.loginurl")); } else { ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java (rev 0) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2012-10-23 15:29:49 UTC (rev 228) @@ -0,0 +1,27 @@ +package org.nuiton.web.security; + +public class SecurityUtil { + + /** + * Split url with separators definined in separator string. + * + * @param url url to convert + * @param separators each string character is used a separator char (null allowed) + * @return shiro permission (: separator) + */ + public static String convertToShiroPerm(String url, String separators) { + String perm = url; + if (separators != null) { + for (int i = 0; i < separators.length(); i++) { + perm = perm.replace(separators.charAt(i), ':'); + } + } + + // cas de la permission url: qui est equivalente a url:* + if (perm.endsWith(":")) { + perm += "/"; + } + + return perm; + } +} Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-19 13:11:36 UTC (rev 227) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-23 15:29:49 UTC (rev 228) @@ -97,8 +97,10 @@ } // ajout de l'url de login et logout quand meme !!! - result.addStringPermission("url" + config.getOption("topia.security.loginurl").replace('/', ':')); - result.addStringPermission("url" + config.getOption("topia.security.logouturl").replace('/', ':')); + result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.loginurl"), + config.getOption("topia.security.separators"))); + result.addStringPermission("url" + SecurityUtil.convertToShiroPerm(config.getOption("topia.security.logouturl"), + config.getOption("topia.security.separators"))); } catch (Exception ex) {

1 0

r227 - in trunk/nuiton-security/src: main/java/org/nuiton/web/security site/apt
by echatellier＠users.nuiton.org 19 Oct '12

19 Oct '12

Author: echatellier Date: 2012-10-19 15:11:36 +0200 (Fri, 19 Oct 2012) New Revision: 227 Url: http://nuiton.org/repositories/revision/nuiton-web/227 Log: Use ; separator because , is part of shiro synthax Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/site/apt/index.apt Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-19 08:42:55 UTC (rev 226) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-19 13:11:36 UTC (rev 227) @@ -66,7 +66,8 @@ if (subs[2].equals("perm")) { if (subs[1].equals(permission)) { String perms = props.getProperty(prop); - String[] permTab = perms.split("\\s*\\,\\s*"); + // use ; separator because shiro use , + String[] permTab = perms.split("\\s*\\;\\s*"); for (String perm : permTab) { result.addStringPermission(perm); if (log.isDebugEnabled()) { Modified: trunk/nuiton-security/src/site/apt/index.apt =================================================================== --- trunk/nuiton-security/src/site/apt/index.apt 2012-10-19 08:42:55 UTC (rev 226) +++ trunk/nuiton-security/src/site/apt/index.apt 2012-10-19 13:11:36 UTC (rev 227) @@ -99,7 +99,7 @@ topia.security.permission.<category>=categoryname topia.security.permission.<category>.<permission>.name=permissionname -topia.security.permission.<category>.<permission>.perm=permission, urlpermissions +topia.security.permission.<category>.<permission>.perm=permission; urlpermissions -------------------------------------------------------------------------------- The configuration define two url, loginurl and logouturl used to redirect user @@ -121,15 +121,15 @@ topia.security.permission.global=Global topia.security.permission.global.index.name=Index -topia.security.permission.global.index.perm=index:read, url:/, url:index.action +topia.security.permission.global.index.perm=index:read; url:/,index.action topia.security.permission.global.search.name=Rechercher -topia.security.permission.global.search.perm=search:read, url:user:search.action +topia.security.permission.global.search.perm=search:read; url:user:search.action topia.security.permission.global.placesread.name=Emplacements -topia.security.permission.global.placesread.perm=places:read, url:user:places.action +topia.security.permission.global.placesread.perm=places:read; url:user:places.action topia.security.permission.misc=Divers topia.security.permission.misc.deco.name=Decoration -topia.security.permission.misc.deco.perm=url:css, url:images, url:js +topia.security.permission.misc.deco.perm=url:css; url:images; url:js topia.security.permission.misc.admin.name=Admin topia.security.permission.misc.admin.perm=* --------------------------------------------------------------------------------

1 0

r226 - in trunk/nuiton-security/src/main/java/org/nuiton/web/security: . actions
by echatellier＠users.nuiton.org 19 Oct '12

19 Oct '12

Author: echatellier Date: 2012-10-19 10:42:55 +0200 (Fri, 19 Oct 2012) New Revision: 226 Url: http://nuiton.org/repositories/revision/nuiton-web/226 Log: Correction de la redirection apr?\195?\168s login sur la page demand?\195?\169e. La methode "shiro" marche plus :( Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-18 15:00:51 UTC (rev 225) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-10-19 08:42:55 UTC (rev 226) @@ -14,17 +14,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; -import org.apache.shiro.mgt.SecurityManager; -import org.apache.shiro.mgt.SubjectFactory; import org.apache.shiro.realm.Realm; import org.apache.shiro.session.Session; -import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.Subject; -import org.apache.shiro.subject.SubjectContext; import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.apache.shiro.web.servlet.AbstractShiroFilter; -import org.apache.shiro.web.subject.WebSubjectContext; -import org.apache.shiro.web.subject.support.WebDelegatingSubject; +import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -32,7 +27,7 @@ import org.nuiton.util.ApplicationConfig; import org.nuiton.web.SecurityDAOHelper; -public class SecurityShiroFilter extends AbstractShiroFilter implements SubjectFactory { +public class SecurityShiroFilter extends AbstractShiroFilter { private static final Log log = LogFactory.getLog(SecurityShiroFilter.class); @@ -41,6 +36,8 @@ public static final String ROOT_CONTEXT_CONTEXT = SecurityShiroFilter.class.getName() + "#" + TopiaContext.class.getName(); protected static final String ANON_LOGIN = "anonymous"; + + public static final String SESSION_SAVED_URL = "savedUrl"; protected ApplicationConfig config; @@ -66,10 +63,12 @@ if (log.isInfoEnabled()) { log.info("Overriding shiro realms"); } + Realm realm = new TopiaSecurityRealm(rootContext, config); DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(realm); + securityManager.setSubjectFactory(new SecuritySubjectFactory()); + securityManager.setSessionManager(new DefaultWebSessionManager()); setSecurityManager(securityManager); - securityManager.setSubjectFactory(this); SecurityUtils.setSecurityManager(securityManager); } @@ -130,7 +129,14 @@ if (log.isDebugEnabled()) { log.debug("User is NOT permitted to access " + perm); } + // anon n'est pas considéré comme authenticated if (ANON_LOGIN.equals(subjectUser.getPrincipal())) { + if (log.isDebugEnabled()) { + log.debug("Redirecting user to login page"); + } + // save request and redirect to login + Session session = subjectUser.getSession(); + session.setAttribute(SESSION_SAVED_URL, ((HttpServletRequest)servletRequest).getRequestURL().toString()); ((HttpServletResponse)servletResponse).sendRedirect(config.getOption("topia.security.loginurl")); } else { ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); @@ -152,29 +158,6 @@ } } } - - @Override - public Subject createSubject(SubjectContext context) { - /*if (!(context instanceof WebSubjectContext)) { - return super.createSubject(context); - }*/ - WebSubjectContext wsc = (WebSubjectContext) context; - SecurityManager securityManager = wsc.resolveSecurityManager(); - Session session = wsc.resolveSession(); - boolean sessionEnabled = wsc.isSessionCreationEnabled(); - PrincipalCollection principals = wsc.resolvePrincipals(); - boolean authenticated = wsc.resolveAuthenticated(); - - // dans le cas du module securité, on va dire que non - if (authenticated && ANON_LOGIN.equals(principals.getPrimaryPrincipal())) { - authenticated = false; - } - - String host = wsc.resolveHost(); - ServletRequest request = wsc.resolveServletRequest(); - ServletResponse response = wsc.resolveServletResponse(); - - return new WebDelegatingSubject(principals, authenticated, host, session, sessionEnabled, - request, response, securityManager); - } + + } Added: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java (rev 0) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2012-10-19 08:42:55 UTC (rev 226) @@ -0,0 +1,41 @@ +package org.nuiton.web.security; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.apache.shiro.mgt.SecurityManager; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.PrincipalCollection; +import org.apache.shiro.subject.Subject; +import org.apache.shiro.subject.SubjectContext; +import org.apache.shiro.web.mgt.DefaultWebSubjectFactory; +import org.apache.shiro.web.subject.WebSubjectContext; +import org.apache.shiro.web.subject.support.WebDelegatingSubject; + +public class SecuritySubjectFactory extends DefaultWebSubjectFactory { + + @Override + public Subject createSubject(SubjectContext context) { + if (!(context instanceof WebSubjectContext)) { + return super.createSubject(context); + } + WebSubjectContext wsc = (WebSubjectContext) context; + SecurityManager securityManager = wsc.resolveSecurityManager(); + Session session = wsc.resolveSession(); + boolean sessionEnabled = wsc.isSessionCreationEnabled(); + PrincipalCollection principals = wsc.resolvePrincipals(); + boolean authenticated = wsc.resolveAuthenticated(); + + // dans le cas du module securité, on va dire que non + if (authenticated && SecurityShiroFilter.ANON_LOGIN.equals(principals.getPrimaryPrincipal())) { + authenticated = false; + } + + String host = wsc.resolveHost(); + ServletRequest request = wsc.resolveServletRequest(); + ServletResponse response = wsc.resolveServletResponse(); + + return new WebDelegatingSubject(principals, authenticated, host, session, sessionEnabled, + request, response, securityManager); + } +} Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-18 15:00:51 UTC (rev 225) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-19 08:42:55 UTC (rev 226) @@ -55,7 +55,7 @@ for (String permission : role.getPermissions()) { //result.addStringPermission(permission); if (log.isDebugEnabled()) { - log.debug(" - add permission : " + permission); + log.debug("- add permission : " + permission); } for (String prop : props.stringPropertyNames()) { @@ -70,7 +70,7 @@ for (String perm : permTab) { result.addStringPermission(perm); if (log.isDebugEnabled()) { - log.debug(" - add string permission : " + perm); + log.debug(" string permission : " + perm); } } } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2012-10-18 15:00:51 UTC (rev 225) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2012-10-19 08:42:55 UTC (rev 226) @@ -2,6 +2,7 @@ import static org.nuiton.i18n.I18n._; +import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -14,11 +15,13 @@ import org.apache.shiro.authc.LockedAccountException; import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.util.SavedRequest; import org.apache.shiro.web.util.WebUtils; import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.struts2.interceptor.ServletResponseAware; +import org.nuiton.web.security.SecurityShiroFilter; public class LoginAction extends AbstractAction implements ServletRequestAware, ServletResponseAware { @@ -64,6 +67,18 @@ UsernamePasswordToken token = new UsernamePasswordToken(login, password); currentUser.login(token); result = SUCCESS; + + // marche pas :( + //SavedRequest savedRequest = WebUtils.getAndClearSavedRequest(request); + Session session = currentUser.getSession(); + String requestURL = (String)session.getAttribute(SecurityShiroFilter.SESSION_SAVED_URL); + if (request != null) { // can be + if (log.isDebugEnabled()) { + log.debug("Redirecting to saved url " + requestURL); + } + session.removeAttribute(SecurityShiroFilter.SESSION_SAVED_URL); + response.sendRedirect(requestURL); + } } catch (UnknownAccountException ex) { addActionError(_("Identifiant ou mot de passe invalide !")); log.warn("Unknow user account", ex); @@ -85,16 +100,8 @@ log.warn("Authentication error", ex); result = input(); } - - SavedRequest savedRequest = WebUtils.getAndClearSavedRequest(request); - if (savedRequest != null) { // can be - response.sendRedirect(savedRequest.getRequestUrl()); - } } return result; } - - - }

1 0

r225 - trunk/nuiton-security/src/main/java/org/nuiton/web/security
by echatellier＠users.nuiton.org 18 Oct '12

18 Oct '12

Author: echatellier Date: 2012-10-18 17:00:51 +0200 (Thu, 18 Oct 2012) New Revision: 225 Url: http://nuiton.org/repositories/revision/nuiton-web/225 Log: Ajout d'un flag system pour donner tous les droits ?\195?\160 tous les utilisateurs Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-18 14:47:26 UTC (rev 224) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2012-10-18 15:00:51 UTC (rev 225) @@ -90,6 +90,11 @@ } } + // si la securité est desactivee, + if (config.getOptionAsBoolean("topia.security.disable")) { + result.addStringPermission("*"); + } + // ajout de l'url de login et logout quand meme !!! result.addStringPermission("url" + config.getOption("topia.security.loginurl").replace('/', ':')); result.addStringPermission("url" + config.getOption("topia.security.logouturl").replace('/', ':'));

1 0

r224 - trunk
by echatellier＠users.nuiton.org 18 Oct '12

18 Oct '12

Author: echatellier Date: 2012-10-18 16:47:26 +0200 (Thu, 18 Oct 2012) New Revision: 224 Url: http://nuiton.org/repositories/revision/nuiton-web/224 Log: fixes #2366: Update to struts 2.3.4.1 fixes #2367: Update to topia 2.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-18 14:43:55 UTC (rev 223) +++ trunk/pom.xml 2012-10-18 14:47:26 UTC (rev 224) @@ -257,7 +257,7 @@ <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.6.10</topiaVersion> + <topiaVersion>2.7</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> @@ -268,7 +268,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.4</struts2Version> + <struts2Version>2.3.4.1</struts2Version> <shiroVersion>1.2.1</shiroVersion> <servletApiVersion>2.5</servletApiVersion>

1 0

r223 - in trunk: . nuiton-gwt nuiton-security
by echatellier＠users.nuiton.org 18 Oct '12

18 Oct '12

Author: echatellier Date: 2012-10-18 16:43:55 +0200 (Thu, 18 Oct 2012) New Revision: 223 Url: http://nuiton.org/repositories/revision/nuiton-web/223 Log: merge security module into trunk refs #2363 fixes #2364, #2365 Added: trunk/nuiton-security/ Modified: trunk/ trunk/nuiton-gwt/ trunk/nuiton-gwt/pom.xml trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222 Property changes on: trunk/nuiton-gwt ___________________________________________________________________ Modified: svn:ignore - *.iml target + *.iml target .classpath .project .settings Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-10-18 14:28:45 UTC (rev 222) +++ trunk/nuiton-gwt/pom.xml 2012-10-18 14:43:55 UTC (rev 223) @@ -46,7 +46,7 @@  <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>scan-gwt-java-source</id> Property changes on: trunk/nuiton-security ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-18 14:28:45 UTC (rev 222) +++ trunk/pom.xml 2012-10-18 14:43:55 UTC (rev 223) @@ -23,6 +23,7 @@ <module>nuiton-tapestry</module> <module>nuiton-rss</module> <module>nuiton-gwt</module> + <module>nuiton-security</module> </modules> <dependencyManagement> @@ -171,6 +172,18 @@ </exclusion> </exclusions> </dependency> + +  + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + <version>${shiroVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + <version>${shiroVersion}</version> + </dependency> </dependencies> @@ -240,8 +253,8 @@  <projectId>nuiton-web</projectId> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> <topiaVersion>2.6.10</topiaVersion> @@ -257,6 +270,7 @@  <struts2Version>2.3.4</struts2Version> + <shiroVersion>1.2.1</shiroVersion> <servletApiVersion>2.5</servletApiVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <windstoneVersion>0.9.10-hudson-24</windstoneVersion> @@ -287,7 +301,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nPluginVersion}</version> </plugin> @@ -297,6 +311,11 @@ <version>${gwtPluginVersion}</version> </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>2.5</version> + </plugin> </plugins> </pluginManagement>

1 0

r222 - in branches/nuiton-web-1.11-security/nuiton-security/src/main: java/org/nuiton/web/security/actions resources/WEB-INF/security
by echatellier＠users.nuiton.org 18 Oct '12

18 Oct '12

Author: echatellier Date: 2012-10-18 16:28:45 +0200 (Thu, 18 Oct 2012) New Revision: 222 Url: http://nuiton.org/repositories/revision/nuiton-web/222 Log: Add div and class for css style Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role.jsp branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-10-18 14:28:45 UTC (rev 222) @@ -8,6 +8,7 @@ import org.apache.struts2.util.ServletContextAware; import org.nuiton.topia.TopiaContext; import org.nuiton.util.ApplicationConfig; +import org.nuiton.web.security.SecurityShiroFilter; import com.opensymphony.xwork2.ActionSupport; @@ -27,8 +28,8 @@ @Override public void setServletContext(ServletContext context) { - config = (ApplicationConfig)context.getAttribute("ApplicationConfig"); - rootContext = (TopiaContext)context.getAttribute("rootContext"); + config = (ApplicationConfig)context.getAttribute(SecurityShiroFilter.APP_CONFIG_CONTEXT); + rootContext = (TopiaContext)context.getAttribute(SecurityShiroFilter.ROOT_CONTEXT_CONTEXT); } /** Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-18 14:28:45 UTC (rev 222) @@ -9,8 +9,6 @@ import org.nuiton.web.security.SecurityUserDAO; import org.nuiton.web.security.SecurityUserImpl; -import com.opensymphony.xwork2.Preparable; - public class UserAction extends AbstractAction { /** serialVersionUID. */ Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -7,16 +7,18 @@ </head> <body> - - <h1>Authentification requise</h1> + + <div class="security-div"> + <h1>Authentification requise</h1> + + <h2>Connexion</h2> - <h2>Connexion</h2> - - <s:form action="login" namespace="/security"> - <s:actionerror /> - <s:textfield label="Identifiant" name="login" /> - <s:password label="Mot de passe" name="password" /> - <s:submit label="Connexion" /> - </s:form> + <s:form action="login" namespace="/security" class="security-form"> + <s:actionerror /> + <s:textfield label="Identifiant" name="login" /> + <s:password label="Mot de passe" name="password" /> + <s:submit label="Connexion" /> + </s:form> + </div> </body> </html> \ No newline at end of file Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -8,58 +8,62 @@ <body> - <h1>Sécurité</h1> + <div class="security-div"> - <h2>Permissions des rôles</h2> + <h1>Sécurité</h1> - <form action="<s:url action="role-permissions" namespace="/security" />" method="post"> - <s:iterator value="roles"> - <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> - </s:iterator> - <table class="secu-roletable"> - <tr> - <td class="empty" /> + <h2>Permissions des rôles</h2> + + <form action="<s:url action="role-permissions" namespace="/security" />" method="post" class="security-form"> <s:iterator value="roles"> - <td><a href="<s:url action='role!input' namespace='/security'> - <s:param name="roleId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="name" /> - </a></td> + <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> </s:iterator> - </tr> - <s:iterator value="categories.keys" var="category"> - <s:set name="categoryName" value="categories.get(#category)" /> + <table class="security-table"> <tr> - <th colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></th> + <td class="security-empty" /> + <s:iterator value="roles"> + <td><a href="<s:url action='role!input' namespace='/security'> + <s:param name="roleId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="name" /> + </a></td> + </s:iterator> </tr> - <s:iterator value="categoryPermissions.get(#category)" var="categoryPermission"> - <s:set name="permissionName" value="permissions.get(#categoryPermission)" /> - <tr> - <td><s:property value="#permissionName" /></td> - <s:iterator value="roles" var="role"> - <td><input type="checkbox" name="permissions-<s:property value="topiaId" />" - value="<s:property value="#categoryPermission"/>" - <s:if test="#role.permissions.contains(#categoryPermission)" > - checked="checked" - </s:if> /></td> + <s:iterator value="categories.keys" var="category"> + <s:set name="categoryName" value="categories.get(#category)" /> + <tr> + <th colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></th> + </tr> + <s:iterator value="categoryPermissions.get(#category)" var="categoryPermission"> + <s:set name="permissionName" value="permissions.get(#categoryPermission)" /> + <tr> + <td><s:property value="#permissionName" /></td> + <s:iterator value="roles" var="role"> + <td><input type="checkbox" name="permissions-<s:property value="topiaId" />" + value="<s:property value="#categoryPermission"/>" + <s:if test="#role.permissions.contains(#categoryPermission)" > + checked="checked" + </s:if> /></td> + </s:iterator> + </tr> </s:iterator> - </tr> </s:iterator> - </s:iterator> - </table> - <input type="submit" value="Valider" /> - </form> + </table> + <input type="submit" value="Valider" /> + </form> + + <h2>Gestion</h2> + + <div class="secu-newuser"> + <a href="<s:url action='user-roles!input' namespace='/security' />">Rôles des utilisateurs</a> + </div> + <div class="secu-newuser"> + <a href="<s:url action='user!input' namespace='/security' />">Nouvel utilisateur</a> + </div> + <div class="secu-newrole"> + <a href="<s:url action='role!input' namespace='/security' />">Nouveau rôle</a> + </div> + </div> - <h2>Gestion</h2> - - <div class="secu-newuser"> - <a href="<s:url action='user-roles!input' namespace='/security' />">Rôles des utilisateurs</a> - </div> - <div class="secu-newuser"> - <a href="<s:url action='user!input' namespace='/security' />">Nouvel utilisateur</a> - </div> - <div class="secu-newrole"> - <a href="<s:url action='role!input' namespace='/security' />">Nouveau rôle</a> - </div> </body> </html> \ No newline at end of file Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -7,16 +7,19 @@ </head> <body> + + <div class="security-div"> + <h1>Sécurité</h1> + + <h2>Nouveau Rôle</h2> - <h1>Sécurité</h1> - - <h2>Role</h2> + <s:form action="role" namespace="/security" class="security-form"> + <s:actionerror /> + <s:hidden name="roleId" value="%{role.topiaId}" /> + <s:textfield label="Nom" name="role.name" value="%{role.name}"/> + <s:submit label="Valider" /> + </s:form> + </div> - <s:form action="role" namespace="/security"> - <s:actionerror /> - <s:hidden name="roleId" value="%{role.topiaId}" /> - <s:textfield label="Nom" name="role.name" value="%{role.name}"/> - <s:submit label="Valider" /> - </s:form> </body> </html> \ No newline at end of file Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -8,69 +8,71 @@ <body> - <h1>Sécurité</h1> - - <h2>Rôles des utilisateurs</h2> + <div class="security-div"> + <h1>Sécurité</h1> - <form action="<s:url action="user-roles" namespace="/security" />" method="post"> - <table class="secu-roletable"> - <tr> - <td colspan="2" class="empty"/> - <s:if test="!roles.empty"> - <th colspan="<s:property value="roles.size()" />">Rôles</th> - </s:if> - </tr> - <tr> - <td colspan="2" class="empty"/> - <s:iterator value="roles"> - <td> - <a href="<s:url action='role!input' namespace='/security'> - <s:param name="roleId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="name" /> - </a> - </td> - </s:iterator> - </tr> - <s:iterator value="users" var="user" status="userStatus"> - <input type="hidden" name="userIds" value="<s:property value="topiaId" />" /> + <h2>Rôles des utilisateurs</h2> + + <form action="<s:url action="user-roles" namespace="/security" />" method="post" class="security-form"> + <table class="security-table"> <tr> - <s:if test="#userStatus.first"> - <th rowspan="<s:property value="users.size()" />" class="vertical">Utilisateurs</th> + <td colspan="2" class="security-empty"/> + <s:if test="!roles.empty"> + <th colspan="<s:property value="roles.size()" />">Rôles</th> </s:if> - <td> - <a href="<s:url action='user!input' namespace='/security'> - <s:param name="userId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="login" /> - </a> - </td> - <s:iterator value="roles" var="role"> + </tr> + <tr> + <td colspan="2" class="security-empty"/> + <s:iterator value="roles"> <td> - - <input id="<s:property value="#user.topiaId" /><s:property value="#user.topiaId" />" - type="checkbox" name="roles-<s:property value="#user.topiaId" />" value="<s:property value="#role.topiaId" />" - <s:if test="#user.securityRole.contains(#role)" > - checked="checked" - </s:if> /> + <a href="<s:url action='role!input' namespace='/security'> + <s:param name="roleId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="name" /> + </a> </td> </s:iterator> </tr> - </s:iterator> - </table> - <input type="submit" value="Valider" /> - </form> - - <h2>Gestion</h2> - - <div class="secu-newuser"> - <a href="<s:url action='role-permissions!input' namespace='/security' />">Permissions des rôles</a> + <s:iterator value="users" var="user" status="userStatus"> + <input type="hidden" name="userIds" value="<s:property value="topiaId" />" /> + <tr> + <s:if test="#userStatus.first"> + <th rowspan="<s:property value="users.size()" />" class="vertical">Utilisateurs</th> + </s:if> + <td> + <a href="<s:url action='user!input' namespace='/security'> + <s:param name="userId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="login" /> + </a> + </td> + <s:iterator value="roles" var="role"> + <td> + + <input id="<s:property value="#user.topiaId" /><s:property value="#user.topiaId" />" + type="checkbox" name="roles-<s:property value="#user.topiaId" />" value="<s:property value="#role.topiaId" />" + <s:if test="#user.securityRole.contains(#role)" > + checked="checked" + </s:if> /> + </td> + </s:iterator> + </tr> + </s:iterator> + </table> + <input type="submit" value="Valider" /> + </form> + + <h2>Gestion</h2> + + <div class="secu-newuser"> + <a href="<s:url action='role-permissions!input' namespace='/security' />">Permissions des rôles</a> + </div> + <div class="secu-newuser"> + <a href="<s:url action='user!input' namespace='/security' />">Nouvel utilisateur</a> + </div> + <div class="secu-newrole"> + <a href="<s:url action='role!input' namespace='/security' />">Nouveau rôle</a> + </div> </div> - <div class="secu-newuser"> - <a href="<s:url action='user!input' namespace='/security' />">Nouvel utilisateur</a> - </div> - <div class="secu-newrole"> - <a href="<s:url action='role!input' namespace='/security' />">Nouveau rôle</a> - </div> </body> </html> \ No newline at end of file Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -8,14 +8,17 @@ <body> - <h1>Sécurité</h1> + <div class="security-div"> + <h1>Sécurité</h1> - <s:form action="user" namespace="/security"> - <s:actionerror /> - <s:hidden name="userId" value="%{user.topiaId}" /> - <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> - <s:password label="Mot de passe" name="user.password" value="%{user.password}" /> - <s:submit label="Valider" /> - </s:form> + <h2>Nouvel utilisateur</h2> + <s:form action="user" namespace="/security" class="security-form"> + <s:actionerror /> + <s:hidden name="userId" value="%{user.topiaId}" /> + <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> + <s:password label="Mot de passe" name="user.password" value="%{user.password}" /> + <s:submit label="Valider" /> + </s:form> + </div> </body> </html> \ No newline at end of file

1 0