You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2009/12/10 15:22:31 UTC
svn commit: r889274 - in /incubator/openwebbeans/trunk: pom.xml
samples/ejb-sample/pom.xml samples/reservation/pom.xml webbeans-jpa/pom.xml
webbeans-porting/pom.xml webbeans-resource/pom.xml webbeans-tck/pom.xml
Author: struberg
Date: Thu Dec 10 14:22:30 2009
New Revision: 889274
URL: http://svn.apache.org/viewvc?rev=889274&view=rev
Log:
OWB-186 upgrade to JPA2
OWB-56 TCK improvement. We don't need to unpack all dependencies to local libs,
it's enough if they are available as dependencies.
Modified:
incubator/openwebbeans/trunk/pom.xml
incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml
incubator/openwebbeans/trunk/samples/reservation/pom.xml
incubator/openwebbeans/trunk/webbeans-jpa/pom.xml
incubator/openwebbeans/trunk/webbeans-porting/pom.xml
incubator/openwebbeans/trunk/webbeans-resource/pom.xml
incubator/openwebbeans/trunk/webbeans-tck/pom.xml
Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=889274&r1=889273&r2=889274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Thu Dec 10 14:22:30 2009
@@ -348,6 +348,9 @@
<repositories>
+<!--
+ WE MUST ASAP GET RID OF THOSE REPOSITORIES!
+-->
<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
@@ -358,14 +361,12 @@
<id>java.net2</id>
<url>http://download.java.net/maven/2</url>
</repository>
-
<repository>
<releases />
<id>repository.jboss.org</id>
<name>JBoss Repository</name>
<url>http://repository.jboss.org/maven2</url>
</repository>
-
<repository>
<id>snapshots.jboss.org</id>
<name>JBoss Snapshots Repository</name>
@@ -467,8 +468,8 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1.1</version>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.0-PFD2</version>
</dependency>
<dependency>
Modified: incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml?rev=889274&r1=889273&r2=889274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml Thu Dec 10 14:22:30 2009
@@ -140,7 +140,7 @@
<!-- JPA API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: incubator/openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/pom.xml?rev=889274&r1=889273&r2=889274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/reservation/pom.xml Thu Dec 10 14:22:30 2009
@@ -80,7 +80,7 @@
<!-- JPA API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -156,7 +156,7 @@
<!-- JPA API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
</dependency>
<!-- Interceptor API -->
@@ -169,7 +169,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>1.2.0</version>
+ <version>2.0.0-M3</version>
</dependency>
</dependencies>
@@ -184,6 +184,41 @@
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <configuration>
+ <includes>org/apache/webbeans/reservation/entity/*.class</includes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ <sqlAction>build</sqlAction>
+ <sqlFile>${project.build.directory}/database.sql</sqlFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>mappingtool</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>2.0.0-M3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
</plugins>
</build>
</profile>
Modified: incubator/openwebbeans/trunk/webbeans-jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-jpa/pom.xml?rev=889274&r1=889273&r2=889274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-jpa/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-jpa/pom.xml Thu Dec 10 14:22:30 2009
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
<optional>true</optional>
</dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>1.2.0</version>
+ <version>2.0.0-M3</version>
<scope>test</scope>
</dependency>
Modified: incubator/openwebbeans/trunk/webbeans-porting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-porting/pom.xml?rev=889274&r1=889273&r2=889274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-porting/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-porting/pom.xml Thu Dec 10 14:22:30 2009
@@ -48,41 +48,46 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>1.0.0-CR2</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_3.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- <version>1.0.0-CR2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ </dependency>
-</dependencies>
+ </dependencies>
</project>
Modified: incubator/openwebbeans/trunk/webbeans-resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-resource/pom.xml?rev=889274&r1=889273&r2=889274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-resource/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-resource/pom.xml Thu Dec 10 14:22:30 2009
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
<optional>true</optional>
</dependency>
Modified: incubator/openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-tck/pom.xml?rev=889274&r1=889273&r2=889274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-tck/pom.xml Thu Dec 10 14:22:30 2009
@@ -33,51 +33,81 @@
<description>All TCK tests for the OpenWebBeans Implementation</description>
<properties>
- <webbeans.tck.version>1.0.0</webbeans.tck.version>
+ <webbeans.tck.version>1.1.0-SNAPSHOT</webbeans.tck.version>
</properties>
-
+
<dependencies>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-porting</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-tomcat</artifactId>
- <version>1.1.0-CR3</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>${webbeans.tck.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>jsr299-api</artifactId>
- <groupId>org.jboss.webbeans</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-porting</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-geronimo</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-tomcat</artifactId>
+ <version>1.1.0-CR3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>${webbeans.tck.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsr299-api</artifactId>
+ <groupId>org.jboss.webbeans</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+ </dependencies>
<build>
@@ -103,72 +133,8 @@
<classifier>suite</classifier>
<overWrite>true</overWrite>
</artifactItem>
-
- <!-- OWB Porting Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-porting</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- OWB Implementation Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- OWB JSF Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- MyFaces API Package -->
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- MyFaces Impl Package -->
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- OWB EJB Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ejb</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- OWB Resource Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
-
- <!-- OWB Geronimo Plugin Package -->
- <artifactItem>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-geronimo</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- <!-- Dom4j -->
+<!-- most probably of no use
<artifactItem>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
@@ -176,7 +142,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- javassist -->
<artifactItem>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
@@ -184,7 +149,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- scannotation -->
<artifactItem>
<groupId>net.sf.scannotation</groupId>
<artifactId>scannotation</artifactId>
@@ -192,7 +156,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- commons-logging -->
<artifactItem>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -201,7 +164,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- commons-digester -->
<artifactItem>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
@@ -210,7 +172,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- commons-validator -->
<artifactItem>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
@@ -219,7 +180,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- commons-collections -->
<artifactItem>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -228,7 +188,6 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- commons-beanutils -->
<artifactItem>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -247,7 +206,6 @@
</artifactItem>
- <!-- xml-apis -->
<artifactItem>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -256,14 +214,13 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
- <!-- log4j -->
<artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
-
+ -->
</artifactItems>
</configuration>
</execution>