i18n resources from redback now have a new package as to be shared they are now locat...

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 30d167aa5363eeb9abcfd8a896f6b6d7ed36d84a..2031fddc61309283fd5dbc2275ca228b6b3ab987 100644 (file)
--- 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 bf447bdf65ecb5a65140c80a2b967d001cc5bb43..835944b3ee47caec2fd9b4638ac8c7f099edcdd7 100644 (file)
--- 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>
     <!--