You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2013/09/13 15:28:50 UTC

git commit: Issue OLINGO-16 - add JPA ref scenario to distribution package

Updated Branches:
  refs/heads/master 1b9ae13f4 -> 336528180


Issue OLINGO-16 - add JPA ref scenario to distribution package


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/33652818
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/33652818
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/33652818

Branch: refs/heads/master
Commit: 3365281809055535302e31dd46010a68d0d9c884
Parents: 1b9ae13
Author: Stephan Klevenz <sk...@apache.org>
Authored: Fri Sep 13 15:26:56 2013 +0200
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Fri Sep 13 15:28:39 2013 +0200

----------------------------------------------------------------------
 odata-dist/src/main/assembly/ref-assembly.xml | 7 +++++++
 pom.xml                                       | 2 ++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/33652818/odata-dist/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata-dist/src/main/assembly/ref-assembly.xml b/odata-dist/src/main/assembly/ref-assembly.xml
index 2094b4f..e975f11 100644
--- a/odata-dist/src/main/assembly/ref-assembly.xml
+++ b/odata-dist/src/main/assembly/ref-assembly.xml
@@ -25,6 +25,13 @@
                 <include>**/*.war</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <directory>${basedir}/../jpa-web/target</directory>
+            <includes>
+                <include>**/*.war</include>
+            </includes>
+        </fileSet>
 
         <fileSet>
             <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/33652818/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7a8a01d..1cfb033 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,8 @@
         <module>jpa-annotation</module>
         <module>jpa-api</module>
         <module>jpa-core</module>
+        <module>jpa-ref</module>
+        <module>jpa-web</module>
         <module>odata-dist</module>
     </modules>