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

Commit

Permalink
Merge branch 'master' into rhbz845904
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Aug 22, 2012
2 parents 1bbcee4 + 2a0edae commit e13f2ab
Show file tree
Hide file tree
Showing 36 changed files with 487 additions and 175 deletions.
148 changes: 146 additions & 2 deletions pom.xml
View file
Expand Up @@ -23,7 +23,19 @@
<zanata.client.version>1.6.0</zanata.client.version>
<zanata.common.version>1.6.1</zanata.common.version>

<richfaces.version>3.3.3.Final</richfaces.version>

<!-- see http://community.jboss.org/wiki/HibernateCompatibilityMatrix?decorator=print -->
<!-- see also the jboss7 profile below -->
<hibernate.scope>provided</hibernate.scope>
<hibernate.version>3.3.2.GA</hibernate.version>
<hibernate.jmx.version>${hibernate.version}</hibernate.jmx.version>
<hibernate.search.version>3.1.1.GA</hibernate.search.version>
<hibernate.validator.version>3.1.0.GA</hibernate.validator.version>
<hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
<hibernate.entitymanager.version>3.4.0.GA</hibernate.entitymanager.version>
<lucene.version>2.9.2</lucene.version>
<war_bundles_jsf_impl>false</war_bundles_jsf_impl>

<!--delombok properties-->
<lombok.source.dir>${project.build.sourceDirectory}/org/zanata</lombok.source.dir>
Expand Down Expand Up @@ -72,7 +84,7 @@
<artifactId>zanata-model</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Solr dependencies -->
<dependency>
<groupId>org.apache.solr</groupId>
Expand Down Expand Up @@ -111,7 +123,51 @@
</exclusion>
</exclusions>
</dependency>


<!-- TODO remove annotations and jmx after we move to v3.6 (AS7) -->

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>${hibernate.annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jmx</artifactId>
<version>${hibernate.jmx.version}</version>
<scope>provided</scope>
</dependency>


<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
<version>${richfaces.version}</version>
</dependency>

<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
<!--
<artifactId>richfaces-impl-jsf2</artifactId>
-->
<version>${richfaces.version}</version>
</dependency>

<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<version>${richfaces.version}</version>
</dependency>

<dependency>
<groupId>net.customware.gwt.presenter</groupId>
<artifactId>gwt-presenter</artifactId>
<version>1.1.1</version>
<scope>compile</scope>
</dependency>

</dependencies>
</dependencyManagement>
<build>
Expand All @@ -131,6 +187,94 @@
</build>

<profiles>

<profile>
<!-- Profile to use more recent versions of hibernate etc. for jboss 7 -->
<id>jboss7</id>
<properties>
<hibernate.scope>compile</hibernate.scope>
<!-- more recent hibernate versions -->
<hibernate.version>3.6.8.Final</hibernate.version>
<hibernate.search.version>3.4.1.Final</hibernate.search.version>
<hibernate.validator.version>3.1.0.GA</hibernate.validator.version>
<!-- not needed, merged into hibernate-core 3.6: -->
<hibernate.annotations.version>3.5.6-Final</hibernate.annotations.version>
<hibernate.entitymanager.version>3.6.8.Final</hibernate.entitymanager.version>
<!-- not needed, merged into hibernate-core 3.6: -->
<hibernate.jmx.version>3.5.6-Final</hibernate.jmx.version>

<!-- slightly newer versions:
<hibernate.version>3.6.10.Final</hibernate.version>
<hibernate.search.version>3.4.2.Final</hibernate.search.version>
<hibernate.validator.version>3.1.0.GA</hibernate.validator.version>
If this is used, <artifactId>hibernate-validator-legacy</artifactId>
may need to be added to each dependency element for validator.
If this is done, make a note to remove -legacy from artifactId when
moving to 4.2.0.GA for real
<hibernate.validator.version>4.2.0.Final</hibernate.validator.version>
<hibernate.entitymanager.version>3.6.10.Final</hibernate.entitymanager.version>
-->

<lucene.version>3.1.0</lucene.version>

<war_bundles_jsf_impl>true</war_bundles_jsf_impl>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-incubator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.customware.gwt.presenter</groupId>
<artifactId>gwt-presenter</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
</dependencies>

</profile>

<profile>
<!--this is used to run GWT in dev mode. Adjust your IDE to include the delombok -->
<id>delombok</id>
Expand Down
12 changes: 1 addition & 11 deletions zanata-model/pom.xml
View file
Expand Up @@ -34,7 +34,7 @@
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<addClasspath>false</addClasspath>
<classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout>
</manifest>
</archive>
Expand Down Expand Up @@ -128,21 +128,11 @@
<artifactId>hibernate-validator</artifactId>
</dependency>

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

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

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

<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
Expand Down
12 changes: 0 additions & 12 deletions zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
View file
Expand Up @@ -138,18 +138,6 @@ public HTextFlowTarget(HTextFlow textFlow, HLocale locale)
this.textFlowRevision = textFlow.getRevision();
}

@Id
@GeneratedValue
public Long getId()
{
return id;
}

protected void setId(Long id)
{
this.id = id;
}

// TODO PERF @NaturalId(mutable=false) for better criteria caching
@NaturalId
@ManyToOne
Expand Down
21 changes: 15 additions & 6 deletions zanata-war/pom.xml
View file
Expand Up @@ -146,7 +146,7 @@
</webResources>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
Expand Down Expand Up @@ -371,7 +371,7 @@
<drop>false</drop>
<create>false</create>
<outputfilename>schema.ddl</outputfilename>
<persistenceunit>zanataTestDatasource</persistenceunit>
<persistenceunit>zanataTestDatasourcePU</persistenceunit>
</componentProperties>
</configuration>
<executions>
Expand Down Expand Up @@ -873,6 +873,9 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
<!--
<artifactId>richfaces-impl-jsf2</artifactId>
-->
</dependency>

<dependency>
Expand All @@ -894,10 +897,10 @@
<scope>${hibernate.scope}</scope>
</dependency>

<!-- TODO remove annotations and jmx after we move to v3.6 (AS7) -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<scope>${hibernate.scope}</scope>
</dependency>

<dependency>
Expand All @@ -906,10 +909,10 @@
<scope>${hibernate.scope}</scope>
</dependency>

<!-- TODO remove annotations and jmx after we move to v3.6 (AS7) -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jmx</artifactId>
<scope>${hibernate.scope}</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -1080,6 +1083,12 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Expand Down Expand Up @@ -1172,10 +1181,12 @@
<artifactId>javassist</artifactId>
</dependency> -->

<!-- needed by H2 triggers -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<!-- we should probably use scope test -->
<scope>compile</scope>
</dependency>

<!-- <dependency>
Expand Down Expand Up @@ -1331,8 +1342,6 @@
<dependency>
<groupId>net.customware.gwt.presenter</groupId>
<artifactId>gwt-presenter</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
6 changes: 0 additions & 6 deletions zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
View file
Expand Up @@ -86,7 +86,6 @@ public class ApplicationConfiguration implements Serializable
private Map<String, String> configValues = new HashMap<String, String>();

private boolean debug;
private boolean hibernateStatistics = false;
private int authenticatedSessionTimeoutMinutes = 0;
private String version;
private String buildTimestamp;
Expand Down Expand Up @@ -287,11 +286,6 @@ public boolean isDebug()
return debug;
}

public boolean isHibernateStatistics()
{
return hibernateStatistics;
}

public int getAuthenticatedSessionTimeoutMinutes()
{
return authenticatedSessionTimeoutMinutes;
Expand Down

0 comments on commit e13f2ab

Please sign in to comment.