commit fef2d3c84663da2ec53464e88bb715eae34301aa Author: gil puntogil@libero.it Date: Wed Jul 18 10:50:55 2012 +0200
Initial import (#823889)
.gitignore | 1 + openjpa-2.2.0-depmap | 14 + openjpa-2.2.0-jdbc-pom.patch | 19 + openjpa-2.2.0-jest-pom.patch | 13 + openjpa-2.2.0-kernel-pom.patch | 29 + openjpa-2.2.0-maven-plugin-pom.patch | 26 + openjpa-2.2.0-parent-pom.patch | 95 ++++ ...-persistence-jdbc-DynamicEnhancementSuite.patch | 11 + openjpa-2.2.0-persistence-pom.patch | 25 + openjpa-2.2.0-remove-checkstyle-plugin.patch | 56 ++ openjpa-2.2.0-remove-ianal-plugin.patch | 41 ++ openjpa-2.2.0-remove-test-profiles.patch | 547 ++++++++++++++++++++ openjpa-2.2.0-slice-pom.patch | 13 + openjpa-2.2.0-tools-it-poms.patch | 56 ++ openjpa.spec | 274 ++++++++++ sources | 1 + 16 files changed, 1221 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..93270ea 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/apache-openjpa-2.2.0-source.zip diff --git a/openjpa-2.2.0-depmap b/openjpa-2.2.0-depmap new file mode 100644 index 0000000..84bba9e --- /dev/null +++ b/openjpa-2.2.0-depmap @@ -0,0 +1,14 @@ +<dependencies> +<dependency> + <maven> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>tomcat-servlet-3.0-api</artifactId> + <version>7.0.27</version> + </jpp> +</dependency> +</dependencies> \ No newline at end of file diff --git a/openjpa-2.2.0-jdbc-pom.patch b/openjpa-2.2.0-jdbc-pom.patch new file mode 100644 index 0000000..595fb82 --- /dev/null +++ b/openjpa-2.2.0-jdbc-pom.patch @@ -0,0 +1,19 @@ +--- openjpa-jdbc/pom.xml 2012-02-16 09:33:44.000000000 +0100 ++++ openjpa-jdbc/pom.xml-gil 2012-04-06 14:27:21.311140021 +0200 +@@ -74,7 +74,7 @@ + <artifactId>ant</artifactId> + <scope>provided</scope> + </dependency> +- <dependency> ++ <!--dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock</artifactId> + <scope>test</scope> +@@ -83,6 +83,6 @@ + <groupId>org.jmock</groupId> + <artifactId>jmock-junit3</artifactId> + <scope>test</scope> +- </dependency> ++ </dependency--> + </dependencies> + </project> diff --git a/openjpa-2.2.0-jest-pom.patch b/openjpa-2.2.0-jest-pom.patch new file mode 100644 index 0000000..a561fad --- /dev/null +++ b/openjpa-2.2.0-jest-pom.patch @@ -0,0 +1,13 @@ +--- openjpa-jest/pom.xml 2012-02-16 09:33:44.000000000 +0100 ++++ openjpa-jest/pom.xml-gil 2012-04-06 22:42:32.834844708 +0200 +@@ -43,8 +43,8 @@ + <version>${project.version}</version> + </dependency> + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> diff --git a/openjpa-2.2.0-kernel-pom.patch b/openjpa-2.2.0-kernel-pom.patch new file mode 100644 index 0000000..1bae6cd --- /dev/null +++ b/openjpa-2.2.0-kernel-pom.patch @@ -0,0 +1,29 @@ +--- openjpa-kernel/pom.xml 2012-02-16 09:33:50.000000000 +0100 ++++ openjpa-kernel/pom.xml-gil 2012-04-06 14:16:16.494124253 +0200 +@@ -54,12 +54,12 @@ + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </dependency> +- <dependency> ++ <!--dependency> + <groupId>com.ibm.websphere</groupId> + <artifactId>websphere_uow_api</artifactId> + <version>0.0.1</version> + <scope>provided</scope> +- </dependency> ++ </dependency--> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> +@@ -68,9 +68,9 @@ + <!-- for osgi ManagedRuntime implementation, --> + <!-- we pull in OSGi core at the same level as Apache Aries --> + <dependency> +- <groupId>org.osgi</groupId> ++ <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> +- <version>4.2.0</version> ++ <version>1.4.0</version> + <scope>provided</scope> + </dependency> + <dependency> diff --git a/openjpa-2.2.0-maven-plugin-pom.patch b/openjpa-2.2.0-maven-plugin-pom.patch new file mode 100644 index 0000000..d01572b --- /dev/null +++ b/openjpa-2.2.0-maven-plugin-pom.patch @@ -0,0 +1,26 @@ +--- openjpa-tools/openjpa-maven-plugin/pom.xml 2012-02-16 09:33:42.000000000 +0100 ++++ openjpa-tools/openjpa-maven-plugin/pom.xml-gil 2012-04-06 19:17:32.924552983 +0200 +@@ -108,8 +108,8 @@ + </dependency> + + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> +@@ -117,7 +117,11 @@ + </dependency> + <dependency> + <groupId>org.apache.bval</groupId> +- <artifactId>org.apache.bval.bundle</artifactId> ++ <artifactId>bval-core</artifactId> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.bval</groupId> ++ <artifactId>bval-jsr303</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> diff --git a/openjpa-2.2.0-parent-pom.patch b/openjpa-2.2.0-parent-pom.patch new file mode 100644 index 0000000..546e3f5 --- /dev/null +++ b/openjpa-2.2.0-parent-pom.patch @@ -0,0 +1,95 @@ +--- pom.xml 2012-04-07 00:10:52.556970405 +0200 ++++ pom.xml-gil 2012-04-07 00:15:45.775977360 +0200 +@@ -480,8 +480,8 @@ + <version>1.13.1</version> + </dependency> + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.1</version> + </dependency> + <dependency> +@@ -501,7 +501,12 @@ + </dependency> + <dependency> + <groupId>org.apache.bval</groupId> +- <artifactId>org.apache.bval.bundle</artifactId> ++ <artifactId>bval-core</artifactId> ++ <version>0.3-incubating</version> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.bval</groupId> ++ <artifactId>bval-jsr303</artifactId> + <version>0.3-incubating</version> + </dependency> + <dependency> +@@ -565,7 +570,7 @@ + <artifactId>jmock</artifactId> + <version>2.5.1</version> + </dependency> +- <dependency> ++ <!--dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit3</artifactId> + <version>2.5.1</version> +@@ -579,7 +584,7 @@ + <groupId>net.sourceforge.findbugs</groupId> + <artifactId>annotations</artifactId> + <version>1.3.2</version> +- </dependency> ++ </dependency--> + </dependencies> + </dependencyManagement> + +@@ -690,11 +695,11 @@ + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.6</version> + </plugin> +- <plugin> ++ <!--plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.3.1</version> +- </plugin> ++ </plugin--> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> +@@ -760,11 +765,11 @@ + </dependency> + </dependencies> + </plugin> +- <plugin> ++ <!--plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>2.4</version> +- </plugin> ++ </plugin--> + <!--plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>ianal-maven-plugin</artifactId> +@@ -885,17 +890,17 @@ + </execution> + </executions> + </plugin> +- <plugin> ++ <!--plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.3.1</version> +- </plugin> ++ </plugin--> + <!-- Newer versions of plugin will cause PDF build failures --> +- <plugin> ++ <!--plugin> + <groupId>com.agilejava.docbkx</groupId> + <artifactId>docbkx-maven-plugin</artifactId> + <version>2.0.13</version> +- </plugin> ++ </plugin--> + + <!-- Ignore/Execute plugin execution --> + <plugin> diff --git a/openjpa-2.2.0-persistence-jdbc-DynamicEnhancementSuite.patch b/openjpa-2.2.0-persistence-jdbc-DynamicEnhancementSuite.patch new file mode 100644 index 0000000..cb0d1c1 --- /dev/null +++ b/openjpa-2.2.0-persistence-jdbc-DynamicEnhancementSuite.patch @@ -0,0 +1,11 @@ +--- openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java 2012-02-16 09:33:52.000000000 +0100 ++++ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java-gil 2012-04-06 15:20:03.131215012 +0200 +@@ -125,7 +125,7 @@ + // with the dynamic enhaner. + String test = System.getProperty("dynamicTest"); + if (test != null) { +- suite.addTestSuite(Class.forName(test)); ++ // suite.addTestSuite(Class.forName(test)); + } else { + + // Subclassing failing tests diff --git a/openjpa-2.2.0-persistence-pom.patch b/openjpa-2.2.0-persistence-pom.patch new file mode 100644 index 0000000..39f97bd --- /dev/null +++ b/openjpa-2.2.0-persistence-pom.patch @@ -0,0 +1,25 @@ +--- openjpa-persistence/pom.xml 2012-02-16 09:34:04.000000000 +0100 ++++ openjpa-persistence/pom.xml-gil 2012-04-06 14:43:20.709162776 +0200 +@@ -43,8 +43,8 @@ + <version>${project.version}</version> + </dependency> + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> +@@ -53,9 +53,9 @@ + </dependency> + <!-- for osgi bundle activator code, use same level as Apache Aries --> + <dependency> +- <groupId>org.osgi</groupId> ++ <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> +- <version>4.2.0</version> ++ <version>1.4.0</version> + <scope>provided</scope> + </dependency> + </dependencies> diff --git a/openjpa-2.2.0-remove-checkstyle-plugin.patch b/openjpa-2.2.0-remove-checkstyle-plugin.patch new file mode 100644 index 0000000..9603f8d --- /dev/null +++ b/openjpa-2.2.0-remove-checkstyle-plugin.patch @@ -0,0 +1,56 @@ +--- pom.xml 2012-04-06 13:33:39.725063612 +0200 ++++ pom.xml-gil 2012-04-06 13:33:47.292063792 +0200 +@@ -786,7 +786,7 @@ + <artifactId>maven-shade-plugin</artifactId> + <version>1.4</version> + </plugin> +- <plugin> ++ <!--plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.2</version> +@@ -797,7 +797,7 @@ + <version>1.1.3</version> + </dependency> + </dependencies> +- </plugin> ++ </plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> +@@ -907,7 +907,7 @@ + <pluginExecutions> + + <!--checkstyle plugin --> +- <pluginExecution> ++ <!--pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> +@@ -919,7 +919,7 @@ + <action> + <ignore /> + </action> +- </pluginExecution> ++ </pluginExecution--> + + <!--enforcer plugin --> + <pluginExecution> +@@ -1073,7 +1073,7 @@ + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + </plugin> +- <plugin> ++ <!--plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> +@@ -1091,7 +1091,7 @@ + </configuration> + </execution> + </executions> +- </plugin> ++ </plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> diff --git a/openjpa-2.2.0-remove-ianal-plugin.patch b/openjpa-2.2.0-remove-ianal-plugin.patch new file mode 100644 index 0000000..211e538 --- /dev/null +++ b/openjpa-2.2.0-remove-ianal-plugin.patch @@ -0,0 +1,41 @@ +--- pom.xml 2012-02-16 09:34:04.000000000 +0100 ++++ pom.xml-gil 2012-04-06 13:14:37.232036515 +0200 +@@ -765,7 +765,7 @@ + <artifactId>taglist-maven-plugin</artifactId> + <version>2.4</version> + </plugin> +- <plugin> ++ <!--plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>ianal-maven-plugin</artifactId> + <version>1.0-alpha-1</version> +@@ -774,13 +774,13 @@ + <goals> + <goal>verify-legal-files</goal> + </goals> +- <configuration> ++ <configuration--> + <!-- Fail the build if any artifacts are missing legal files --> +- <strict>true</strict> ++ <!--strict>true</strict> + </configuration> + </execution> + </executions> +- </plugin> ++ </plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> +@@ -1065,10 +1065,10 @@ + </execution> + </executions> + </plugin> +- <plugin> ++ <!--plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>ianal-maven-plugin</artifactId> +- </plugin> ++ </plugin--> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> diff --git a/openjpa-2.2.0-remove-test-profiles.patch b/openjpa-2.2.0-remove-test-profiles.patch new file mode 100644 index 0000000..240fced --- /dev/null +++ b/openjpa-2.2.0-remove-test-profiles.patch @@ -0,0 +1,547 @@ +diff -Nru apache-openjpa-2.2.0-source/openjpa-persistence-jdbc/pom.xml apache-openjpa-2.2.0-source-gil/openjpa-persistence-jdbc/pom.xml +--- apache-openjpa-2.2.0-source/openjpa-persistence-jdbc/pom.xml 2012-02-16 09:34:04.000000000 +0100 ++++ apache-openjpa-2.2.0-source-gil/openjpa-persistence-jdbc/pom.xml 2012-06-24 13:54:07.862296097 +0200 +@@ -91,7 +91,7 @@ + </profile> + + <!-- Profile for testing with MySQL DB --> +- <profile> ++ <!--profile> + <id>test-mysql</id> + <activation> + <property> +@@ -107,17 +107,17 @@ + </dependency> + </dependencies> + <properties> +- <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name> ++ <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name--> + <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>--> +- <connection.url>${openjpa.mysql.url}</connection.url> ++ <!--connection.url>${openjpa.mysql.url}</connection.url> + <connection.username>${openjpa.mysql.username}</connection.username> + <connection.password>${openjpa.mysql.password}</connection.password> +- <jdbc.DBDictionary /> ++ <jdbc.DBDictionary /--> + <!-- DBCP overrides for MySQL testing --> +- <dbcp.maxIdle>0</dbcp.maxIdle> ++ <!--dbcp.maxIdle>0</dbcp.maxIdle> + <dbcp.minIdle>0</dbcp.minIdle> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with PostgreSQL DB --> + <profile> +@@ -150,7 +150,7 @@ + </profile> + + <!-- Profile for testing with SQLServer DB using MS JDBC driver --> +- <profile> ++ <!--profile--> + <!-- + Example MS SQL profile. You can use this profile if you: + 1) have the MS SQL artifacts installed in a local repo and +@@ -178,7 +178,7 @@ + If you are using Java SE 6 or later, you will need to use: + -Dmssql.artifactid=sqljdbc4 + --> +- <id>test-mssql</id> ++ <!--id>test-mssql</id> + <activation> + <property> + <name>test-mssql</name> +@@ -197,9 +197,9 @@ + <mssql.groupid>com.microsoft.sqlserver</mssql.groupid> + <mssql.artifactid>sqljdbc</mssql.artifactid> + <mssql.version>2.0</mssql.version> +- <connection.driver.name>com.microsoft.sqlserver.jdbc.SQLServerDriver</connection.driver.name> ++ <connection.driver.name>com.microsoft.sqlserver.jdbc.SQLServerDriver</connection.driver.name--> + <!--<connection.url>jdbc:sqlserver://localhost/OPENJPA</connection.url>--> +- <connection.url>${openjpa.mssql.url}</connection.url> ++ <!---connection.url>${openjpa.mssql.url}</connection.url> + <connection.username>${openjpa.mssql.username}</connection.username> + <connection.password>${openjpa.mssql.password}</connection.password> + <jdbc.DBDictionary /> +@@ -219,10 +219,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing with SQLServer DB using the jTDS driver --> +- <profile> ++ <!--profile> + <id>test-sqlserver</id> + <activation> + <property> +@@ -239,17 +239,17 @@ + </dependencies> + <properties> + <jtds.version>1.2</jtds.version> +- <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name> ++ <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name--> + <!--<connection.url>jdbc:jtds:sqlserver://localhost:1433/OPENJPA</connection.url>--> +- <connection.url>${openjpa.sqlserver.url}</connection.url> ++ <!--connection.url>${openjpa.sqlserver.url}</connection.url> + <connection.username>${openjpa.sqlserver.username}</connection.username> + <connection.password>${openjpa.sqlserver.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with Sybase DB using the jTDS driver --> +- <profile> ++ <!--profile> + <id>test-sybase</id> + <activation> + <property> +@@ -266,17 +266,17 @@ + </dependencies> + <properties> + <jtds.version>1.2</jtds.version> +- <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name> ++ <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name--> + <!--<connection.url>jdbc:jtds:sybase://localhost/OPENJPA</connection.url>--> +- <connection.url>${openjpa.sybase.url}</connection.url> ++ <!--connection.url>${openjpa.sybase.url}</connection.url> + <connection.username>${openjpa.sybase.username}</connection.username> + <connection.password>${openjpa.sybase.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with Sybase DB using the jConnect driver --> +- <profile> ++ <!--profile> + <id>test-sybase-jconnect</id> + <dependencies> + <dependency> +@@ -287,17 +287,17 @@ + </dependency> + </dependencies> + <properties> +- <connection.driver.name>com.sybase.jdbc3.jdbc.SybDriver</connection.driver.name> ++ <connection.driver.name>com.sybase.jdbc3.jdbc.SybDriver</connection.driver.name--> + <!--<connection.url>jdbc:sybase:Tds:localhost:7100/OPENJPA</connection.url>--> +- <connection.url>${openjpa.sybase.url}</connection.url> ++ <!--connection.url>${openjpa.sybase.url}</connection.url> + <connection.username>${openjpa.sybase.username}</connection.username> + <connection.password>${openjpa.sybase.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with Ingres DB --> +- <profile> ++ <!--profile> + <id>test-ingres</id> + <activation> + <property> +@@ -314,14 +314,14 @@ + </dependencies> + <properties> + <ingres.version>9.2-3.4.8</ingres.version> +- <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name> ++ <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name--> + <!--<connection.url>jdbc:ingres://localhost/OPENJPA</connection.url>--> +- <connection.url>${openjpa.ingres.url}</connection.url> ++ <!--connection.url>${openjpa.ingres.url}</connection.url> + <connection.username>${openjpa.ingres.username}</connection.username> + <connection.password>${openjpa.ingres.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with a custom DB using a system jar --> + <!-- +@@ -374,7 +374,7 @@ + -Dopenjpa.custom.username=USERNAME \ + -Dopenjpa.custom.password=PASSWORD + --> +- <profile> ++ <!--profile> + <id>test-custom2</id> + <activation> + <property> +@@ -404,14 +404,14 @@ + <connection.password>${openjpa.custom.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- + The test-custom2 profile does not work very well when used with a + continuous build system. As a convenience I've added profiles for + some of the proprietary databases to make testing easier. + --> +- <profile> ++ <!--profile--> + <!-- + Example db2 profile. You can use this profile if you: + 1) have the DB2 artifacts installed in a local repo and supply +@@ -444,7 +444,7 @@ + -Dids.license.artifactid=jcc-license + -Ddb2.version=9.5 + --> +- <id>test-db2-jcc</id> ++ <!--id>test-db2-jcc</id> + <activation> + <property> + <name>test-db2-jcc</name> +@@ -470,9 +470,9 @@ + <db2.driver.artifactid>jcc-driver</db2.driver.artifactid> + <db2.license.artifactid>jcc-license</db2.license.artifactid> + <db2.version>9.5</db2.version> +- <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name> ++ <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name--> + <!--<connection.url>jdbc:db2://localhost/openjpa</connection.url>--> +- <connection.url>${openjpa.db2.url}</connection.url> ++ <!--connection.url>${openjpa.db2.url}</connection.url> + <connection.username>${openjpa.db2.username}</connection.username> + <connection.password>${openjpa.db2.password}</connection.password> + <jdbc.DBDictionary /> +@@ -492,10 +492,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing Apache Derby with the DB2 JCC driver --> +- <profile> ++ <!--profile> + <id>test-derbyjcc</id> + <activation> + <property> +@@ -521,15 +521,15 @@ + <db2.groupid>com.ibm.db2</db2.groupid> + <db2.driver.artifactid>jcc-driver</db2.driver.artifactid> + <db2.license.artifactid>jcc-license</db2.license.artifactid> +- <db2.version>9.5</db2.version> ++ <db2.version>9.5</db2.version--> + <!-- + Note: DB must be created before using this profile, + which can be done by running: + mvn test -Dtest=<testcase> -Ptest-derbynet + --> +- <openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url> ++ <!--openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url--> + <!-- Note: commons-dbcp requires dummy values for uid/pwd --> +- <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username> ++ <!--openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username> + <openjpa.derbyjcc.password>pwd</openjpa.derbyjcc.password> + <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name> + <connection.url>${openjpa.derbyjcc.url}</connection.url> +@@ -551,10 +551,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing Informix with the DB2 JCC driver --> +- <profile> ++ <!--profile--> + <!-- + Example Informix JCC profile. You can use this profile if you: + 1a) have the DB2 JCC artifacts installed in a local repo and +@@ -578,7 +578,7 @@ + -Dids.license.artifactid=jcc-license + -Dids.version=9.5 + --> +- <id>test-ids-jcc</id> ++ <!--id>test-ids-jcc</id> + <activation> + <property> + <name>test-ids-jcc</name> +@@ -625,10 +625,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing Informix with the Informix JDBC Driver --> +- <profile> ++ <!--profile--> + <!-- + Example Informix profile. You can use this profile if you: + 1) have the Informix JDBC artifacts installed in a local repo and +@@ -654,7 +654,7 @@ + -Dids.driver.artifactid=informix-driver + -Dids.version=3.70 + --> +- <id>test-ids-informix</id> ++ <!--id>test-ids-informix</id> + <activation> + <property> + <name>test-ids-informix</name> +@@ -694,10 +694,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing with Oracle DB --> +- <profile> ++ <!--profile--> + <!-- + Example oracle profile. You can use this profile if you: + 1) have the Oracle artifacts installed in a local repo and +@@ -721,7 +721,7 @@ + -Doracle.groupid=com.oracle + -Doracle.version=10g + --> +- <id>test-oracle</id> ++ <!--id>test-oracle</id> + <activation> + <property> + <name>test-oracle</name> +@@ -740,9 +740,9 @@ + <oracle.groupid>com.oracle</oracle.groupid> + <oracle.artifactid>jdbc-driver</oracle.artifactid> + <oracle.version>11.2.0.1-jdbc6</oracle.version> +- <connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name> ++ <connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name--> + <!--<connection.url>jdbc:oracle:thin:@localhost:1521:OPENJPA</connection.url>--> +- <connection.url>${openjpa.oracle.url}</connection.url> ++ <!--connection.url>${openjpa.oracle.url}</connection.url> + <connection.username>${openjpa.oracle.username}</connection.username> + <connection.password>${openjpa.oracle.password}</connection.password> + <jdbc.DBDictionary /> +@@ -762,10 +762,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing IBM SolidDB --> +- <profile> ++ <!--profile> + <id>test-soliddb</id> + <activation> + <property> +@@ -785,9 +785,9 @@ + <soliddb.groupid>com.ibm.soliddb</soliddb.groupid> + <soliddb.driver.artifactid>soliddb</soliddb.driver.artifactid> + <soliddb.version>6.5</soliddb.version> +- <connection.driver.name>solid.jdbc.SolidDriver</connection.driver.name> ++ <connection.driver.name>solid.jdbc.SolidDriver</connection.driver.name--> + <!--<connection.url>jdbc:solid://localhost:2315</connection.url>--> +- <connection.url>${openjpa.soliddb.url}</connection.url> ++ <!--connection.url>${openjpa.soliddb.url}</connection.url> + <connection.username>${openjpa.soliddb.username}</connection.username> + <connection.password>${openjpa.soliddb.password}</connection.password> + <jdbc.DBDictionary /> +@@ -807,7 +807,7 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + </profiles> + +diff -Nru apache-openjpa-2.2.0-source/openjpa-persistence-locking/pom.xml apache-openjpa-2.2.0-source-gil/openjpa-persistence-locking/pom.xml +--- apache-openjpa-2.2.0-source/openjpa-persistence-locking/pom.xml 2012-02-16 09:33:46.000000000 +0100 ++++ apache-openjpa-2.2.0-source-gil/openjpa-persistence-locking/pom.xml 2012-06-24 13:59:03.517270302 +0200 +@@ -154,7 +154,7 @@ + </profile> + + <!-- Profile for testing with SQLServer DB using MS JDBC driver --> +- <profile> ++ <!--profile--> + <!-- + Example MS SQL profile. You can use this profile if you: + 1) have the MS SQL artifacts installed in a local repo and +@@ -182,7 +182,7 @@ + If you are using Java SE 6 or later, you will need to use: + -Dmssql.artifactid=sqljdbc4 + --> +- <id>test-mssql</id> ++ <!--id>test-mssql</id> + <activation> + <property> + <name>test-mssql</name> +@@ -222,10 +222,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing with SQLServer DB using the jTDS driver --> +- <profile> ++ <!--profile> + <id>test-sqlserver</id> + <activation> + <property> +@@ -248,10 +248,10 @@ + <connection.password>${openjpa.sqlserver.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with Sybase DB using the jTDS driver --> +- <profile> ++ <!--profile> + <id>test-sybase</id> + <activation> + <property> +@@ -274,10 +274,10 @@ + <connection.password>${openjpa.sybase.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with Ingres DB --> +- <profile> ++ <!--profile> + <id>test-ingres</id> + <activation> + <property> +@@ -300,7 +300,7 @@ + <connection.password>${openjpa.ingres.password}</connection.password> + <jdbc.DBDictionary /> + </properties> +- </profile> ++ </profile--> + + <!-- Profile for testing with a custom DB using a system jar --> + <!-- +@@ -390,7 +390,7 @@ + continuous build system. As a convenience I've added profiles for + some of the proprietary databases to make testing easier. + --> +- <profile> ++ <!--profile--> + <!-- + Example db2 profile. You can use this profile if you: + 1) have the DB2 artifacts installed in a local repo and supply +@@ -423,7 +423,7 @@ + -Dids.license.artifactid=jcc-license + -Ddb2.version=9.5 + --> +- <id>test-db2-jcc</id> ++ <!--id>test-db2-jcc</id> + <activation> + <property> + <name>test-db2-jcc</name> +@@ -470,10 +470,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing Apache Derby with the DB2 JCC driver --> +- <profile> ++ <!--profile> + <id>test-derbyjcc</id> + <activation> + <property> +@@ -499,15 +499,15 @@ + <db2.groupid>com.ibm.db2</db2.groupid> + <db2.driver.artifactid>jcc-driver</db2.driver.artifactid> + <db2.license.artifactid>jcc-license</db2.license.artifactid> +- <db2.version>9.5</db2.version> ++ <db2.version>9.5</db2.version--> + <!-- + Note: DB must be created before using this profile, + which can be done by running: + mvn test -Dtest=<testcase> -Ptest-derbynet + --> +- <openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url> ++ <!--openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url--> + <!-- Note: commons-dbcp requires dummy values for uid/pwd --> +- <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username> ++ <!--openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username> + <openjpa.derbyjcc.password>pwd</openjpa.derbyjcc.password> + <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name> + <connection.url>${openjpa.derbyjcc.url}</connection.url> +@@ -530,10 +530,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing Informix with the DB2 JCC driver --> +- <profile> ++ <!--profile--> + <!-- + Example Informix JCC profile. You can use this profile if you: + 1a) have the DB2 JCC artifacts installed in a local repo and +@@ -557,7 +557,7 @@ + -Dids.license.artifactid=jcc-license + -Dids.version=9.5 + --> +- <id>test-ids-jcc</id> ++ <!--id>test-ids-jcc</id> + <activation> + <property> + <name>test-ids-jcc</name> +@@ -604,10 +604,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing Informix with the Informix JDBC Driver --> +- <profile> ++ <!--profile--> + <!-- + Example Informix profile. You can use this profile if you: + 1) have the Informix JDBC artifacts installed in a local repo and +@@ -633,7 +633,7 @@ + -Dids.driver.artifactid=informix-driver + -Dids.version=3.70 + --> +- <id>test-ids-informix</id> ++ <!--id>test-ids-informix</id> + <activation> + <property> + <name>test-ids-informix</name> +@@ -673,10 +673,10 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + + <!-- Profile for testing with Oracle DB --> +- <profile> ++ <!--profile--> + <!-- + Example oracle profile. You can use this profile if you: + 1) have the Oracle artifacts installed in a local repo and +@@ -700,7 +700,7 @@ + -Doracle.groupid=com.oracle + -Doracle.version=10g + --> +- <id>test-oracle</id> ++ <!--id>test-oracle</id> + <activation> + <property> + <name>test-oracle</name> +@@ -740,7 +740,7 @@ + </releases> + </repository> + </repositories> +- </profile> ++ </profile--> + </profiles> + + <dependencies> diff --git a/openjpa-2.2.0-slice-pom.patch b/openjpa-2.2.0-slice-pom.patch new file mode 100644 index 0000000..c5dad96 --- /dev/null +++ b/openjpa-2.2.0-slice-pom.patch @@ -0,0 +1,13 @@ +--- openjpa-slice/pom.xml 2012-02-16 09:33:42.000000000 +0100 ++++ openjpa-slice/pom.xml-gil 2012-04-06 19:26:28.300565681 +0200 +@@ -48,8 +48,8 @@ + <version>${project.version}</version> + </dependency> + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> diff --git a/openjpa-2.2.0-tools-it-poms.patch b/openjpa-2.2.0-tools-it-poms.patch new file mode 100644 index 0000000..2c16496 --- /dev/null +++ b/openjpa-2.2.0-tools-it-poms.patch @@ -0,0 +1,56 @@ +diff -Nru openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml openjpa-tools/openjpa-maven-plugin/src/it-gil/default_settings/pom.xml +--- openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml 2012-02-16 09:33:42.000000000 +0100 ++++ openjpa-tools/openjpa-maven-plugin/src/it-gil/default_settings/pom.xml 2012-04-06 23:00:13.003869853 +0200 +@@ -41,8 +41,8 @@ + </dependency> + + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> +diff -Nru openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml openjpa-tools/openjpa-maven-plugin/src/it-gil/dependingArtifact/pom.xml +--- openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml 2012-02-16 09:33:42.000000000 +0100 ++++ openjpa-tools/openjpa-maven-plugin/src/it-gil/dependingArtifact/pom.xml 2012-04-06 23:00:27.944870208 +0200 +@@ -42,8 +42,8 @@ + + <dependencies> + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> +diff -Nru openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml openjpa-tools/openjpa-maven-plugin/src/it-gil/nonDefaultPersistenceXml/pom.xml +--- openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml 2012-02-16 09:33:42.000000000 +0100 ++++ openjpa-tools/openjpa-maven-plugin/src/it-gil/nonDefaultPersistenceXml/pom.xml 2012-04-06 23:01:36.241871827 +0200 +@@ -35,8 +35,8 @@ + <version>1.0-SNAPSHOT</version> + <dependencies> + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> +diff -Nru openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml openjpa-tools/openjpa-maven-plugin/src/it-gil/testDependencies/pom.xml +--- openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml 2012-02-16 09:33:42.000000000 +0100 ++++ openjpa-tools/openjpa-maven-plugin/src/it-gil/testDependencies/pom.xml 2012-04-06 23:01:49.844872150 +0200 +@@ -35,8 +35,8 @@ + + <dependencies> + <dependency> +- <groupId>org.apache.geronimo.specs</groupId> +- <artifactId>geronimo-jpa_2.0_spec</artifactId> ++ <groupId>org.hibernate.javax.persistence</groupId> ++ <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> diff --git a/openjpa.spec b/openjpa.spec new file mode 100644 index 0000000..061054b --- /dev/null +++ b/openjpa.spec @@ -0,0 +1,274 @@ +# set to 0 provides a minimal test suite +%global with_tests 0 +Name: openjpa +Version: 2.2.0 +Release: 2%{?dist} +Summary: Java Persistence 2.0 API +Group: Development/Libraries +# # For a breakdown of the licensing, see NOTICE file +License: ASL 2.0 and CDDL +Url: http://openjpa.apache.org/ +Source0: ftp://ftp.gbnet.net/pub/apache/dist/%{name}/%{version}/apache-%{name}-%{version}-source.zip +# force tomcat 7.x apis +Source1: %{name}-%{version}-depmap + +# remove org.codehaus.mojo ianal-maven-plugin 1.0-alpha-1 +Patch0: %{name}-%{version}-remove-ianal-plugin.patch +# remove unavailable deps +Patch1: %{name}-%{version}-parent-pom.patch +Patch2: %{name}-%{version}-remove-checkstyle-plugin.patch +# remove com.ibm.websphere websphere_uow_api 0.0.1 +# change org.osgi org.osgi.core 4.2.0 in org.apache.felix 1.4.0 +Patch3: %{name}-%{version}-kernel-pom.patch +# remove unavailable test deps org.jmock jmock jmock-junit3 2.5.1 +Patch4: %{name}-%{version}-jdbc-pom.patch +# change +# org.osgi org.osgi.core 4.2.0 in org.apache.felix 1.4.0 +# org.apache.geronimo.specs geronimo-jpa_2.0_spec 1.1 with org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.1.Final +Patch5: %{name}-%{version}-persistence-pom.patch +# fix test failure +Patch6: %{name}-%{version}-persistence-jdbc-DynamicEnhancementSuite.patch +# replace +# org.apache.bval org.apache.bval.bundle with bval-core and bval-jsr303 +# org.apache.geronimo.specs geronimo-jpa_2.0_spec with org.hibernate.javax.persistence hibernate-jpa-2.0-api +Patch7: %{name}-%{version}-maven-plugin-pom.patch +Patch8: %{name}-%{version}-slice-pom.patch +Patch9: %{name}-%{version}-jest-pom.patch +Patch10: %{name}-%{version}-tools-it-poms.patch +# remove testing profiles for unavailable drivers: db2jcc informix-driver jcc-driver jdbc-driver jdbc-oracle jtds sqljdbc +Patch11: %{name}-%{version}-remove-test-profiles.patch + +BuildRequires: java-devel +BuildRequires: jpackage-utils + +BuildRequires: apache-rat-plugin +BuildRequires: buildnumber-maven-plugin +BuildRequires: javacc-maven-plugin +BuildRequires: maven-antrun-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-dependency-plugin +BuildRequires: maven-enforcer-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-invoker-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit4 + +# maven-antrun-plugin deps +BuildRequires: ant-contrib +BuildRequires: ant-jsch + +BuildRequires: ant +BuildRequires: apache-commons-collections +BuildRequires: apache-commons-dbcp +BuildRequires: apache-commons-lang +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-pool +BuildRequires: felix-osgi-core +BuildRequires: geronimo-jms +BuildRequires: geronimo-jta +BuildRequires: geronimo-validation +BuildRequires: glassfish-jaxb +BuildRequires: glassfish-jaxb-api +BuildRequires: hibernate-jpa-2.0-api +BuildRequires: log4j +BuildRequires: objectweb-asm +BuildRequires: postgresql-jdbc +BuildRequires: serp +BuildRequires: slf4j +BuildRequires: tomcat-servlet-3.0-api + +# test deps +BuildRequires: apache-commons-jci-rhino +BuildRequires: derby +BuildRequires: hsqldb +BuildRequires: httpunit +#BuildRequires: jtds +BuildRequires: junit +BuildRequires: mysql-connector-java +BuildRequires: regexp +BuildRequires: simple-jndi + +Requires: ant +Requires: apache-commons-collections +Requires: apache-commons-dbcp +Requires: apache-commons-lang +Requires: apache-commons-logging +Requires: apache-commons-pool +Requires: felix-osgi-core +Requires: geronimo-jms +Requires: geronimo-jta +Requires: geronimo-validation +Requires: glassfish-jaxb +Requires: glassfish-jaxb-api +Requires: hibernate-jpa-2.0-api +Requires: log4j +Requires: objectweb-asm +Requires: postgresql-jdbc +Requires: serp +Requires: slf4j +# servlet-api 2.4 +Requires: tomcat-servlet-3.0-api + +Requires: java +Requires: jpackage-utils +BuildArch: noarch + +%description +OpenJPA is Apache's implementation of Sun's Java Persistence 2.0 API +(JSR-317 JPA 2.0) specification for the transparent persistence of +Java objects. + +It is an object-relational mapping (ORM) solution for the Java language, +which simplifies storing objects in databases. + +%package tools +Group: Development/Libraries +Summary: OpenJPA tools - Maven Plugin +BuildRequires: bval +BuildRequires: plexus-utils +Requires: maven +Requires: bval +Requires: geronimo-validation +Requires: hibernate-jpa-2.0-api +Requires: log4j +Requires: plexus-utils +Requires: jpackage-utils +Requires: %{name} = %{version}-%{release} + +%description tools +OpenJPA tasks for enhancing, SQL creation and +schema mapping creation using Apache maven. + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n apache-openjpa-%{version}-source +find . -name "*.class" -delete +find . -name "*.jar" -delete + +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 +%patch7 -p0 +%patch8 -p0 +%patch9 -p0 +%patch10 -p0 +%patch11 -p1 + +sed -i "s|<module>openjpa</module>|<!--module>openjpa</module-->|" pom.xml +sed -i "s|<module>openjpa-all</module>|<!--module>openjpa-all</module-->|" pom.xml +sed -i "s|<module>openjpa-examples</module>|<!--module>openjpa-examples</module-->|" pom.xml +sed -i "s|<module>openjpa-integration</module>|<!--module>openjpa-integration</module-->|" pom.xml +sed -i "s|<module>openjpa-project</module>|<!--module>openjpa-project</module-->|" pom.xml +sed -i "s|<module>openbooks</module>|<!--module>openbooks</module-->|" openjpa-examples/pom.xml + +# require non free com.ibm.websphere websphere_uow_api 0.0.1 +rm openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java +rm openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java + +# require unavailable jmock +rm -r openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/* + +%build +# test random fails +mvn-rpmbuild -e \ +%if %{with_tests} + -Ptest-derby \ +%else + -Dtest=false \ +%endif + -DfailIfNoTests=false \ + -Dmaven.test.failure.ignore=true \ + -Dmaven.local.depmap.file="%{SOURCE1}" \ + install javadoc:aggregate process-resources + +%install + +mkdir -p %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom +%add_maven_depmap JPP.%{name}-parent.pom + +mkdir -p %{buildroot}%{_javadir}/%{name} +for m in jdbc \ + jest \ + kernel \ + lib \ + persistence \ + persistence-jdbc \ + persistence-locking \ + slice \ + xmlstore;do + install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar + install -pm 644 %{name}-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom + %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar +done + +install -pm 644 %{name}-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-tools.pom +%add_maven_depmap -f tools JPP.%{name}-tools.pom +install -pm 644 %{name}-tools/%{name}-maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-plugin.pom +install -m 644 %{name}-tools/%{name}-maven-plugin/target/%{name}-maven-plugin-%{version}.jar \ + %{buildroot}%{_javadir}/%{name}/maven-plugin.jar +%add_maven_depmap -f tools JPP.%{name}-maven-plugin.pom %{name}/maven-plugin.jar -a "org.codehaus.mojo:openjpa-maven-plugin" + +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +mkdir -p %{buildroot}%{_sysconfdir}/ant.d +echo "ant %{name}/jdbc %{name}/kernel %{name}/lib" > %{name}-ant +install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name} + +%files +%dir %{_javadir}/%{name} +%{_javadir}/%{name}/jdbc.jar +%{_javadir}/%{name}/jest.jar +%{_javadir}/%{name}/kernel.jar +%{_javadir}/%{name}/lib.jar +%{_javadir}/%{name}/persistence.jar +%{_javadir}/%{name}/persistence-jdbc.jar +%{_javadir}/%{name}/persistence-locking.jar +%{_javadir}/%{name}/slice.jar +%{_javadir}/%{name}/xmlstore.jar +%{_mavenpomdir}/JPP.%{name}-jdbc.pom +%{_mavenpomdir}/JPP.%{name}-jest.pom +%{_mavenpomdir}/JPP.%{name}-kernel.pom +%{_mavenpomdir}/JPP.%{name}-lib.pom +%{_mavenpomdir}/JPP.%{name}-parent.pom +%{_mavenpomdir}/JPP.%{name}-persistence.pom +%{_mavenpomdir}/JPP.%{name}-persistence-jdbc.pom +%{_mavenpomdir}/JPP.%{name}-persistence-locking.pom +%{_mavenpomdir}/JPP.%{name}-slice.pom +%{_mavenpomdir}/JPP.%{name}-xmlstore.pom +%{_mavendepmapfragdir}/%{name} +%config(noreplace) %{_sysconfdir}/ant.d/%{name} +%doc CHANGES.txt LICENSE NOTICE README.txt RELEASE-NOTES.html + +%files tools +%{_javadir}/%{name}/maven-plugin.jar +%{_mavenpomdir}/JPP.%{name}-tools.pom +%{_mavenpomdir}/JPP.%{name}-maven-plugin.pom +%{_mavendepmapfragdir}/%{name}-tools + +%files javadoc +%{_javadocdir}/%{name} +%doc LICENSE NOTICE + +%changelog +* Mon Jul 16 2012 gil cattaneo puntogil@libero.it 2.2.0-2 +- Fixed license tag +- Own directory + +* Fri Apr 06 2012 gil cattaneo puntogil@libero.it 2.2.0-1 +- initial rpm \ No newline at end of file diff --git a/sources b/sources index e69de29..7ced949 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c311bb883a3cce76eba83c0ae9289f88 apache-openjpa-2.2.0-source.zip
java-sig-commits@lists.fedoraproject.org