You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2014/02/05 15:32:14 UTC
svn commit: r1564787 - in /wookie/trunk: ./ wookie-server/
wookie-server/src/main/resources/META-INF/
wookie-server/src/main/webapp/META-INF/
wookie-services/wookie-jpa/src/main/resources/
wookie-services/wookie-jpa/src/main/resources/META-INF/ wookie-...
Author: scottbw
Date: Wed Feb 5 14:32:13 2014
New Revision: 1564787
URL: http://svn.apache.org/r1564787
Log:
migrated the persistence.xml and context.xml configuration from wookie-server to wookie-jpa
Added:
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/META-INF/
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/META-INF/persistence.xml
- copied unchanged from r1564424, wookie/trunk/wookie-server/src/main/resources/META-INF/persistence.xml
wookie/trunk/wookie-services/wookie-jpa/src/main/webapp/META-INF/context.xml
- copied unchanged from r1564424, wookie/trunk/wookie-server/src/main/webapp/META-INF/context.xml
Removed:
wookie/trunk/wookie-server/src/main/resources/META-INF/persistence.xml
wookie/trunk/wookie-server/src/main/webapp/META-INF/context.xml
Modified:
wookie/trunk/ (props changed)
wookie/trunk/pom.xml
wookie/trunk/wookie-server/pom.xml
Propchange: wookie/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 5 14:32:13 2014
@@ -7,3 +7,4 @@ widgetDB
widgetDatabase
local.features.properties
local.opensocial.properties
+.classpath
Modified: wookie/trunk/pom.xml
URL: http://svn.apache.org/viewvc/wookie/trunk/pom.xml?rev=1564787&r1=1564786&r2=1564787&view=diff
==============================================================================
--- wookie/trunk/pom.xml (original)
+++ wookie/trunk/pom.xml Wed Feb 5 14:32:13 2014
@@ -42,6 +42,8 @@
<module>wookie-parser/java</module>
<module>wookie-connector/java</module>
<module>wookie-features</module>
+ <module>wookie-services/wookie-spi</module>
+ <module>wookie-services/wookie-jpa</module>
<module>wookie-server</module>
</modules>
Modified: wookie/trunk/wookie-server/pom.xml
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/pom.xml?rev=1564787&r1=1564786&r2=1564787&view=diff
==============================================================================
--- wookie/trunk/wookie-server/pom.xml (original)
+++ wookie/trunk/wookie-server/pom.xml Wed Feb 5 14:32:13 2014
@@ -54,7 +54,21 @@
<javaagent />
</properties>
- <dependencies>
+ <dependencies>
+
+ <!-- Service Provider -->
+ <dependency>
+ <groupId>org.apache.wookie</groupId>
+ <artifactId>wookie-spi</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wookie</groupId>
+ <artifactId>wookie-jpa</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.wookie</groupId>
<artifactId>wookie-java-connector</artifactId>
@@ -385,6 +399,23 @@
</dependency>
</dependencies>
</plugin>
+
+ <!-- Include the context.xml from wookie-jpa -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <overlays>
+ <overlay>
+ <excludes>
+ </excludes>
+ <groupId>org.apache.wookie</groupId>
+ <artifactId>wookie-jpa</artifactId>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
</plugins>
</build>