You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2012/12/29 14:58:07 UTC

svn commit: r1426764 - in /rave/sandbox/rave-extensions/rave-vanilla-extension: pom.xml rave-vanilla-extension-portal/pom.xml rave-vanilla-extension-portal/src/main/dist/conf/ rave-vanilla-extension-portal/src/main/dist/conf/tomcat-users.xml

Author: jasha
Date: Sat Dec 29 13:58:07 2012
New Revision: 1426764

URL: http://svn.apache.org/viewvc?rev=1426764&view=rev
Log:
Add Wookie container to the vanilla extension

Added:
    rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/conf/
    rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/dist/conf/tomcat-users.xml
      - copied unchanged from r1426754, rave/trunk/rave-portal-resources/src/main/dist/conf/tomcat-users.xml
Modified:
    rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml
    rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml

Modified: rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml?rev=1426764&r1=1426763&r2=1426764&view=diff
==============================================================================
--- rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml (original)
+++ rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml Sat Dec 29 13:58:07 2012
@@ -33,6 +33,7 @@
   <version>0.19-SNAPSHOT</version>
   <properties>
     <apache.rave.version>0.19-SNAPSHOT</apache.rave.version>
+    <apache.wookie.version>0.10.0-incubating</apache.wookie.version>
     <com.h2database.version>1.3.170</com.h2database.version>
     <org.springframework.version>3.2.0.RELEASE</org.springframework.version>
     <javax.servlet.version>2.5</javax.servlet.version>

Modified: rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml?rev=1426764&r1=1426763&r2=1426764&view=diff
==============================================================================
--- rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml (original)
+++ rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml Sat Dec 29 13:58:07 2012
@@ -142,6 +142,14 @@ override on command line with -Dcargo.de
     </dependency>
 
     <dependency>
+      <groupId>org.apache.wookie</groupId>
+      <artifactId>wookie</artifactId>
+      <type>war</type>
+      <version>${apache.wookie.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.rave</groupId>
       <artifactId>rave-demo-gadgets</artifactId>
       <type>war</type>
@@ -252,6 +260,14 @@ override on command line with -Dcargo.de
                           <context>/portal</context>
                       </properties>
                   </deployable>
+                  <deployable>
+                      <groupId>org.apache.wookie</groupId>
+                      <artifactId>wookie</artifactId>
+                      <type>war</type>
+                      <properties>
+                          <context>/wookie</context>
+                      </properties>
+                  </deployable>
               </deployables>
               <configuration>
                   <properties>
@@ -261,6 +277,13 @@ override on command line with -Dcargo.de
                       <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
                   </properties>
                   <home>${project.build.directory}/tomcat6x</home>
+                  <configfiles>
+                      <configfile>
+                          <file>${project.basedir}/../rave-vanilla-extension-portal/src/main/dist/conf/tomcat-users.xml</file>
+                          <todir>conf/</todir>
+                          <tofile>tomcat-users.xml</tofile>
+                      </configfile>
+                  </configfiles>
               </configuration>
               <container>
                   <containerId>tomcat6x</containerId>