Author: olamy
Date: Tue Nov 15 09:03:47 2011
New Revision: 1202101
URL: http://svn.apache.org/viewvc?rev=1202101&view=rev
Log:
i18n resources from redback now have a new package as to be shared they are now
located in a new artifact
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties?rev=1202101&r1=1202100&r2=1202101&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
Tue Nov 15 09:03:47 2011
@@ -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
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1202101&r1=1202100&r2=1202101&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Nov 15 09:03:47 2011
@@ -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>
<!--
