From: Olivier Lamy <olamy@apache.org>
Date: Tue, 15 Nov 2011 09:03:47 +0000 (+0000)
Subject: i18n resources from redback now have a new package as to be shared they are now locat... 
X-Git-Tag: archiva-1.4-M2~104
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d91ae5d63c456072cc6befad7a75b73bd857770;p=archiva.git

i18n resources from redback now have a new package as to be shared they are now located in a new artifact

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1202101 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
index 30d167aa5..2031fddc6 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
@@ -21,9 +21,8 @@
 
 # define our own action mapper here
 struts.mapper.class = org.apache.archiva.web.mapper.RepositoryActionMapper
-#struts.objectFactory =  org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
 
-## TODO olamy chech fix for https://issues.apache.org/jira/browse/WW-3460
+## TODO olamy check fix for https://issues.apache.org/jira/browse/WW-3460
 ## upgrade of struts version or use our own hacked ObjectFactory
 struts.objectFactory = org.apache.struts2.spring.StrutsSpringObjectFactory
 struts.objectFactory.spring.autoWire = type
@@ -44,4 +43,4 @@ struts.multipart.maxSize=10485760
 # TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes
 
 # Localization
-struts.custom.i18n.resources=org.codehaus.plexus.redback.struts2.default,org.apache.archiva.redback.custom
+struts.custom.i18n.resources=org.codehaus.redback.i18n.default,org.apache.archiva.redback.custom
diff --git a/pom.xml b/pom.xml
index bf447bdf6..835944b3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1714,18 +1714,6 @@
             <enabled>true</enabled>
           </snapshots>
         </repository>
-        <repository>
-          <id>p.apache.snapshots</id>
-          <name>Old Apache Snapshots</name>
-          <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-
       </repositories>
       <pluginRepositories>
         <pluginRepository>
@@ -1739,17 +1727,6 @@
             <enabled>true</enabled>
           </snapshots>
         </pluginRepository>
-        <pluginRepository>
-          <id>p.apache.snapshots</id>
-          <name>Old Apache Snapshots</name>
-          <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
       </pluginRepositories>
     </profile>
     <!--