Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2011-11-15 09:03:47 +00:00
parent 09d0dd1c0e
commit 6d91ae5d63
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
View File

@ -21,9 +21,8 @@
# define our own action mapper here # define our own action mapper here
struts.mapper.class = org.apache.archiva.web.mapper.RepositoryActionMapper 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 ## upgrade of struts version or use our own hacked ObjectFactory
struts.objectFactory = org.apache.struts2.spring.StrutsSpringObjectFactory struts.objectFactory = org.apache.struts2.spring.StrutsSpringObjectFactory
struts.objectFactory.spring.autoWire = type 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 # TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes
# Localization # 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

23
pom.xml
View File

@ -1714,18 +1714,6 @@
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
</repository> </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> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
@ -1739,17 +1727,6 @@
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
</pluginRepository> </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> </pluginRepositories>
</profile> </profile>
<!-- <!--