combine build.properties and run.properties into one file, add missing ASL2 header to index.html, use .m2 for java2html and mysql dependencies.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@944341 13f79535-47bb-0310-9956-ffa450edef68

openjpa-examples/openbooks/build.properties

@@ -1,31 +0,0 @@
-# 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.
-#
-#
-# -------------------------------------------------------------------------------
-# Environment variables for provider specific library to build OpenBooks
-# 
-# Edit the following properties to locate resources in your environment
-# -------------------------------------------------------------------------------
-#
-# Directory location of OpenJPA library. All *.jar files in the library are
-# included in the compiler classpath 
-maven.repos=${user.home}/.m2/repository
-openjpa.version=2.1.0-SNAPSHOT
-openjpa.lib=${maven.repos}/org/apache/openjpa/openjpa-all/${openjpa.version}
-#
-#
-# Directory where the pre-packaged demo distribution will be created.
-deploy.dir=C:/temp/OpenBooks

openjpa-examples/openbooks/build.xml

@@ -25,7 +25,7 @@
                     
 <project name="OpenBooks" default="info">
 	
-	<property file="build.properties" />
+	<property file="openbook.properties" />
 	
 	<property name="jpa.provider" value="openjpa" />
 	<property name="src.dir"      value="${basedir}/src/main/java"/>
@@ -46,7 +46,9 @@
 	
 	<path id="java2html.classpath">
 		<pathelement location="${rsrc.dir}" />
-		<pathelement location="lib/java2html.jar" />
+		<fileset dir="${java2html.lib}">
+			<include name="*.jar" />
+		</fileset>
 	</path>
 
 	
@@ -69,11 +71,16 @@
 		</echo>
 	</target>
 	
-	<target name="check-env" description="Checks if OpenJPA library exists">
+	<target name="check-env" description="Checks if required libraries exist">
 		<available file="${openjpa.lib}" property="openjpa.exists"/>
 		<fail unless="openjpa.exists">*** Error:
 		   The directory for OpenJPA libraries can not be located at ${openjpa.lib}. 
-		   Make sure openjpa.lib property value is correct in build.properties file.	
+		   Make sure openjpa.lib property value is correct in openbooks.properties file.	
+		</fail>
+		<available file="${java2html.lib}" property="java2html.exists"/>
+		<fail unless="java2html.exists">*** Error:
+		   The directory for Java2HTML libraries can not be located at ${java2html.lib}. 
+		   Make sure java2html.lib property value is correct in openbooks.properties file.	
 		</fail>
 	</target>
 	
@@ -113,7 +120,7 @@
 		</jar>
 		<zip destfile="openbooks.zip" basedir="${basedir}">
 			<include name="openbooks.jar" />
-			<include name="run.properties" />
+			<include name="openbooks.properties" />
 			<include name="run.xml" />
 			<include name="index.html" />
 			<include name="NOTICE.txt"/>
@@ -126,7 +133,6 @@
 			<include name="slides/**" />
 			<include name="source/**" />
 		</zip>
-		
 	</target>
 	
 	<target name="deploy" description="Transfers the distribution packge to a deploy directory">

openjpa-examples/openbooks/index.html

@@ -1,3 +1,23 @@
+<!--
+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.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <body>
 <h1>OpenBooks: A sample JPA 2.0 Application</h1>

openjpa-examples/openbooks/openbook.properties

@@ -18,11 +18,13 @@
 # Environment variables for provider specific library to run OpenBooks
 # 
 # -------------------------------------------------------------------------------
-# Directory location of OpenJPA library. All *.jar files in the library are
-# included in the compiler classpath 
+# Directory location of maven repository
 maven.repos=${user.home}/.m2/repository
+# OpenJPA runtime artifact
 openjpa.version=2.1.0-SNAPSHOT
 openjpa.lib=${maven.repos}/org/apache/openjpa/openjpa-all/${openjpa.version}
+# Other depends
+java2html.version=5.0
+java2html.lib=${maven.repos}/de/java2html/${java2html.version}
+jdbc.driver=${maven.repos}/mysql/mysql-connector-java/5.1.12/mysql-connector-java-5.1.12.jar
 
-# JDBC Library. 
-jdbc.driver=c:/mysql/mysql-connector-java-5.1.6/mysql-connector-java-5.1.6-bin.jar

openjpa-examples/openbooks/run.xml

@@ -23,7 +23,7 @@
 <!--                                                                        -->
 <!-- ====================================================================== -->
 <project name="OpenBooks">
-	<property file="run.properties"/>
+	<property file="openbooks.properties"/>
 	<property name="jpa.provider" value="openjpa" />
 	<property name="load.properties" value="load.properties" />
 	<property name="demo.properties" value="demo.properties" />