You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/07/30 15:12:06 UTC
svn commit: r980779 - in /openjpa/trunk/openjpa-examples:
image-gallery/pom.xml openbooks/pom.xml pom.xml simple/ simple/pom.xml
simple/src/ src/
Author: dwoods
Date: Fri Jul 30 13:12:06 2010
New Revision: 980779
URL: http://svn.apache.org/viewvc?rev=980779&view=rev
Log:
OPENJPA-1751 Move existing samples to a simple module, so we can include image-gallery and openbooks in the maven builds
Added:
openjpa/trunk/openjpa-examples/pom.xml
openjpa/trunk/openjpa-examples/simple/
openjpa/trunk/openjpa-examples/simple/pom.xml
- copied, changed from r980762, openjpa/trunk/openjpa-examples/pom.xml
openjpa/trunk/openjpa-examples/simple/src/
- copied from r980762, openjpa/trunk/openjpa-examples/src/
Removed:
openjpa/trunk/openjpa-examples/src/
Modified:
openjpa/trunk/openjpa-examples/image-gallery/pom.xml
openjpa/trunk/openjpa-examples/openbooks/pom.xml
Modified: openjpa/trunk/openjpa-examples/image-gallery/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/image-gallery/pom.xml?rev=980779&r1=980778&r2=980779&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/image-gallery/pom.xml Fri Jul 30 13:12:06 2010
@@ -34,12 +34,10 @@
<artifactId>image-gallery</artifactId>
<packaging>jar</packaging>
- <name>Apache OpenJPA :: Examples - image-gallery</name>
- <url>http://openjpa.apache.org/samples.html</url>
+ <name>OpenJPA Examples - image-gallery</name>
+ <description>Apache OpenJPA Examples - image-gallery</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
<checkstyle.config.location>../../openjpa-project/checkstyle.xml</checkstyle.config.location>
<test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
<test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
@@ -137,7 +135,7 @@
<includes>org/apache/openjpa/examples/gallery/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- <persistenceXmlFile>src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
+ <persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
</configuration>
<executions>
<execution>
@@ -152,7 +150,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
Modified: openjpa/trunk/openjpa-examples/openbooks/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/pom.xml?rev=980779&r1=980778&r2=980779&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/openbooks/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/openbooks/pom.xml Fri Jul 30 13:12:06 2010
@@ -35,11 +35,11 @@
<groupId>org.apache.openjpa.openjpa-examples</groupId>
<artifactId>openbooks</artifactId>
<packaging>jar</packaging>
- <name>Apache OpenJPA :: Examples - OpenBooks</name>
- <description>OpenJPA Examples - OpenBooks</description>
+
+ <name>OpenJPA Examples - OpenBooks</name>
+ <description>Apache OpenJPA Examples - OpenBooks</description>
<properties>
- <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
<checkstyle.config.location>../../openjpa-project/checkstyle.xml</checkstyle.config.location>
</properties>
Added: openjpa/trunk/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/pom.xml?rev=980779&view=auto
==============================================================================
--- openjpa/trunk/openjpa-examples/pom.xml (added)
+++ openjpa/trunk/openjpa-examples/pom.xml Fri Jul 30 13:12:06 2010
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Please keep the project tag on one line to avoid confusing
+ the release plugin.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>openjpa-examples</artifactId>
+ <packaging>pom</packaging>
+
+ <name>OpenJPA Examples</name>
+ <description>Apache OpenJPA Examples</description>
+
+ <url>http://openjpa.apache.org/samples.html</url>
+
+ <properties>
+ <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
+ <checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
+ </properties>
+
+ <modules>
+ <module>simple</module>
+ <module>image-gallery</module>
+ <module>openbooks</module>
+ </modules>
+</project>
Copied: openjpa/trunk/openjpa-examples/simple/pom.xml (from r980762, openjpa/trunk/openjpa-examples/pom.xml)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/simple/pom.xml?p2=openjpa/trunk/openjpa-examples/simple/pom.xml&p1=openjpa/trunk/openjpa-examples/pom.xml&r1=980762&r2=980779&rev=980779&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/simple/pom.xml Fri Jul 30 13:12:06 2010
@@ -27,16 +27,20 @@
<parent>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-parent</artifactId>
+ <artifactId>openjpa-examples</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-examples</artifactId>
+ <groupId>org.apache.openjpa.openjpa-examples</groupId>
+ <artifactId>simple</artifactId>
<packaging>jar</packaging>
- <name>OpenJPA Examples</name>
- <description>OpenJPA Examples</description>
+ <name>OpenJPA Examples - Simple</name>
+ <description>Apache OpenJPA Examples - Simple</description>
+
+ <properties>
+ <checkstyle.config.location>../../openjpa-project/checkstyle.xml</checkstyle.config.location>
+ </properties>
<dependencies>
<dependency>