incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r919535 - in /incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa: pom.xml src/main/java/org/apache/aries/samples/blog/persistence/entity/EntryImpl.java src/main/resources/META-INF/persistence.xml
Date Fri, 05 Mar 2010 18:34:31 GMT
Author: zoe
Date: Fri Mar  5 18:34:31 2010
New Revision: 919535

URL: http://svn.apache.org/viewvc?rev=919535&view=rev
Log:
ARIES-199 code fixes

Modified:
    incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/entity/EntryImpl.java
    incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml

Modified: incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/pom.xml?rev=919535&r1=919534&r2=919535&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/pom.xml Fri Mar  5 18:34:31
2010
@@ -1,71 +1,127 @@
 <?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.
--->
-<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.aries.blog-sample</groupId>
-        <artifactId>blog-sample</artifactId>
-        <version>0.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.aries.samples</groupId>
-    <artifactId>blog-persistence-jpa</artifactId>
-    <name>Apache Aries blog sample persistence</name>
-    <packaging>bundle</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${pom.groupId}.blog-persistence</Bundle-SymbolicName>
-                        <Export-Package>!org.apache.aries.samples.*</Export-Package>
-                        <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.aries.samples</groupId>
-            <artifactId>blog-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
+	<!--
+		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.
+	-->
+<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.aries.blog-sample</groupId>
+		<artifactId>blog-sample</artifactId>
+		<version>0.1-incubating-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.aries.samples</groupId>
+	<artifactId>blog-persistence-jpa</artifactId>
+	<name>Apache Aries blog sample persistence</name>
+	<packaging>bundle</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${pom.groupId}.blog-persistence</Bundle-SymbolicName>
+						<Export-Package>!org.apache.aries.samples.*</Export-Package>
+						<Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<configuration>
+							<tasks>
+								<path id="enhance.path.ref">
+									<fileset dir="${project.build.outputDirectory}">
+										<include name="AuthorImpl.class" />
+										<include name="EntryImpl.class" /> 
+									</fileset>
+								</path>
+								<pathconvert property="enhance.files" refid="enhance.path.ref"
+									pathsep=" " />
+								<java classname="org.apache.openjpa.enhance.PCEnhancer">
+									<arg line="-p persistence.xml" />
+									<arg line="${enhance.files}" />
+									<classpath>
+										<path refid="maven.dependency.classpath" />
+										<path refid="maven.compile.classpath" />
+									</classpath>
+								</java>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.aries.samples</groupId>
+			<artifactId>blog-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_2.0_spec</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jta_1.1_spec</artifactId>
 		</dependency>
-    </dependencies>
+
+		<dependency>
+			<groupId>org.apache.openjpa</groupId>
+			<artifactId>openjpa</artifactId>
+		</dependency>
+
+
+		<!-- OpenJPA PCEnhancer depends -->
+		<dependency>
+			<groupId>net.sourceforge.serp</groupId>
+			<artifactId>serp</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!-- end OpenJPA PCEnhancer depends -->
+
+	</dependencies>
 
 </project>

Modified: incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/entity/EntryImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/entity/EntryImpl.java?rev=919535&r1=919534&r2=919535&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/entity/EntryImpl.java
(original)
+++ incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/entity/EntryImpl.java
Fri Mar  5 18:34:31 2010
@@ -21,6 +21,9 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
 import org.apache.aries.samples.blog.persistence.api.Entry;
 
 
@@ -28,7 +31,8 @@
 /**
  * This class represents a blog entry
  */
-
+@Entity(name = "BLOGENTRY")
+@Table(name = "BLOGENTRY")
 public class EntryImpl implements Entry
 {
   /** An auto-generated primary key */

Modified: incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml?rev=919535&r1=919534&r2=919535&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml
(original)
+++ incubator/aries/trunk/samples/blog-sample/blog-persistence-jpa/src/main/resources/META-INF/persistence.xml
Fri Mar  5 18:34:31 2010
@@ -29,7 +29,7 @@
 
     <class>org.apache.aries.samples.blog.persistence.entity.AuthorImpl</class>
     <class>org.apache.aries.samples.blog.persistence.entity.EntryImpl</class>
-    <exclude-unlisted-classes/>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
     
     
      <properties>



Mime
View raw message