Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
clean up pom and persistence.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Nov 26, 2013
1 parent 2f5b79c commit 12dc897
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 64 deletions.
88 changes: 25 additions & 63 deletions functional-test/pom.xml
View file
Expand Up @@ -36,8 +36,7 @@
<ds.jndi.name>zanataDatasource</ds.jndi.name>
<!--<ds.hibernate.dialect>org.hibernate.dialect.H2Dialect</ds.hibernate.dialect>-->
<ds.driver.class>org.h2.Driver</ds.driver.class>
<!--<ds.connection.url>jdbc:h2:file:${project.build.directory}/h2/zanata;AUTO_SERVER=TRUE;</ds.connection.url>-->
<ds.connection.url>jdbc:h2:file:${project.build.directory}/h2/zanata;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE</ds.connection.url>
<ds.connection.url>jdbc:h2:file:${project.build.directory}/h2/zanata;AUTO_SERVER=TRUE;</ds.connection.url>
<ds.username>sa</ds.username>
<ds.password />

Expand Down Expand Up @@ -197,11 +196,18 @@
<version>2.4</version>
</dependency>

<!-- to be able to create entity in functional test -->
<dependency>
<groupId>com.github.huangp</groupId>
<artifactId>entityunit</artifactId>
<version>0.1</version>
<scope>test</scope>
</dependency>

<!-- to be able to create entities in functional test -->
<dependency>
<groupId>org.zanata</groupId>
<artifactId>zanata-model</artifactId>
<scope>test</scope>
<!--<scope>test</scope>-->
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Expand All @@ -215,26 +221,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.zanata</groupId>
<artifactId>zanata-common-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.okapi</groupId>
<artifactId>okapi-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.okapi.steps</groupId>
<artifactId>okapi-step-tokenization</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.zanata</groupId>
<artifactId>zanata-common-api</artifactId>
Expand Down Expand Up @@ -271,56 +257,20 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
<version>${hibernate.search.version}</version>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>test</scope>
</dependency>

<!--<dependency>-->
<!--<groupId>org.hibernate</groupId>-->
<!--<artifactId>hibernate-search-orm</artifactId>-->
<!--<version>${hibernate.search.version}</version>-->
<!--</dependency>-->

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-engine</artifactId>
<version>${hibernate.search.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-analyzers</artifactId>
<version>${hibernate.search.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>

<!--<dependency>-->
<!--<groupId>org.hibernate</groupId>-->
<!--<artifactId>hibernate-ehcache</artifactId>-->
<!--<version>${hibernate.version}</version>-->
<!--</dependency>-->

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
</dependency>

<dependency>
<groupId>com.github.huangp</groupId>
<artifactId>entityunit</artifactId>
<version>0.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
Expand All @@ -342,13 +292,21 @@
<scope>test</scope>
</dependency>

<!-- For remote JNDI lookup -->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-ejb-client-bom</artifactId>
<version>7.1.1.Final</version>
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-remote-naming</artifactId>
<version>1.0.4.Final</version>
<scope>test</scope>
</dependency>


</dependencies>

Expand Down Expand Up @@ -603,11 +561,15 @@
<configuration>
<failOnWarning>true</failOnWarning>
<usedDependencies combine.children="append">
<usedDependency>com.h2database:h2</usedDependency>
<usedDependency>org.apache.solr:solr-core</usedDependency>
<usedDependency>org.apache.solr:solr-solrj</usedDependency>
<usedDependency>org.hibernate:hibernate-core</usedDependency>
<usedDependency>org.hibernate:hibernate-envers</usedDependency>
<usedDependency>org.hibernate:hibernate-entitymanager</usedDependency>
<usedDependency>org.hibernate:hibernate-infinispan</usedDependency>
<usedDependency>org.hibernate:hibernate-testing</usedDependency>
<usedDependency>org.javassist:javassist</usedDependency>
<usedDependency>org.jboss.as:jboss-as-ejb-client-bom</usedDependency>
<usedDependency>org.projectlombok:lombok</usedDependency>
</usedDependencies>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion functional-test/src/test/resources/META-INF/persistence.xml
View file
Expand Up @@ -72,7 +72,7 @@
value="org.h2.Driver" />
<!-- Configure the in-memory database to be shared, and so that it
doesn't disappear after it has been set up by Hibernate: -->
<property name="hibernate.connection.url" value="${ds.connection.url}" />
<property name="hibernate.connection.url" value="${ds.connection.url};DB_CLOSE_ON_EXIT=FALSE" />
<property name="hibernate.connection.username" value="${ds.username}" />
<property name="hibernate.connection.password" value="" />
<!--hibernate3-maven-plugin:hbm2ddl needs this -->
Expand Down

0 comments on commit 12dc897

Please sign in to comment.