[hibernate-commits] Hibernate SVN: r15703 - in search/trunk: src and 4 other directories.

Author: hardy.ferentschik Date: 2008-12-17 09:41:24 -0500 (Wed, 17 Dec 2008) New Revision: 15703 Added: search/trunk/src/assembly/ search/trunk/src/assembly/dist.xml search/trunk/src/test-resources/org/hibernate/search/test/classloading/ search/trunk/src/test-resources/org/hibernate/search/test/classloading/Animal.hbm.xml Removed: search/trunk/src/test/org/hibernate/search/test/classloading/Animal.hbm.xml Modified: search/trunk/pom.xml Log: HSEARCH-82 Made the pom executable. Now you can build, test and even build a (yet to be finished) distribution package. The POM needs a little more work. Once we are ready to switch completely to maven we have to move the sources to the default locations and delete obsolete ant/ivy files. Modified: search/trunk/pom.xml =================================================================== --- search/trunk/pom.xml 2008-12-16 22:26:08 UTC (rev 15702) +++ search/trunk/pom.xml 2008-12-17 14:41:24 UTC (rev 15703) @@ -1,6 +1,6 @@ <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"> + 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-search</artifactId> @@ -8,20 +8,27 @@ <name>Hibernate Search</name> <description>Hibernate Search</description> <url>http://search.hibernate.org</url> + <issueManagement> - <system>JIRA</system> - <url>http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH&... + <system>JIRA</system> + <url>http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH&... </issueManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/<... - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/sear... - <url>http://fisheye.jboss.com/browse/Hibernate/search</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/<... + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/sear... + <url>http://fisheye.jboss.com/browse/Hibernate/search</url> </scm> + <organization> - <name>Hibernate</name> - <url>http://www.hibernate.org</url> + <name>Hibernate</name> + <url>http://www.hibernate.org</url> </organization> + + <dependencies> + <!-- =============================== --> + <!-- Required Dependencies --> + <!-- =============================== --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> @@ -48,71 +55,339 @@ <version>1.4.2</version> </dependency> <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - <optional>true</optional> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> </dependency> + + <!-- =============================== --> + <!-- Testing Dependencies --> + <!-- =============================== --> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - <optional>true</optional> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core</artifactId> + <version>5.2.0</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-common</artifactId> - <version>1.3.0</version> - <optional>true</optional> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <version>1.3.0</version> - <optional>true</optional> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.2</version> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-snowball</artifactId> - <version>2.4.0</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers</artifactId> - <version>2.4.0</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - <scope>runtime</scope> - <optional>true</optional> - </dependency> </dependencies> + + <build> + <sourceDirectory>./src/java</sourceDirectory> + <testSourceDirectory>./src/test</testSourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <systemProperties> + <property> + <name>build.dir</name> + <value>${basedir}/target</value> + </property> + </systemProperties> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + <filters> + <filter>${filter.file}</filter> + </filters> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test-resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + </testResources> + </build> + + <profiles> + <!-- =============================== --> + <!-- Database profiles --> + <!-- =============================== --> + <!-- HSQLDB is the default (eventually move to H2) --> + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + </dependency> + </dependencies> + <properties> + <filter.file>src/filters/hsqldb.filter</filter.file> + </properties> + </profile> + <profile> + <id>postgresql</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-603.jdbc3</version> + </dependency> + </dependencies> + <properties> + <filter.file>src/filters/postgresql.filter</filter.file> + </properties> + </profile> + <profile> + <id>mysql</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.6</version> + </dependency> + </dependencies> + <properties> + <filter.file>src/filters/mysql.filter</filter.file> + </properties> + </profile> + + <!-- ================================ --> + <!-- Dependecy profiles to test w and --> + <!-- w/o optional dependencies --> + <!-- =============================== --> + <profile> + <id>with-optional-jars</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <!-- =============================== --> + <!-- Optional Dependencies --> + <!-- =============================== --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-common</artifactId> + <version>1.3.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <version>1.3.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-snowball</artifactId> + <version>2.4.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers</artifactId> + <version>2.4.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + <optional>true</optional> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <excludes> + <exclude>**/classloading/*.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>without-optional-jars</id> + <dependencies> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <optional>true</optional> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <excludes> + <exclude>none</exclude> + </excludes> + <includes> + <include>**/classloading/*Test.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>dist-build</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <stylesheetfile>${basedir}/doc/api/jdstyle.css</stylesheetfile> + </configuration> + <executions> + <execution> + <id>make-javadoc</id> + <phase>package</phase> + <goals> + <goal>javadoc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.0</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>1.0.2</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/doc/reference/en</sourceDirectory> + <masterTranslation>en-US</masterTranslation> + <imageResource> + <directory>${basedir}/doc/reference/en/images</directory> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> + <finalName>hibernate-validator-legacy-guide.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>true</useRelativeImageUris> + </options> + </configuration> + <executions> + <execution> + <id>make-doc</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Added: search/trunk/src/assembly/dist.xml =================================================================== --- search/trunk/src/assembly/dist.xml (rev 0) +++ search/trunk/src/assembly/dist.xml 2008-12-17 14:41:24 UTC (rev 15703) @@ -0,0 +1,68 @@ +<?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. +--> + +<assembly> + <id>dist</id> + <formats> + <format>tar.gz</format> + <format>tar.bz2</format> + <format>zip</format> + </formats> + + <dependencySets> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>/dist/lib/runtime</outputDirectory> + <scope>runtime</scope> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>/dist/lib/test</outputDirectory> + <scope>test</scope> + </dependencySet> + </dependencySets> + + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>/dist</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>target/site/apidocs</directory> + <outputDirectory>/dist/docs/api</outputDirectory> + </fileSet> + <fileSet> + <directory>target/docbook/publish/en-US</directory> + <outputDirectory>/dist/docs/manual</outputDirectory> + </fileSet> + <fileSet> + <directory>.</directory> + <outputDirectory></outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <exclude>**/target/**</exclude> + </excludes> + </fileSet> + </fileSets> + +</assembly> Deleted: search/trunk/src/test/org/hibernate/search/test/classloading/Animal.hbm.xml =================================================================== --- search/trunk/src/test/org/hibernate/search/test/classloading/Animal.hbm.xml 2008-12-16 22:26:08 UTC (rev 15702) +++ search/trunk/src/test/org/hibernate/search/test/classloading/Animal.hbm.xml 2008-12-17 14:41:24 UTC (rev 15703) @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping package="org.hibernate.search.test.classloading"> - <class name="Animal"> - <id name="id" type="java.lang.Long"> - <generator class="increment"/> - </id> - <property name="name"/> - </class> -</hibernate-mapping> \ No newline at end of file Copied: search/trunk/src/test-resources/org/hibernate/search/test/classloading/Animal.hbm.xml (from rev 15681, search/trunk/src/test/org/hibernate/search/test/classloading/Animal.hbm.xml) =================================================================== --- search/trunk/src/test-resources/org/hibernate/search/test/classloading/Animal.hbm.xml (rev 0) +++ search/trunk/src/test-resources/org/hibernate/search/test/classloading/Animal.hbm.xml 2008-12-17 14:41:24 UTC (rev 15703) @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.hibernate.search.test.classloading"> + <class name="Animal"> + <id name="id" type="java.lang.Long"> + <generator class="increment"/> + </id> + <property name="name"/> + </class> +</hibernate-mapping> \ No newline at end of file Property changes on: search/trunk/src/test-resources/org/hibernate/search/test/classloading/Animal.hbm.xml ___________________________________________________________________ Name: svn:mergeinfo +