Author: mfranklin
Date: Fri Dec 28 20:27:39 2012
New Revision: 1426622
URL: http://svn.apache.org/viewvc?rev=1426622&view=rev
Log:
Finished build profiles for jpa & maven
Added:
rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/
rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/dataContext.xml
- copied, changed from r1426613,
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/db/
- copied from r1426551,
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/db/
rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/
rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/dataContext.xml
- copied, changed from r1426613,
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/db/
rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/db/initial-data.json
- copied unchanged from r1426551,
rave/branches/mongo/rave-portal-resources/src/main/resources/initial-data.json
Removed:
rave/branches/mongo/rave-portal-resources/src/main/resources/initial-data.json
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/db/
Modified:
rave/branches/mongo/pom.xml
rave/branches/mongo/rave-portal-resources/pom.xml
Modified: rave/branches/mongo/pom.xml
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/pom.xml?rev=1426622&r1=1426621&r2=1426622&view=diff
==============================================================================
--- rave/branches/mongo/pom.xml (original)
+++ rave/branches/mongo/pom.xml Fri Dec 28 20:27:39 2012
@@ -90,6 +90,7 @@
<!-- default empty javaagent
if needed you can specify it on the command line with
-Djavaagent="..." -->
<javaagent/>
+ <maven-war-plugin.version>2.3</maven-war-plugin.version>
</properties>
<repositories>
@@ -602,7 +603,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ <version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.googlecode.mavenfilesync</groupId>
Modified: rave/branches/mongo/rave-portal-resources/pom.xml
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/pom.xml?rev=1426622&r1=1426621&r2=1426622&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/pom.xml (original)
+++ rave/branches/mongo/rave-portal-resources/pom.xml Fri Dec 28 20:27:39 2012
@@ -159,4 +159,57 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jpa</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <webResources>
+ <resource>
+
<directory>src/main/resources_jpa</directory>
+ <targetPath>WEB-INF/</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>mongodb</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ <configuration>
+ <webResources>
+ <resource>
+
<directory>src/main/resources_mongo</directory>
+ <targetPath>WEB-INF/</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Copied:
rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/dataContext.xml
(from r1426613,
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml)
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/dataContext.xml?p2=rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/dataContext.xml&p1=rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml&r1=1426613&r2=1426622&rev=1426622&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/dataContext.xml
Fri Dec 28 20:27:39 2012
@@ -31,26 +31,15 @@
<property name="executeScriptQuery" value="SELECT * FROM WIDGET"/>
<property name="scriptLocations">
<list>
- <!--<value>/WEB-INF/db/initial_data.sql</value>-->
- </list>
- </property>
- </bean>
-
- <bean id="dataImporter"
class="org.apache.rave.portal.util.data.DataImporter">
- <property name="dataExecutor">
- <bean
class="org.apache.rave.portal.util.data.DataImporter$ExecutorImpl" />
- </property>
- <property name="scriptLocations">
- <list>
- <value>classpath:initial-data.json</value>
+ <value>/WEB-INF/db/initial_data.sql</value>
</list>
</property>
</bean>
<!-- provides a H2 console to look into the db if necessary -->
-<!-- <bean id="org.h2.tools.Server-WebServer" class="org.h2.tools.Server"
+ <bean id="org.h2.tools.Server-WebServer" class="org.h2.tools.Server"
factory-method="createWebServer" depends-on="dataSource"
init-method="start" lazy-init="false" destroy-method="stop">
<constructor-arg value="-web,-webPort,11111"/>
- </bean>-->
+ </bean>
</beans>
\ No newline at end of file
Copied:
rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/dataContext.xml
(from r1426613,
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml)
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/dataContext.xml?p2=rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/dataContext.xml&p1=rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml&r1=1426613&r2=1426622&rev=1426622&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/dataContext.xml
Fri Dec 28 20:27:39 2012
@@ -22,19 +22,6 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <!--
- Bean that executes the given set of resources (SQL scripts) in order
- To remove runtime initialization of initial data, remove this bean and
change the entity manager factory to the default
- Spring implementation
- -->
- <bean id="dataSourcePopulator"
class="org.apache.rave.jdbc.util.DataSourcePopulator">
- <property name="executeScriptQuery" value="SELECT * FROM WIDGET"/>
- <property name="scriptLocations">
- <list>
- <!--<value>/WEB-INF/db/initial_data.sql</value>-->
- </list>
- </property>
- </bean>
<bean id="dataImporter"
class="org.apache.rave.portal.util.data.DataImporter">
<property name="dataExecutor">
@@ -42,15 +29,8 @@
</property>
<property name="scriptLocations">
<list>
- <value>classpath:initial-data.json</value>
+ <value>/WEB-INF/db/initial-data.json</value>
</list>
</property>
</bean>
-
- <!-- provides a H2 console to look into the db if necessary -->
-<!-- <bean id="org.h2.tools.Server-WebServer" class="org.h2.tools.Server"
- factory-method="createWebServer" depends-on="dataSource"
- init-method="start" lazy-init="false" destroy-method="stop">
- <constructor-arg value="-web,-webPort,11111"/>
- </bean>-->
</beans>
\ No newline at end of file
