[hibernate-commits] Hibernate SVN: r14629 - in commons-annotations/trunk: doc and 4 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Thu May 1 18:46:46 EDT 2008
Author: epbernard
Date: 2008-05-01 18:46:46 -0400 (Thu, 01 May 2008)
New Revision: 14629
Added:
commons-annotations/trunk/doc/
commons-annotations/trunk/doc/api/
commons-annotations/trunk/doc/api/jdstyle.css
commons-annotations/trunk/doc/api/package.html
commons-annotations/trunk/ivy/maven-ant-tasks.jar
commons-annotations/trunk/lib/build/
commons-annotations/trunk/lib/build/ant-junit-1.6.5.jar
commons-annotations/trunk/lib/build/junit-3.8.1.jar
commons-annotations/trunk/pom.xml
Modified:
commons-annotations/trunk/build.xml
commons-annotations/trunk/common-build.xml
commons-annotations/trunk/ivy.xml
commons-annotations/trunk/ivy/ivyconf.xml
Log:
HCANN-3 HCANN-2 change build system to get deps from JBoss repo, make doc build independent of hibernate core structure ; add pom
Modified: commons-annotations/trunk/build.xml
===================================================================
--- commons-annotations/trunk/build.xml 2008-05-01 22:09:18 UTC (rev 14628)
+++ commons-annotations/trunk/build.xml 2008-05-01 22:46:46 UTC (rev 14629)
@@ -9,7 +9,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate Commons Annotations"/>
<property name="name" value="hibernate-commons-annotations"/>
- <property name="version" value="3.0.0.GA"/>
+ <property name="version" value="3.1.0.CR1"/>
<property name="javadoc.packagenames" value="org.hibernate.commons.annotations.*"/>
<property name="copy.test" value="true"/>
<property name="javac.source" value="1.5"/>
@@ -21,7 +21,7 @@
<import file="${common.dir}/common-build.xml"/>
- <path id="lib.class.path">
+ <!-- FIXME path id="lib.class.path">
<fileset dir="${hibernate-core.lib.dir}">
<include name="commons-logging*.jar"/>
<include name="log4j*.jar"/>
@@ -34,18 +34,20 @@
</fileset>
<path refid="lib.moduleclass.path"/>
<pathelement path="${clover.jar}"/>
+ </path -->
+ <path id="lib.moduleclass.path">
+ <fileset dir="${ivy.dep.dir}/core">
+ <include name="*.jar"/>
+ </fileset>
</path>
- <path id="junit.moduleclasspath">
+ <path id="junit.moduleclasspath">
<pathelement location="${src.dir}"/>
<pathelement location="${test.dir}"/>
<!-- pathelement location="${jpa-api.jar}"/ -->
<fileset dir="${ivy.dep.dir}/test">
<include name="*.jar"/>
</fileset>
- <fileset dir="${hibernate-core.lib.dir}">
- <include name="junit*.jar"/>
- </fileset>
</path>
<!-- ivy load -->
@@ -98,8 +100,8 @@
</target>
<target name="get.deps.core" depends="init" description="retrieve the core dependencies">
- <ivy:resolve conf="core" />
- <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="core" />
+ <ivy:resolve conf="default" />
+ <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="default" />
</target>
<target name="compile" depends="get.deps.core">
@@ -145,7 +147,7 @@
</manifest>
<antcall target="common-build.jar"/>
<delete file="${dist.dir}/ivy.xml"/> <!-- delete last produced ivy file to be sure a new one will be generated -->
- <ivy:resolve conf="core"/>
+ <ivy:resolve conf="default"/>
<ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]"
resolver="local"
pubrevision="latest"
@@ -179,6 +181,11 @@
<include name="*.jar"/>
</fileset>
</copy>
+
+ <mkdir dir="${dist.lib.dir}/build"/>
+ <copy todir="${dist.lib.dir}/build" failonerror="false">
+ <fileset file="${lib.dir}/build/*.jar"/>
+ </copy>
<antcall target="common-build.dist"/>
</target>
Modified: commons-annotations/trunk/common-build.xml
===================================================================
--- commons-annotations/trunk/common-build.xml 2008-05-01 22:09:18 UTC (rev 14628)
+++ commons-annotations/trunk/common-build.xml 2008-05-01 22:46:46 UTC (rev 14629)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="common-build" default="dist">
+<project name="common-build" default="dist"
+ xmlns:artifact="urn:maven-artifact-ant">
<description>Common properties and targets for the HibernateExt project</description>
<!-- my.basedir property can be used to refer to files/directories relatively to the common-build.xml file -->
@@ -39,39 +40,15 @@
<property name="javac.source" value="1.4"/>
<property name="javac.target" value="1.4"/>
+ <property name="pom.file" value="pom.xml"/>
+ <property name="src.jar" value="${build.dir}/src.jar"/>
- <!-- set Hibernate core related properties -->
- <property name="hibernate-core.home" location="${common-build.basedir}/../hibernate-3.2"/>
- <property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/>
- <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/>
- <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 -->
- <property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/>
- <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../core/doc/reference"/>
+ <!-- build related properties -->
+ <property name="build.lib.dir" value="${lib.dir}/build"/>
- <!--
- Explicitly define tasks from ant..
- Unfortunately, checkstyle-a<path id="lib.class.path">
- <path location="${hibernate-core.jar}"></path>
- <fileset dir="${hibernate-core.lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${clover.jar}"/>
- </path>ll.jar contains it's own version of ANTLR, so ANTLR cannot be in the classpath.
- -->
- <!-- Emmanuel: Removed antlr, shouldn't be useful in Ext package...
- taskdef name="antlr" classname="org.apache.tools.ant.taskdefs.optional.ANTLR">
- <classpath>
- <pathelement location="${hibernate-core.lib.dir}/antlr-2.7.2.jar"/>
- <pathelement location="${hibernate-core.lib.dir}/ant-antlr-1.6.1.jar"/>
- </classpath>
- </taskdef -->
-
<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
<classpath>
- <fileset dir="${hibernate-core.lib.dir}">
+ <fileset dir="${common-build.basedir}/lib/build"> <!-- ${build.lib.dir} fails in reference doc build -->
<include name="junit-*.jar"/>
<include name="ant-junit-*.jar"/>
</fileset>
@@ -80,18 +57,31 @@
<taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator">
<classpath>
- <fileset dir="${hibernate-core.lib.dir}">
+ <fileset dir="${common-build.basedir}/lib/build"> <!-- ${build.lib.dir} fails in reference doc build -->
<include name="junit-*.jar"/>
<include name="ant-junit-*.jar"/>
</fileset>
</classpath>
</taskdef>
+ <!-- ivy load -->
+ <property name="ivy.jar.dir" value="${common-build.basedir}/ivy" />
+ <property name="ivy.conf.dir" value="${common-build.basedir}" />
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+ uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
+
+ <!-- maven task load -->
+ <path id="maven-ant-tasks.path" path="${ivy.jar.dir}/maven-ant-tasks.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant"
+ classpathref="maven-ant-tasks.path" />
+
+ <artifact:remoteRepository id="offline.repository.jboss.org" url="file://${offline.repository.jboss.org}" />
+
<path id="lib.class.path">
- <path location="${hibernate-core.jar}"></path>
- <fileset dir="${hibernate-core.lib.dir}">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
@@ -196,9 +186,6 @@
<include name="lgpl.txt"/>
</fileset>
</copy>
-
- <available file="${hibernate-core.jar}" type="file" property="hibernate-core.jar.available"/>
- <fail unless="hibernate-core.jar.available" message="Cannot locate hibernate-core.jar: ${hibernate-core.jar}"/>
</target>
<target name="compile" depends="init" description="Compile the Java source code">
@@ -337,7 +324,7 @@
windowtitle="${Name} API Documentation"
Overview="${doc.api.dir}/package.html"
doctitle="${Name} API Documentation"
- stylesheetfile="${hibernate-core.doc.api}/jdstyle.css"
+ stylesheetfile="${doc.api.dir}/jdstyle.css"
link="${javadoc}">
<packageset dir="${src.dir}" defaultexcludes="yes" >
<include name="**/*" />
@@ -469,4 +456,28 @@
<cvs command="-q diff -u -N" output="patch.txt"/>
</target>
+ <!-- maven deploy: to be used by the subbuild and delcare deps on jar -->
+ <target name="deploy" depends="jar">
+ <fail unless="offline.repository.jboss.org" message="offline.repository.jboss.org must be defined"/>
+ <jar jarfile="${src.jar}" basedir="${src.dir}">
+ <include name="**/*.java" />
+ <exclude name="**/test/*.java" />
+ <!-- patternset refid="meta.files" / -->
+ </jar>
+
+ <artifact:pom id="maven.project" file="${pom.file}" />
+
+ <artifact:install file="${jar.file.name}">
+ <pom refid="maven.project"/>
+ </artifact:install>
+
+ <artifact:deploy file="${jar.file.name}">
+ <pom refid="maven.project" />
+ <remoteRepository refId="offline.repository.jboss.org">
+ </remoteRepository>
+ <attach file="${src.jar}" classifier="sources" />
+ <attach file="${jar.file.name}" classifier="" />
+ </artifact:deploy>
+ </target>
+
</project>
\ No newline at end of file
Added: commons-annotations/trunk/doc/api/jdstyle.css
===================================================================
--- commons-annotations/trunk/doc/api/jdstyle.css (rev 0)
+++ commons-annotations/trunk/doc/api/jdstyle.css 2008-05-01 22:46:46 UTC (rev 14629)
@@ -0,0 +1,117 @@
+/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the defaults */
+
+/* Page background color */
+body { font-family: Arial;
+ background-color: white;
+ font-size: 10pt;
+ }
+td { font-family: Arial;
+ font-size: 10pt;
+ }
+/* Table colors */
+.TableHeadingColor { background: #F4F4F4 }
+.TableSubHeadingColor { background: #F4F4F4 }
+.TableRowColor { background: #FFFFFF }
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont { font-size: normal; font-family: Arial }
+.FrameHeadingFont { font-size: normal; font-family: Arial }
+.FrameItemFont { font-size: normal; font-family: Arial }
+
+/* Example of smaller, sans-serif font in frames */
+/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */
+
+/* Navigation bar fonts and colors */
+.NavBarCell1 { background-color:#F4F4F4;}
+.NavBarCell1Rev { background-color:silver;}
+
+.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
+
+.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+
+A {
+ color: #003399;
+}
+
+A:active {
+ color: #003399;
+}
+
+A:visited {
+ color: #888888;
+}
+
+P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
+ color: #000000;
+}
+
+TD, TH, SPAN {
+ color: #000000;
+}
+
+BLOCKQUOTE {
+ margin-right: 0px;
+}
+
+
+/*H1, H2, H3, H4, H5, H6 {
+ color: #000000;
+ font-weight:500;
+ margin-top:10px;
+ padding-top:15px;
+}
+
+H1 { font-size: 150%; }
+H2 { font-size: 140%; }
+H3 { font-size: 110%; font-weight: bold; }
+H4 { font-size: 110%; font-weight: bold;}
+H5 { font-size: 100%; font-style: italic; }
+H6 { font-size: 100%; font-style: italic; }*/
+
+TT {
+font-size: 90%;
+ font-family: "Courier New", Courier, monospace;
+ color: #000000;
+}
+
+PRE {
+font-size: 90%;
+ padding: 5px;
+ border-style: solid;
+ border-width: 1px;
+ border-color: #CCCCCC;
+ background-color: #F4F4F4;
+}
+
+UL, OL, LI {
+ list-style: disc;
+}
+
+HR {
+ width: 100%;
+ height: 1px;
+ background-color: #CCCCCC;
+ border-width: 0px;
+ padding: 0px;
+ color: #CCCCCC;
+}
+
+.variablelist {
+ padding-top: 10;
+ padding-bottom:10;
+ margin:0;
+}
+
+.itemizedlist, UL {
+ padding-top: 0;
+ padding-bottom:0;
+ margin:0;
+}
+
+.term {
+ font-weight:bold;
+}
Added: commons-annotations/trunk/doc/api/package.html
===================================================================
--- commons-annotations/trunk/doc/api/package.html (rev 0)
+++ commons-annotations/trunk/doc/api/package.html 2008-05-01 22:46:46 UTC (rev 14629)
@@ -0,0 +1 @@
+<body></body>
Modified: commons-annotations/trunk/ivy/ivyconf.xml
===================================================================
--- commons-annotations/trunk/ivy/ivyconf.xml 2008-05-01 22:09:18 UTC (rev 14628)
+++ commons-annotations/trunk/ivy/ivyconf.xml 2008-05-01 22:46:46 UTC (rev 14629)
@@ -1,9 +1,10 @@
<ivyconf>
+ <!-- conf defaultResolver="jboss-rep"/ -->
<conf defaultResolver="jboss-rep"/>
<resolvers>
<chain name="jboss-rep">
- <url name="jboss-rep-regular">
- <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
+ <url name="jboss-rep-regular" m2compatible="true">
+ <artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</url>
</chain>
<chain name="rep-hibernate" returnFirst="true" latest="latest-revision">
@@ -11,18 +12,12 @@
<ivy pattern="../[module]/target/[revision]/ivy.xml"/>
<artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
</filesystem>
- <url name="jboss-rep-hibernate">
- <ivy pattern="http://repository.jboss.org/hibernate-[module]/[revision]/ivy.xml"/>
- <artifact pattern="http://repository.jboss.org/hibernate-[module]/[revision]/lib/[artifact].[ext]"/>
- </url>
- <url name="jboss-rep-regular-with-ivy">
- <ivy pattern="http://repository.jboss.org/[module]/[revision]/ivy.xml"/>
- <artifact pattern="http://repository.jboss.org/[module]/[revision]/lib/[artifact].[ext]"/>
- </url>
- <url name="jboss-rep-maven" m2compatible="true">
- <ivy pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/ivy.xml"/>
+ <url name="jboss-rep-maven-regular" m2compatible="true">
<artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
</url>
+ <url name="jboss-rep-maven-regular" m2compatible="true">
+ <artifact pattern="http://repository.jboss.org/maven2/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+ </url>
</chain>
</resolvers>
<modules>
Added: commons-annotations/trunk/ivy/maven-ant-tasks.jar
===================================================================
(Binary files differ)
Property changes on: commons-annotations/trunk/ivy/maven-ant-tasks.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: commons-annotations/trunk/ivy.xml
===================================================================
--- commons-annotations/trunk/ivy.xml 2008-05-01 22:09:18 UTC (rev 14628)
+++ commons-annotations/trunk/ivy.xml 2008-05-01 22:46:46 UTC (rev 14629)
@@ -3,15 +3,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation=
"http://www.jayasoft.org/misc/ivy/ivy.xsd">
- <info organisation="org.hibernate" module="hibernate-commons-annotations"/>
+ <info organisation="org.hibernate" module="commons-annotations"/>
<configurations>
- <conf name="core" description="Core module dependencies"/>
+ <conf name="default" description="Core module dependencies"/>
<conf name="test" visibility="private" description="Dependencies needed for testing purposes"/>
</configurations>
<publications>
- <artifact name="hibernate-commons-annotations" conf="core"/>
+ <artifact name="hibernate-commons-annotations" conf="default"/>
</publications>
<dependencies>
- <dependency name="ejb3-persistence" rev="1.0.1.GA" conf="test->default"/>
+ <!-- compile time dependencies -->
+ <dependency org="commons-logging" name="commons-logging" rev="1.0.4" conf="default->default"/>
+
+ <!-- transitive dependencies -->
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="test->default"/> <!-- soon to be a dep -->
+
+ <!-- test deps -->
+ <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="test->default"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/>
+ <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/>
+ <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
</dependencies>
</ivy-module>
\ No newline at end of file
Added: commons-annotations/trunk/lib/build/ant-junit-1.6.5.jar
===================================================================
(Binary files differ)
Property changes on: commons-annotations/trunk/lib/build/ant-junit-1.6.5.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: commons-annotations/trunk/lib/build/junit-3.8.1.jar
===================================================================
(Binary files differ)
Property changes on: commons-annotations/trunk/lib/build/junit-3.8.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: commons-annotations/trunk/pom.xml
===================================================================
--- commons-annotations/trunk/pom.xml (rev 0)
+++ commons-annotations/trunk/pom.xml 2008-05-01 22:46:46 UTC (rev 14629)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<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.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <packaging>jar</packaging>
+ <name>Hibernate Commons Annotations</name>
+ <version>3.1.0.CR1</version>
+ <licenses>
+ <license>
+ <name>GNU LESSER GENERAL PUBLIC LICENSE</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <description>Hibernate Commons Annotations is a utility project used by annotations based Hibernate sub-projects.</description>
+ <scm>
+ <url>scm:svn:http://anonsvn.jboss.org/repos/hibernate/commons-annotations</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
More information about the hibernate-commits
mailing list