openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r676931 [2/3] - in /openjpa/branches/1.0.x: ./ openjpa-all/ openjpa-examples/ openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/ openjpa-kernel/ openjpa-lib-5/ openjpa-lib/ openjpa-persistence-jdbc/ openjpa-persistence/ openjpa-project/ openjp...
Date Tue, 15 Jul 2008 14:52:20 GMT
Modified: openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml?rev=676931&r1=676930&r2=676931&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml Tue Jul 15 07:52:19 2008
@@ -1,412 +1,412 @@
-<?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.   
-    -->
-<!-- 
-     Maven release plugin requires the project tag to be on a single line. 
-     -->
-<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>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-persistence-jdbc</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA JPA JDBC</name>
-    <description>OpenJPA JPA JDBC</description>
-    <url>http://openjpa.apache.org</url>
-    <parent>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa-parent</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
-    </parent>
-    <properties>
-        <openjpa.loglevel>INFO</openjpa.loglevel>
-    </properties>
-    <profiles>
-
-        <!-- Profile for testing with Apache Derby -->
-        <profile>
-            <id>test-derby</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property><name>test-derby</name></property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.derby</groupId>
-                    <artifactId>derby</artifactId>
-                    <version>10.2.2.0</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <argLine>-Xmx500m</argLine>
-                                <systemProperties>
-                                    <property>
-                                        <name>openjpa.Log</name>
-                                        <value>DefaultLevel=${openjpa.loglevel}</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionDriverName</name>
-                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
-                                    </property>
-                                    <property>
-                                        <name>derby.stream.error.file</name>
-                                        <value>target/derby.log</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionProperties</name>
-                                        <value>DriverClassName=org.apache.derby.jdbc.EmbeddedDriver,Url=jdbc:derby:target/database/openjpa-derby-database;create=true,MaxActive=100,MaxIdle=0,MaxWait=10000,TestOnBorrow=true</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-
-        <!-- Profile for testing with HSQL DB -->
-        <profile>
-            <id>test-hsqldb</id>
-            <activation><property><name>test-hsqldb</name></property></activation>
-            <dependencies>
-                <dependency>
-                    <groupId>hsqldb</groupId>
-                    <artifactId>hsqldb</artifactId>
-                    <version>1.8.0.7</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>openjpa.Log</name>
-                                        <value>DefaultLevel=${openjpa.loglevel}</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionDriverName</name>
-                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionProperties</name>
-                                        <value>DriverClassName=org.hsqldb.jdbcDriver,Url=jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true,MaxActive=100,MaxWait=10000,TestOnBorrow=true</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-
-        <!-- Profile for testing with MySQL DB -->
-        <profile>
-            <id>test-mysql</id>
-            <activation><property><name>test-mysql</name></property></activation>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <version>5.0.4</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>openjpa.Log</name>
-                                        <value>DefaultLevel=${openjpa.loglevel}</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionDriverName</name>
-                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionProperties</name>
-                                        <value>DriverClassName=com.mysql.jdbc.Driver,Url=${openjpa.mysql.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.mysql.username},Password=${openjpa.mysql.password}</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-
-        <!-- Profile for testing with PostgreSQL DB -->
-        <profile>
-            <id>test-postgresql</id>
-            <activation><property><name>test-postgresql</name></property></activation>
-            <dependencies>
-                <dependency>
-                    <groupId>postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <version>8.1-407.jdbc3</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>openjpa.Log</name>
-                                        <value>DefaultLevel=${openjpa.loglevel}</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionDriverName</name>
-                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionProperties</name>
-                                        <value>DriverClassName=org.postgresql.Driver,Url=${openjpa.postgresql.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.postgresql.username},Password=${openjpa.postgresql.password}</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-
-        <!-- Profile for testing with SQLServer DB using the jTDS driver -->
-        <profile>
-            <id>test-sqlserver</id>
-            <activation><property><name>test-sqlserver</name></property></activation>
-            <dependencies>
-                <dependency>
-                    <groupId>net.sourceforge.jtds</groupId>
-                    <artifactId>jtds</artifactId>
-                    <version>1.2</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>openjpa.Log</name>
-                                        <value>DefaultLevel=${openjpa.loglevel}</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionDriverName</name>
-                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionProperties</name>
-                                        <value>DriverClassName=net.sourceforge.jtds.jdbc.Driver,Url=${openjpa.sqlserver.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.sqlserver.username},Password=${openjpa.sqlserver.password}</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-
-        <!-- Profile for testing with Sybase DB using the jTDS driver -->
-        <profile>
-            <id>test-sybase</id>
-            <activation><property><name>test-sybase</name></property></activation>
-            <dependencies>
-                <dependency>
-                    <groupId>net.sourceforge.jtds</groupId>
-                    <artifactId>jtds</artifactId>
-                    <version>1.2</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>openjpa.Log</name>
-                                        <value>DefaultLevel=${openjpa.loglevel}</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionDriverName</name>
-                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionProperties</name>
-                                        <value>DriverClassName=net.sourceforge.jtds.jdbc.Driver,Url=${openjpa.sybase.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.sybase.username},Password=${openjpa.sybase.password}</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-        <!-- Profile for testing with a custom DB using a system jar -->
-        <!--
-            For example, to test with Oracle, you might run:
-        mvn test -Dtest=TestPersistence -Ptest-custom \
-          -Dopenjpa.custom.driverjar=$(pwd)/drivers/jdbc-oracle-10_2_0_1_0.jar \
-          -Dopenjpa.custom.driverclass=oracle.jdbc.driver.OracleDriver \
-          -Dopenjpa.custom.url=jdbc:oracle:thin:@HOST:PORT:DBNAME \
-          -Dopenjpa.custom.username=USERNAME \
-          -Dopenjpa.custom.password=PASSWORD
-        -->
-        <profile>
-            <id>test-custom</id>
-            <activation><property><name>test-custom</name></property></activation>
-            <dependencies>
-                <dependency>
-                    <groupId>openjpa.customdriver</groupId>
-                    <artifactId>openjpa.customdriver</artifactId>
-                    <version>1.0</version>
-                    <scope>system</scope>
-                    <systemPath>${openjpa.custom.driverjar}</systemPath>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>openjpa.Log</name>
-                                        <value>DefaultLevel=${openjpa.loglevel}</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionDriverName</name>
-                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
-                                    </property>
-                                    <property>
-                                        <name>openjpa.ConnectionProperties</name>
-                                        <value>DriverClassName=${openjpa.custom.driverclass},Url=${openjpa.custom.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.custom.username},Password=${openjpa.custom.password}</value>
-                                    </property>
-                                </systemProperties>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-    </profiles>
-
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-jdbc-5</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-persistence</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.2.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>test-compile</phase>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
-                                    <!--
-                                        InheritAll doesn't seem to work. Pass in
-                                        properties manually.
-                                    -->
-                                    <property name="maven.test.skip" value="${maven.test.skip}" />
-                                    <property name="test" value="${test}" />
-                                    <property name="outdir" value="${project.build.outputDirectory}" />
-                                    <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
-                                    <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?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.   
+    -->
+<!-- 
+     Maven release plugin requires the project tag to be on a single line. 
+     -->
+<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>
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-persistence-jdbc</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA JPA JDBC</name>
+    <description>OpenJPA JPA JDBC</description>
+    <url>http://openjpa.apache.org</url>
+    <parent>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-parent</artifactId>
+        <version>1.0.3-SNAPSHOT</version>
+    </parent>
+    <properties>
+        <openjpa.loglevel>INFO</openjpa.loglevel>
+    </properties>
+    <profiles>
+
+        <!-- Profile for testing with Apache Derby -->
+        <profile>
+            <id>test-derby</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property><name>test-derby</name></property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                    <version>10.2.2.0</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <argLine>-Xmx500m</argLine>
+                                <systemProperties>
+                                    <property>
+                                        <name>openjpa.Log</name>
+                                        <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionDriverName</name>
+                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
+                                    </property>
+                                    <property>
+                                        <name>derby.stream.error.file</name>
+                                        <value>target/derby.log</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionProperties</name>
+                                        <value>DriverClassName=org.apache.derby.jdbc.EmbeddedDriver,Url=jdbc:derby:target/database/openjpa-derby-database;create=true,MaxActive=100,MaxIdle=0,MaxWait=10000,TestOnBorrow=true</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+
+        <!-- Profile for testing with HSQL DB -->
+        <profile>
+            <id>test-hsqldb</id>
+            <activation><property><name>test-hsqldb</name></property></activation>
+            <dependencies>
+                <dependency>
+                    <groupId>hsqldb</groupId>
+                    <artifactId>hsqldb</artifactId>
+                    <version>1.8.0.7</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>openjpa.Log</name>
+                                        <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionDriverName</name>
+                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionProperties</name>
+                                        <value>DriverClassName=org.hsqldb.jdbcDriver,Url=jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true,MaxActive=100,MaxWait=10000,TestOnBorrow=true</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+
+        <!-- Profile for testing with MySQL DB -->
+        <profile>
+            <id>test-mysql</id>
+            <activation><property><name>test-mysql</name></property></activation>
+            <dependencies>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <version>5.0.4</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>openjpa.Log</name>
+                                        <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionDriverName</name>
+                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionProperties</name>
+                                        <value>DriverClassName=com.mysql.jdbc.Driver,Url=${openjpa.mysql.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.mysql.username},Password=${openjpa.mysql.password}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+
+        <!-- Profile for testing with PostgreSQL DB -->
+        <profile>
+            <id>test-postgresql</id>
+            <activation><property><name>test-postgresql</name></property></activation>
+            <dependencies>
+                <dependency>
+                    <groupId>postgresql</groupId>
+                    <artifactId>postgresql</artifactId>
+                    <version>8.1-407.jdbc3</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>openjpa.Log</name>
+                                        <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionDriverName</name>
+                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionProperties</name>
+                                        <value>DriverClassName=org.postgresql.Driver,Url=${openjpa.postgresql.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.postgresql.username},Password=${openjpa.postgresql.password}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+
+        <!-- Profile for testing with SQLServer DB using the jTDS driver -->
+        <profile>
+            <id>test-sqlserver</id>
+            <activation><property><name>test-sqlserver</name></property></activation>
+            <dependencies>
+                <dependency>
+                    <groupId>net.sourceforge.jtds</groupId>
+                    <artifactId>jtds</artifactId>
+                    <version>1.2</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>openjpa.Log</name>
+                                        <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionDriverName</name>
+                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionProperties</name>
+                                        <value>DriverClassName=net.sourceforge.jtds.jdbc.Driver,Url=${openjpa.sqlserver.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.sqlserver.username},Password=${openjpa.sqlserver.password}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+
+        <!-- Profile for testing with Sybase DB using the jTDS driver -->
+        <profile>
+            <id>test-sybase</id>
+            <activation><property><name>test-sybase</name></property></activation>
+            <dependencies>
+                <dependency>
+                    <groupId>net.sourceforge.jtds</groupId>
+                    <artifactId>jtds</artifactId>
+                    <version>1.2</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>openjpa.Log</name>
+                                        <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionDriverName</name>
+                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionProperties</name>
+                                        <value>DriverClassName=net.sourceforge.jtds.jdbc.Driver,Url=${openjpa.sybase.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.sybase.username},Password=${openjpa.sybase.password}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+        <!-- Profile for testing with a custom DB using a system jar -->
+        <!--
+            For example, to test with Oracle, you might run:
+        mvn test -Dtest=TestPersistence -Ptest-custom \
+          -Dopenjpa.custom.driverjar=$(pwd)/drivers/jdbc-oracle-10_2_0_1_0.jar \
+          -Dopenjpa.custom.driverclass=oracle.jdbc.driver.OracleDriver \
+          -Dopenjpa.custom.url=jdbc:oracle:thin:@HOST:PORT:DBNAME \
+          -Dopenjpa.custom.username=USERNAME \
+          -Dopenjpa.custom.password=PASSWORD
+        -->
+        <profile>
+            <id>test-custom</id>
+            <activation><property><name>test-custom</name></property></activation>
+            <dependencies>
+                <dependency>
+                    <groupId>openjpa.customdriver</groupId>
+                    <artifactId>openjpa.customdriver</artifactId>
+                    <version>1.0</version>
+                    <scope>system</scope>
+                    <systemPath>${openjpa.custom.driverjar}</systemPath>
+                </dependency>
+            </dependencies>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>openjpa.Log</name>
+                                        <value>DefaultLevel=${openjpa.loglevel}</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionDriverName</name>
+                                        <value>org.apache.commons.dbcp.BasicDataSource</value>
+                                    </property>
+                                    <property>
+                                        <name>openjpa.ConnectionProperties</name>
+                                        <value>DriverClassName=${openjpa.custom.driverclass},Url=${openjpa.custom.url},MaxActive=100,MaxWait=10000,TestOnBorrow=true,Username=${openjpa.custom.username},Password=${openjpa.custom.password}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+    </profiles>
+
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-jdbc-5</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-persistence</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>test-compile</phase>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
+                                    <!--
+                                        InheritAll doesn't seem to work. Pass in
+                                        properties manually.
+                                    -->
+                                    <property name="maven.test.skip" value="${maven.test.skip}" />
+                                    <property name="test" value="${test}" />
+                                    <property name="outdir" value="${project.build.outputDirectory}" />
+                                    <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
+                                    <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/pom.xml?rev=676931&r1=676930&r2=676931&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/pom.xml Tue Jul 15 07:52:19 2008
@@ -1,62 +1,62 @@
-<?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.   
-    -->
-<!-- 
-     Maven release plugin requires the project tag to be on a single line. 
-     -->
-<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>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-persistence</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA JPA</name>
-    <description>OpenJPA JPA</description>
-    <url>http://openjpa.apache.org</url>
-    <parent>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa-parent</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
-    </parent>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-kernel-5</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?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.   
+    -->
+<!-- 
+     Maven release plugin requires the project tag to be on a single line. 
+     -->
+<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>
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-persistence</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA JPA</name>
+    <description>OpenJPA JPA</description>
+    <url>http://openjpa.apache.org</url>
+    <parent>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-parent</artifactId>
+        <version>1.0.3-SNAPSHOT</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-kernel-5</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: openjpa/branches/1.0.x/openjpa-persistence/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-project/pom.xml?rev=676931&r1=676930&r2=676931&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-project/pom.xml Tue Jul 15 07:52:19 2008
@@ -1,295 +1,295 @@
-<?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.   
-    -->
-<!-- 
-     Maven release plugin requires the project tag to be on a single line. 
-     -->
-<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">
-    <!--
-        To build the distribution files from project root:
-
-        mvn clean compile package -Dtest=false
-
-        To build and deploy a full digned release with docs, run:
-
-            mvn clean deploy -Pjavadoc-profile,docbook-profile,sign-release
-
-        Note that to sign the release, you need to have "gpg" installed and
-        create a key. See http://apache.org/dev/release-signing.html
-    -->
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>apache-openjpa</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA Distribution</name>
-    <parent>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa-parent</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <scm.dir>svn.apache.org/repos/asf/openjpa/branches/1.0.x/openjpa-project</scm.dir>
-        <openjpa.release.keyAlias>
-            ${user.name}@apache.org
-        </openjpa.release.keyAlias>
-
-        <openjpa.assembly.finalName>
-            ${artifactId}-${version}</openjpa.assembly.finalName>
-        <openjpa.assembly.outputDirectory>
-            ${project.basedir}/../target/site/downloads
-        </openjpa.assembly.outputDirectory>
-
-        <openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
-        <openjpa.assembly.binaryBase>
-            ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuffix}
-        </openjpa.assembly.binaryBase>
-        <openjpa.assembly.binaryFile>
-            ${openjpa.assembly.binaryBase}.zip
-        </openjpa.assembly.binaryFile>
-
-        <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
-        <openjpa.assembly.sourceBase>
-            ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuffix}
-        </openjpa.assembly.sourceBase>
-        <openjpa.assembly.sourceFile>
-            ${openjpa.assembly.sourceBase}.zip
-        </openjpa.assembly.sourceFile>
-
-
-        <docbook.source>${project.basedir}/src/doc/manual</docbook.source>
-        <docbook.target>${project.basedir}/target/manual</docbook.target>
-        <docbook.version>1.67.2</docbook.version>
-        <local.repository>${settings.localRepository}</local.repository>
-    </properties>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/tags/1.0.3</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/tags/1.0.3</developerConnection>
-        <url>https://svn.apache.org/repos/asf/openjpa/tags/1.0.3</url>
-    </scm>
-
-    <build>
-        <!-- needed to let maven pass the "compile" phase -->
-        <testSourceDirectory>/none/</testSourceDirectory>
-
-        <!-- filter site resources -->
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/site</directory>
-                <!-- targetPath is relative to target/classes/ -->
-                <targetPath>../filtered-site</targetPath>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptor>assembly.xml</descriptor>
-                            <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
-                            <workDirectory>target/work</workDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptor>source-assembly.xml</descriptor>
-                            <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
-                            <workDirectory>target/work</workDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!--
-                Copy over site files from src/site to target/filtered-site
-                so we can filter resources and include other generated
-                content from the openjpa-project module.
-            -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prefilter-site</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>2.0-beta-5</version>
-                <configuration>
-                    <siteDirectory>target/filtered-site</siteDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <!--
-            Docbook profile. Docs can be built by running:
-            MAVEN_OPTS=-Xmx512m
-            mvn -f openjpa-project/pom.xml process-resources -Pdocbook-profile
-        -->
-        <profile>
-            <id>docbook-profile</id>
-            <build>
-                <plugins>
-                    <!-- build the docs when processing resources -->
-                    <plugin>
-                        <groupId>com.agilejava.docbkx</groupId>
-                        <artifactId>docbkx-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>build-pdf-doc</id>
-                                <phase>process-resources</phase>
-                                <goals><goal>generate-pdf</goal></goals>
-                                <configuration>
-                                    <sourceDirectory>
-                                        ${docbook.source}
-                                    </sourceDirectory>
-                                    <targetDirectory>
-                                        ${docbook.target}
-                                    </targetDirectory>
-                                    <includes>manual.xml</includes>
-                                    <foCustomization>
-                                        ${docbook.source}/manual-pdf.xsl
-                                    </foCustomization>
-                                    <imgSrcPath>
-                                        ${docbook.source}/
-                                    </imgSrcPath>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>build-chunked-doc</id>
-                                <phase>process-resources</phase>
-                                <goals><goal>generate-html</goal></goals>
-                                <configuration>
-                                    <sourceDirectory>
-                                        ${docbook.source}
-                                    </sourceDirectory>
-                                    <targetDirectory>
-                                        ${docbook.target}
-                                    </targetDirectory>
-                                    <includes>manual.xml</includes>
-                                    <chunkedOutput>true</chunkedOutput>
-                                    <chunkQuietly>false</chunkQuietly>
-                                    <htmlCustomization>
-                                        ${docbook.source}/manual-xhtml-chunk.xsl
-                                    </htmlCustomization>
-                                    <postProcess>
-                                        <!-- rename manual to index -->
-                                        <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
-
-                                        <!-- copy over images and styles -->
-                                        <mkdir dir="${docbook.target}/img" />
-                                        <copy todir="${docbook.target}/img">
-                                            <fileset dir="${docbook.source}/img">
-                                                <include name="*.*" />
-                                            </fileset>
-                                        </copy>
-
-                                        <mkdir dir="${docbook.target}/css" />
-                                        <copy todir="${docbook.target}/css">
-                                            <fileset dir="${docbook.source}/css">
-                                                <include name="*.*" />
-                                            </fileset>
-                                        </copy>
-                                    </postProcess>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>build-single-doc</id>
-                                <phase>process-resources</phase>
-                                <goals><goal>generate-html</goal></goals>
-                                <configuration>
-                                    <sourceDirectory>
-                                        ${docbook.source}
-                                    </sourceDirectory>
-                                    <targetDirectory>
-                                        ${docbook.target}
-                                    </targetDirectory>
-                                    <includes>manual.xml</includes>
-                                    <chunkedOutput>false</chunkedOutput>
-                                    <htmlCustomization>
-                                        ${docbook.source}/manual-xhtml.xsl
-                                    </htmlCustomization>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                        <dependency>
-                            <groupId>org.docbook</groupId>
-                            <artifactId>docbook-xml</artifactId>
-                            <version>4.4</version>
-                            <scope>runtime</scope>
-                        </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <activation>
-                <property>
-                    <name>builddocs</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>agilejava</id>
-                    <name>Agilejava repository (Docbook plugin)</name>
-                    <url>http://agilejava.com/maven</url>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-
-    <!-- need to explicitly list dependencies for assembly to work -->
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <!-- included so we can include it in the distribution -->
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.2.2.0</version>
-        </dependency>
-    </dependencies>
-</project>
+<?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.   
+    -->
+<!-- 
+     Maven release plugin requires the project tag to be on a single line. 
+     -->
+<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">
+    <!--
+        To build the distribution files from project root:
+
+        mvn clean compile package -Dtest=false
+
+        To build and deploy a full digned release with docs, run:
+
+            mvn clean deploy -Pjavadoc-profile,docbook-profile,sign-release
+
+        Note that to sign the release, you need to have "gpg" installed and
+        create a key. See http://apache.org/dev/release-signing.html
+    -->
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>apache-openjpa</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Distribution</name>
+    <parent>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-parent</artifactId>
+        <version>1.0.3-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <scm.dir>svn.apache.org/repos/asf/openjpa/branches/1.0.x/openjpa-project</scm.dir>
+        <openjpa.release.keyAlias>
+            ${user.name}@apache.org
+        </openjpa.release.keyAlias>
+
+        <openjpa.assembly.finalName>
+            ${artifactId}-${version}</openjpa.assembly.finalName>
+        <openjpa.assembly.outputDirectory>
+            ${project.basedir}/../target/site/downloads
+        </openjpa.assembly.outputDirectory>
+
+        <openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
+        <openjpa.assembly.binaryBase>
+            ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.binarySuffix}
+        </openjpa.assembly.binaryBase>
+        <openjpa.assembly.binaryFile>
+            ${openjpa.assembly.binaryBase}.zip
+        </openjpa.assembly.binaryFile>
+
+        <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
+        <openjpa.assembly.sourceBase>
+            ${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuffix}
+        </openjpa.assembly.sourceBase>
+        <openjpa.assembly.sourceFile>
+            ${openjpa.assembly.sourceBase}.zip
+        </openjpa.assembly.sourceFile>
+
+
+        <docbook.source>${project.basedir}/src/doc/manual</docbook.source>
+        <docbook.target>${project.basedir}/target/manual</docbook.target>
+        <docbook.version>1.67.2</docbook.version>
+        <local.repository>${settings.localRepository}</local.repository>
+    </properties>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/tags/1.0.3</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/tags/1.0.3</developerConnection>
+        <url>https://svn.apache.org/repos/asf/openjpa/tags/1.0.3</url>
+    </scm>
+
+    <build>
+        <!-- needed to let maven pass the "compile" phase -->
+        <testSourceDirectory>/none/</testSourceDirectory>
+
+        <!-- filter site resources -->
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/site</directory>
+                <!-- targetPath is relative to target/classes/ -->
+                <targetPath>../filtered-site</targetPath>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <configuration>
+                            <descriptor>assembly.xml</descriptor>
+                            <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
+                            <workDirectory>target/work</workDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <configuration>
+                            <descriptor>source-assembly.xml</descriptor>
+                            <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
+                            <workDirectory>target/work</workDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--
+                Copy over site files from src/site to target/filtered-site
+                so we can filter resources and include other generated
+                content from the openjpa-project module.
+            -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prefilter-site</id>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.0-beta-5</version>
+                <configuration>
+                    <siteDirectory>target/filtered-site</siteDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <!--
+            Docbook profile. Docs can be built by running:
+            MAVEN_OPTS=-Xmx512m
+            mvn -f openjpa-project/pom.xml process-resources -Pdocbook-profile
+        -->
+        <profile>
+            <id>docbook-profile</id>
+            <build>
+                <plugins>
+                    <!-- build the docs when processing resources -->
+                    <plugin>
+                        <groupId>com.agilejava.docbkx</groupId>
+                        <artifactId>docbkx-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-pdf-doc</id>
+                                <phase>process-resources</phase>
+                                <goals><goal>generate-pdf</goal></goals>
+                                <configuration>
+                                    <sourceDirectory>
+                                        ${docbook.source}
+                                    </sourceDirectory>
+                                    <targetDirectory>
+                                        ${docbook.target}
+                                    </targetDirectory>
+                                    <includes>manual.xml</includes>
+                                    <foCustomization>
+                                        ${docbook.source}/manual-pdf.xsl
+                                    </foCustomization>
+                                    <imgSrcPath>
+                                        ${docbook.source}/
+                                    </imgSrcPath>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>build-chunked-doc</id>
+                                <phase>process-resources</phase>
+                                <goals><goal>generate-html</goal></goals>
+                                <configuration>
+                                    <sourceDirectory>
+                                        ${docbook.source}
+                                    </sourceDirectory>
+                                    <targetDirectory>
+                                        ${docbook.target}
+                                    </targetDirectory>
+                                    <includes>manual.xml</includes>
+                                    <chunkedOutput>true</chunkedOutput>
+                                    <chunkQuietly>false</chunkQuietly>
+                                    <htmlCustomization>
+                                        ${docbook.source}/manual-xhtml-chunk.xsl
+                                    </htmlCustomization>
+                                    <postProcess>
+                                        <!-- rename manual to index -->
+                                        <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
+
+                                        <!-- copy over images and styles -->
+                                        <mkdir dir="${docbook.target}/img" />
+                                        <copy todir="${docbook.target}/img">
+                                            <fileset dir="${docbook.source}/img">
+                                                <include name="*.*" />
+                                            </fileset>
+                                        </copy>
+
+                                        <mkdir dir="${docbook.target}/css" />
+                                        <copy todir="${docbook.target}/css">
+                                            <fileset dir="${docbook.source}/css">
+                                                <include name="*.*" />
+                                            </fileset>
+                                        </copy>
+                                    </postProcess>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>build-single-doc</id>
+                                <phase>process-resources</phase>
+                                <goals><goal>generate-html</goal></goals>
+                                <configuration>
+                                    <sourceDirectory>
+                                        ${docbook.source}
+                                    </sourceDirectory>
+                                    <targetDirectory>
+                                        ${docbook.target}
+                                    </targetDirectory>
+                                    <includes>manual.xml</includes>
+                                    <chunkedOutput>false</chunkedOutput>
+                                    <htmlCustomization>
+                                        ${docbook.source}/manual-xhtml.xsl
+                                    </htmlCustomization>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                        <dependency>
+                            <groupId>org.docbook</groupId>
+                            <artifactId>docbook-xml</artifactId>
+                            <version>4.4</version>
+                            <scope>runtime</scope>
+                        </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <activation>
+                <property>
+                    <name>builddocs</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>agilejava</id>
+                    <name>Agilejava repository (Docbook plugin)</name>
+                    <url>http://agilejava.com/maven</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+    <!-- need to explicitly list dependencies for assembly to work -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <!-- included so we can include it in the distribution -->
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.2.0</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: openjpa/branches/1.0.x/openjpa-project/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml?rev=676931&r1=676930&r2=676931&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml Tue Jul 15 07:52:19 2008
@@ -1,75 +1,75 @@
-<?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.   
-    -->
-<!-- 
-     Maven release plugin requires the project tag to be on a single line. 
-     -->
-<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>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-xmlstore</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA XML Store</name>
-    <description>OpenJPA XML Store</description>
-    <url>http://openjpa.apache.org</url>
-    <parent>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa-parent</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
-    </parent>
-    <profiles>
-        <profile>
-            <id>java14-validate</id>
-            <activation><property><name>java14.jar</name></property></activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <artifactId>maven-compiler-plugin</artifactId>
-                            <configuration>
-                                <compilerArguments>
-                                    <bootclasspath>${java14.jar}</bootclasspath>
-                                </compilerArguments>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-    </profiles>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-kernel</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.4</source>
-                    <target>1.4</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?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.   
+    -->
+<!-- 
+     Maven release plugin requires the project tag to be on a single line. 
+     -->
+<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>
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-xmlstore</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA XML Store</name>
+    <description>OpenJPA XML Store</description>
+    <url>http://openjpa.apache.org</url>
+    <parent>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-parent</artifactId>
+        <version>1.0.3-SNAPSHOT</version>
+    </parent>
+    <profiles>
+        <profile>
+            <id>java14-validate</id>
+            <activation><property><name>java14.jar</name></property></activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <configuration>
+                                <compilerArguments>
+                                    <bootclasspath>${java14.jar}</bootclasspath>
+                                </compilerArguments>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-kernel</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message