Author: jasha
Date: Sat Aug 10 11:52:07 2013
New Revision: 1512653
URL: http://svn.apache.org/r1512653
Log:
RAVE-949 update archetype so it will actually run after the build
Modified:
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml
Modified:
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml?rev=1512653&r1=1512652&r2=1512653&view=diff
==============================================================================
---
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
(original)
+++
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
Sat Aug 10 11:52:07 2013
@@ -277,6 +277,20 @@
</deployables>
<configuration>
<properties>
+ <cargo.datasource.datasource.portalDB>
+ cargo.datasource.jndi=jdbc/ravePortalDB|
+
cargo.datasource.driver=${portal.dataSource.driver}|
+ cargo.datasource.url=${portal.dataSource.url}|
+
cargo.datasource.username=${portal.dataSource.username}|
+
cargo.datasource.password=${portal.dataSource.password}
+ </cargo.datasource.datasource.portalDB>
+ <cargo.datasource.datasource.shindigDB>
+ cargo.datasource.jndi=jdbc/raveShindigDB|
+
cargo.datasource.driver=${shindig.dataSource.driver}|
+ cargo.datasource.url=${shindig.dataSource.url}|
+
cargo.datasource.username=${shindig.dataSource.username}|
+
cargo.datasource.password=${shindig.dataSource.password}
+ </cargo.datasource.datasource.shindigDB>
<cargo.jvmargs><![CDATA[-Dh2.bindAddress="localhost" -Xdebug
-Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend}
-noverify ${javaagent} ${cargo.args}]]></cargo.jvmargs>
<cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
</properties>
@@ -311,6 +325,23 @@
<shindig.contextroot />
-->
</systemProperties>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <classpath>shared</classpath>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <classpath>shared</classpath>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <classpath>extra</classpath>
+ </dependency>
+ </dependencies>
</container>
</configuration>
</plugin>
Modified:
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1512653&r1=1512652&r2=1512653&view=diff
==============================================================================
---
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
(original)
+++
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
Sat Aug 10 11:52:07 2013
@@ -95,5 +95,6 @@
<!-- Need to define customUserService because its package is not scanned
automatically -->
<bean id="customUserService" class="${package}.CustomUserService"/>
-
+ <!-- Override the default "userService" bean alias -->
+ <alias name="customUserService" alias="userService"/>
</beans>
Modified:
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml?rev=1512653&r1=1512652&r2=1512653&view=diff
==============================================================================
---
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml
(original)
+++
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/web.xml
Sat Aug 10 11:52:07 2013
@@ -31,8 +31,8 @@
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
- /WEB-INF/dataContext.xml
/WEB-INF/applicationContext.xml
+ /WEB-INF/dataContext.xml
/WEB-INF/applicationContext-security.xml
</param-value>
</context-param>
@@ -68,6 +68,17 @@
<url-pattern>/login</url-pattern>
</servlet-mapping>
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/api/*</url-pattern>
+ </servlet-mapping>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
Modified:
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml?rev=1512653&r1=1512652&r2=1512653&view=diff
==============================================================================
---
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml
(original)
+++
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-shindig/pom.xml
Sat Aug 10 11:52:07 2013
@@ -36,6 +36,20 @@
<artifactId>rave-shindig-dependencies</artifactId>
<type>pom</type>
<version>${apache.rave.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-jpa</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rave</groupId>
@@ -43,6 +57,26 @@
<type>war</type>
<version>${apache.rave.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${shindig.json.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-jpa</artifactId>
+ <version>${apache.rave.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified:
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml?rev=1512653&r1=1512652&r2=1512653&view=diff
==============================================================================
---
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/pom.xml
Sat Aug 10 11:52:07 2013
@@ -34,6 +34,7 @@
<javax.servlet.version>${javax.servlet.version}</javax.servlet.version>
<javax.mail.version>${javax.mail.version}</javax.mail.version>
<jsp-api.version>${jsp-api.version}</jsp-api.version>
+ <shindig.json.version>20070829</shindig.json.version>
<el-api.version>${el-api.version}</el-api.version>
<org.slf4j.version>${org.slf4j.version}</org.slf4j.version>
<log4j.version>${log4j.version}</log4j.version>
@@ -41,9 +42,22 @@
<commons-lang.version>${commons-lang.version}</commons-lang.version>
<junit.version>${junit.version}</junit.version>
<easymock.version>${easymock.version}</easymock.version>
-
+ <tomcat.version>${tomcat.version}</tomcat.version>
<cargo.version>${cargo.version}</cargo.version>
- <javaagent/>
+
+ <!-- Rave Portal default jdbc datasource configuration: using rave default
configuration shared with Shindig -->
+
<portal.dataSource.driver>${rave.dataSource.driver}</portal.dataSource.driver>
+ <portal.dataSource.url>${rave.dataSource.url}</portal.dataSource.url>
+
<portal.dataSource.username>${rave.dataSource.username}</portal.dataSource.username>
+
<portal.dataSource.password>${rave.dataSource.password}</portal.dataSource.password>
+
+ <!-- Rave Shindig default jdbc datasource configuration: using rave default
configuration shared with Portal -->
+
<shindig.dataSource.driver>${rave.dataSource.driver}</shindig.dataSource.driver>
+ <shindig.dataSource.url>${rave.dataSource.url}</shindig.dataSource.url>
+
<shindig.dataSource.username>${rave.dataSource.username}</shindig.dataSource.username>
+
<shindig.dataSource.password>${rave.dataSource.password}</shindig.dataSource.password>
+
+ <javaagent/>
<!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin
configuration with
$mvn filesync:generate -Dmaven.filesync.override=true -->
