-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/dev1'
Conflicts: src/META-INF/persistence.xml
- Loading branch information
Showing
34 changed files
with
5,904 additions
and
4,183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,84 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <persistence version="2.1" | ||
| xmlns="http://xmlns.jcp.org/xml/ns/persistence" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> | ||
| <persistence-unit name="SeicentoBilling"> | ||
| <provider> | ||
| org.hibernate.jpa.HibernatePersistenceProvider | ||
| </provider> | ||
| <class>ch.xwr.seicentobilling.entities.Language</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowParameter</class> | ||
| <class>ch.xwr.seicentobilling.entities.Company</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowImage</class> | ||
| <class>ch.xwr.seicentobilling.entities.Customer</class> | ||
| <class>ch.xwr.seicentobilling.entities.Project</class> | ||
| <class>ch.xwr.seicentobilling.entities.ItemGroup</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowText</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowObject</class> | ||
| <class>ch.xwr.seicentobilling.entities.Communication</class> | ||
| <class>ch.xwr.seicentobilling.entities.Expense</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowLabel</class> | ||
| <class>ch.xwr.seicentobilling.entities.Vat</class> | ||
| <class>ch.xwr.seicentobilling.entities.VatLine</class> | ||
| <class>ch.xwr.seicentobilling.entities.Item</class> | ||
| <class>ch.xwr.seicentobilling.entities.OrderLine</class> | ||
| <class>ch.xwr.seicentobilling.entities.Entity</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowRelation</class> | ||
| <class>ch.xwr.seicentobilling.entities.ResPlanning</class> | ||
| <class>ch.xwr.seicentobilling.entities.Periode</class> | ||
| <class>ch.xwr.seicentobilling.entities.CostAccount</class> | ||
| <class>ch.xwr.seicentobilling.entities.Order</class> | ||
| <class>ch.xwr.seicentobilling.entities.StateCode</class> | ||
| <class>ch.xwr.seicentobilling.entities.City</class> | ||
| <class>ch.xwr.seicentobilling.entities.PaymentCondition</class> | ||
| <class>ch.xwr.seicentobilling.entities.Bank</class> | ||
| <class>ch.xwr.seicentobilling.entities.ProjectLine</class> | ||
| <class>ch.xwr.seicentobilling.entities.ProjectLineTemplate</class> | ||
| <class>ch.xwr.seicentobilling.entities.ExpenseTemplate</class> | ||
| <class>ch.xwr.seicentobilling.entities.Activity</class> | ||
| <class>ch.xwr.seicentobilling.entities.LabelDefinition</class> | ||
| <class>ch.xwr.seicentobilling.entities.LabelAssignment</class> | ||
| <class>ch.xwr.seicentobilling.entities.Address</class> | ||
| <class>ch.xwr.seicentobilling.entities.CustomerLink</class> | ||
| <class>ch.xwr.seicentobilling.entities.ContactRelation</class> | ||
| <class>ch.xwr.seicentobilling.entities.Conversion</class> | ||
| <class>ch.xwr.seicentobilling.entities.AppUser</class> | ||
| <exclude-unlisted-classes>true</exclude-unlisted-classes> | ||
| <properties> | ||
| <property name="hibernate.hbm2ddl.auto" value="" /> | ||
| <property name="javax.persistence.sharedCache.mode" | ||
| value="DISABLE_SELECTIVE" /> | ||
| <property name="hibernate.c3p0.max_size" value="100" /> | ||
| <property name="hibernate.c3p0.idle_test_period" | ||
| value="300" /> | ||
| <property name="hibernate.c3p0.max_statements" value="50" /> | ||
| <property name="hibernate.dialect" | ||
| value="org.hibernate.dialect.SQLServer2012Dialect" /> | ||
| <property name="hibernate.cache.use_query_cache" | ||
| value="true" /> | ||
| <property name="hibernate.c3p0.min_size" value="1" /> | ||
| <property name="hibernate.archive.autodetection" value="" /> | ||
| <property name="hibernate.cache.use_second_level_cache" | ||
| value="true" /> | ||
| <property name="hibernate.c3p0.timeout" value="3000" /> | ||
| <property name="hibernate.transaction.auto_close_session" | ||
| value="false" /> | ||
|
|
||
| <property name="javax.persistence.jdbc.url" | ||
| value="jdbc:sqlserver://localhost:1433;databaseName=seicento" /> | ||
| <property name="javax.persistence.jdbc.password" | ||
| value="usrseicento" /> | ||
|
|
||
| <property name="javax.persistence.jdbc.user" | ||
| value="usrseicento" /> | ||
|
|
||
| <property name="hibernate.show_sql" value="false" /> | ||
| <property name="hibernate.cache.region.factory_class" | ||
| value="org.hibernate.cache.jcache.JCacheRegionFactory" /> | ||
| <property name="javax.persistence.jdbc.driver" | ||
| value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> | ||
| </properties> | ||
| </persistence-unit> | ||
| </persistence> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <persistence version="2.1" | ||
| xmlns="http://xmlns.jcp.org/xml/ns/persistence" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> | ||
| <persistence-unit name="SeicentoBilling"> | ||
| <provider> | ||
| org.hibernate.jpa.HibernatePersistenceProvider | ||
| </provider> | ||
| <class>ch.xwr.seicentobilling.entities.Language</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowParameter</class> | ||
| <class>ch.xwr.seicentobilling.entities.Company</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowImage</class> | ||
| <class>ch.xwr.seicentobilling.entities.Customer</class> | ||
| <class>ch.xwr.seicentobilling.entities.Project</class> | ||
| <class>ch.xwr.seicentobilling.entities.ItemGroup</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowText</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowObject</class> | ||
| <class>ch.xwr.seicentobilling.entities.Communication</class> | ||
| <class>ch.xwr.seicentobilling.entities.Expense</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowLabel</class> | ||
| <class>ch.xwr.seicentobilling.entities.Vat</class> | ||
| <class>ch.xwr.seicentobilling.entities.VatLine</class> | ||
| <class>ch.xwr.seicentobilling.entities.Item</class> | ||
| <class>ch.xwr.seicentobilling.entities.OrderLine</class> | ||
| <class>ch.xwr.seicentobilling.entities.Entity</class> | ||
| <class>ch.xwr.seicentobilling.entities.RowRelation</class> | ||
| <class>ch.xwr.seicentobilling.entities.ResPlanning</class> | ||
| <class>ch.xwr.seicentobilling.entities.Periode</class> | ||
| <class>ch.xwr.seicentobilling.entities.CostAccount</class> | ||
| <class>ch.xwr.seicentobilling.entities.Order</class> | ||
| <class>ch.xwr.seicentobilling.entities.StateCode</class> | ||
| <class>ch.xwr.seicentobilling.entities.City</class> | ||
| <class>ch.xwr.seicentobilling.entities.PaymentCondition</class> | ||
| <class>ch.xwr.seicentobilling.entities.Bank</class> | ||
| <class>ch.xwr.seicentobilling.entities.ProjectLine</class> | ||
| <class>ch.xwr.seicentobilling.entities.ProjectLineTemplate</class> | ||
| <class>ch.xwr.seicentobilling.entities.ExpenseTemplate</class> | ||
| <class>ch.xwr.seicentobilling.entities.Activity</class> | ||
| <class>ch.xwr.seicentobilling.entities.LabelDefinition</class> | ||
| <class>ch.xwr.seicentobilling.entities.LabelAssignment</class> | ||
| <class>ch.xwr.seicentobilling.entities.Address</class> | ||
| <class>ch.xwr.seicentobilling.entities.CustomerLink</class> | ||
| <class>ch.xwr.seicentobilling.entities.ContactRelation</class> | ||
| <class>ch.xwr.seicentobilling.entities.Conversion</class> | ||
| <class>ch.xwr.seicentobilling.entities.AppUser</class> | ||
| <class>ch.xwr.seicentobilling.entities.ProjectAllocation</class> | ||
| <exclude-unlisted-classes>true</exclude-unlisted-classes> | ||
| <properties> | ||
| <property name="hibernate.hbm2ddl.auto" value="" /> | ||
| <property name="javax.persistence.sharedCache.mode" | ||
| value="DISABLE_SELECTIVE" /> | ||
| <property name="hibernate.c3p0.max_size" value="100" /> | ||
| <property name="hibernate.c3p0.idle_test_period" | ||
| value="300" /> | ||
| <property name="hibernate.c3p0.max_statements" value="50" /> | ||
| <property name="hibernate.dialect" | ||
| value="org.hibernate.dialect.SQLServer2012Dialect" /> | ||
| <property name="hibernate.cache.use_query_cache" | ||
| value="true" /> | ||
| <property name="hibernate.c3p0.min_size" value="1" /> | ||
| <property name="hibernate.archive.autodetection" value="" /> | ||
| <property name="hibernate.cache.use_second_level_cache" | ||
| value="true" /> | ||
| <property name="hibernate.c3p0.timeout" value="3000" /> | ||
| <property name="hibernate.transaction.auto_close_session" | ||
| value="false" /> | ||
|
|
||
| <property name="javax.persistence.jdbc.url" | ||
| value="jdbc:sqlserver://localhost:1433;databaseName=seicento" /> | ||
| <property name="javax.persistence.jdbc.password" | ||
| value="usrseicento" /> | ||
|
|
||
| <property name="javax.persistence.jdbc.user" | ||
| value="usrseicento" /> | ||
|
|
||
| <property name="hibernate.show_sql" value="false" /> | ||
| <property name="hibernate.cache.region.factory_class" | ||
| value="org.hibernate.cache.jcache.JCacheRegionFactory" /> | ||
| <property name="javax.persistence.jdbc.driver" | ||
| value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> | ||
| </properties> | ||
| </persistence-unit> | ||
| </persistence> |
Oops, something went wrong.