Revision 1428516

Jump to revision:
Author:	mfranklin
Date:	Thu Jan 3 18:01:10 2013 UTC (11 years, 3 months ago)
Changed paths:	50
Log Message:	Merged in changes from trunk

Changed paths

Path	Details
rave/branches/mongo/	modified , props changed
rave/branches/mongo/pom.xml	modified , text changed
rave/branches/mongo/rave-custom-project-archetype/ (Copied from rave/trunk/rave-custom-project-archetype, r1428505)	added , props changed
rave/branches/mongo/rave-custom-project-archetype/pom.xml (Copied from rave/trunk/rave-custom-project-archetype/pom.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/ (Copied from rave/trunk/rave-custom-project-archetype/src, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/ (Copied from rave/trunk/rave-custom-project-archetype/src/main, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/META-INF/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/META-INF, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/META-INF/maven/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/META-INF/maven, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf/tomcat-users.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf/tomcat-users.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags/custom_css.tag (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags/custom_css.tag, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css/custom.css (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css/custom.css, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources/log4j.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources/log4j.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF/ (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF/web.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF/web.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml (Copied from rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/test/ (Copied from rave/trunk/rave-custom-project-archetype/src/test, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/ (Copied from rave/trunk/rave-custom-project-archetype/src/test/resources, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/ (Copied from rave/trunk/rave-custom-project-archetype/src/test/resources/projects, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/basic/ (Copied from rave/trunk/rave-custom-project-archetype/src/test/resources/projects/basic, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/basic/archetype.properties (Copied from rave/trunk/rave-custom-project-archetype/src/test/resources/projects/basic/archetype.properties, r1428505)	replaced
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/basic/goal.txt (Copied from rave/trunk/rave-custom-project-archetype/src/test/resources/projects/basic/goal.txt, r1428505)	replaced
rave/branches/mongo/rave-integration-tests/pom.xml	modified , text changed
rave/branches/mongo/rave-portal/pom.xml	modified , text changed