You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/01/03 19:01:11 UTC
svn commit: r1428516 - in /rave/branches/mongo: ./
rave-custom-project-archetype/ rave-custom-project-archetype/src/
rave-custom-project-archetype/src/main/
rave-custom-project-archetype/src/main/resources/
rave-custom-project-archetype/src/main/resour...
Author: mfranklin
Date: Thu Jan 3 18:01:10 2013
New Revision: 1428516
URL: http://svn.apache.org/viewvc?rev=1428516&view=rev
Log:
Merged in changes from trunk
Added:
rave/branches/mongo/rave-custom-project-archetype/ (props changed)
- copied from r1428505, rave/trunk/rave-custom-project-archetype/
rave/branches/mongo/rave-custom-project-archetype/pom.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/pom.xml
rave/branches/mongo/rave-custom-project-archetype/src/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/
rave/branches/mongo/rave-custom-project-archetype/src/main/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/META-INF/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/META-INF/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/META-INF/maven/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/META-INF/maven/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf/tomcat-users.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/dist/conf/tomcat-users.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags/custom_css.tag
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/tags/custom_css.tag
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css/custom.css
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/static/css/custom.css
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources/log4j.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/resources/log4j.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF/
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/src/main/webapp/WEB-INF/web.xml
rave/branches/mongo/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml
rave/branches/mongo/rave-custom-project-archetype/src/test/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/test/
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/test/resources/
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/test/resources/projects/
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/basic/
- copied from r1428505, rave/trunk/rave-custom-project-archetype/src/test/resources/projects/basic/
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/basic/archetype.properties
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/test/resources/projects/basic/archetype.properties
rave/branches/mongo/rave-custom-project-archetype/src/test/resources/projects/basic/goal.txt
- copied unchanged from r1428505, rave/trunk/rave-custom-project-archetype/src/test/resources/projects/basic/goal.txt
Modified:
rave/branches/mongo/ (props changed)
rave/branches/mongo/pom.xml
rave/branches/mongo/rave-integration-tests/pom.xml
rave/branches/mongo/rave-portal/pom.xml
Propchange: rave/branches/mongo/
------------------------------------------------------------------------------
Merged /rave/trunk:r1426641-1428505
Modified: rave/branches/mongo/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/mongo/pom.xml?rev=1428516&r1=1428515&r2=1428516&view=diff
==============================================================================
--- rave/branches/mongo/pom.xml (original)
+++ rave/branches/mongo/pom.xml Thu Jan 3 18:01:10 2013
@@ -87,6 +87,7 @@
$mvn filesync:generate -Dmaven.filesync.override=true -->
<maven.filesync.override>false</maven.filesync.override>
+ <cargo.version>1.3.1</cargo.version>
<!-- default empty javaagent
if needed you can specify it on the command line with -Djavaagent="..." -->
<javaagent/>
@@ -728,6 +729,7 @@
<module>rave-demo-gadgets</module>
<module>rave-portal</module>
<module>rave-integration-tests</module>
+ <module>rave-custom-project-archetype</module>
</modules>
<profiles>
<profile>
Propchange: rave/branches/mongo/rave-custom-project-archetype/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 3 18:01:10 2013
@@ -0,0 +1,5 @@
+.project
+.settings
+.classpath
+*.iml
+target
Modified: rave/branches/mongo/rave-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-integration-tests/pom.xml?rev=1428516&r1=1428515&r2=1428516&view=diff
==============================================================================
--- rave/branches/mongo/rave-integration-tests/pom.xml (original)
+++ rave/branches/mongo/rave-integration-tests/pom.xml Thu Jan 3 18:01:10 2013
@@ -46,7 +46,6 @@
<meta.filter />
<!-- Cargo configuration properties -->
- <cargo.version>1.3.1</cargo.version>
<!-- if you want a remote debugging on a different a address
override on command line with -Dcargo.debug.addres=xxxx -->
<cargo.debug.address>8000</cargo.debug.address>
Modified: rave/branches/mongo/rave-portal/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal/pom.xml?rev=1428516&r1=1428515&r2=1428516&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal/pom.xml (original)
+++ rave/branches/mongo/rave-portal/pom.xml Thu Jan 3 18:01:10 2013
@@ -33,7 +33,6 @@
<packaging>war</packaging>
<properties>
- <cargo.version>1.3.1</cargo.version>
<!-- if you want a remote debugging on a different a address
override on command line with -Dcargo.debug.addres=xxxx -->
<cargo.debug.address>8000</cargo.debug.address>