From echatellier@users.nuiton.org Thu Oct 18 16:43:55 2012
From: echatellier@users.nuiton.org
To: nuiton-web-commits@list.nuiton.org
Subject: [Nuiton-web-commits] r223 - in trunk: . nuiton-gwt nuiton-security
Date: Thu, 18 Oct 2012 16:43:55 +0200
Message-ID: <20121018144355.54A2815B61@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8298306660023384417=="

--===============8298306660023384417==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

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 @@
 
         <!-- extract i18n keys from source -->
         <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>
+      
+      <!-- Shiro -->
+      <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 @@
     <!-- redmine configuration -->
     <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 @@
     <!-- Strust 2 -->
     <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>
 


--===============8298306660023384417==--


