Topia-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- 4806 discussions
Author: tchemit
Date: 2013-04-23 19:45:03 +0200 (Tue, 23 Apr 2013)
New Revision: 2709
Url: http://nuiton.org/projects/topia/repository/revisions/2709
Log:
mv branch topia-2.8-hibernate4 to trunk
Added:
trunk/
Removed:
branches/topia-2.8.x-hibernate4/
Property changes on: trunk
___________________________________________________________________
Added: svn:ignore
+ *.ipr
*.iws
.classpath
*.iml
.project
target
.settings
.idea
Added: svn:mergeinfo
+ /branches/from2.2.2-eugene2-beta:1662-1714
/branches/topia-2.6.x:2293-2300
1
0
Author: tchemit
Date: 2013-04-23 19:44:20 +0200 (Tue, 23 Apr 2013)
New Revision: 2708
Url: http://nuiton.org/projects/topia/repository/revisions/2708
Log:
Move current trunk to topia-jpa branch
Added:
branches/topia-jpa/
Removed:
trunk/
Property changes on: branches/topia-jpa
___________________________________________________________________
Added: svn:ignore
+ *.ipr
*.iws
.classpath
*.iml
.project
target
.settings
.idea
Added: svn:mergeinfo
+ /branches/from2.2.2-eugene2-beta:1662-1714
/branches/topia-2.6.x:2293-2300
1
0
17 Apr '13
Jenkins build is unstable: topia-2.8.x-hibernate4 » ToPIA :: Persistence #1
by admin+hudson@codelutin.com 17 Apr '13
by admin+hudson@codelutin.com 17 Apr '13
17 Apr '13
08 Apr '13
Author: echatellier
Date: 2013-04-08 16:44:16 +0200 (Mon, 08 Apr 2013)
New Revision: 2707
Url: http://nuiton.org/projects/topia/repository/revisions/2707
Log:
refs #2652: Update to hibernate 4.2.0.Final
Removed:
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java
Modified:
branches/topia-2.8.x-hibernate4/pom.xml
branches/topia-2.8.x-hibernate4/topia-persistence/pom.xml
branches/topia-2.8.x-hibernate4/topia-persistence/src/license/THIRD-PARTY.properties
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java
branches/topia-2.8.x-hibernate4/topia-service-migration/src/license/THIRD-PARTY.properties
branches/topia-2.8.x-hibernate4/topia-service-replication/src/license/THIRD-PARTY.properties
branches/topia-2.8.x-hibernate4/topia-service-security/src/license/THIRD-PARTY.properties
Modified: branches/topia-2.8.x-hibernate4/pom.xml
===================================================================
--- branches/topia-2.8.x-hibernate4/pom.xml 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/pom.xml 2013-04-08 14:44:16 UTC (rev 2707)
@@ -33,7 +33,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmineAndCentral</artifactId>
- <version>3.4.7</version>
+ <version>3.4.9</version>
</parent>
<artifactId>topia</artifactId>
@@ -59,14 +59,14 @@
<projectId>topia</projectId>
<!-- libs version -->
- <eugeneVersion>2.5.6.1</eugeneVersion>
- <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion>
+ <eugeneVersion>2.6.2</eugeneVersion>
+ <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
<processorPluginVersion>1.3</processorPluginVersion>
<nuitonI18nVersion>2.5</nuitonI18nVersion>
<xmlrpcVersion>3.1.2</xmlrpcVersion>
- <hibernateVersion>4.2.0.CR2</hibernateVersion>
- <sl4jVersion>1.6.6</sl4jVersion>
- <h2Version>1.3.168</h2Version>
+ <hibernateVersion>4.2.0.Final</hibernateVersion>
+ <sl4jVersion>1.7.5</sl4jVersion>
+ <h2Version>1.3.171</h2Version>
<hamcrestVersion>1.3</hamcrestVersion>
<!-- i18n configuration -->
@@ -142,12 +142,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
-
<!-- hibernate-core only include api, need implementation,
binding with log4j will be used
-->
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/pom.xml
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-persistence/pom.xml 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/pom.xml 2013-04-08 14:44:16 UTC (rev 2707)
@@ -99,11 +99,6 @@
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/license/THIRD-PARTY.properties
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-persistence/src/license/THIRD-PARTY.properties 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/license/THIRD-PARTY.properties 2013-04-08 14:44:16 UTC (rev 2707)
@@ -1,10 +1,11 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - Apache License 2.0
# - BSD License
-# - BSD style
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Public License Version 1.0
+# - GNU Lesser General Public License, version 2.1
# - GNU Library or Lesser General Public License
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL) v 3.0
@@ -13,19 +14,17 @@
# - MIT License
# - MPL 1.1
# - Mozilla Public License Version 1.0
+# - New BSD License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
# - The SAX License
# - The W3C License
-# - The Werken Company License
+# - http://jaxen.codehaus.org/license.html
# - license.txt
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Sun Aug 19 16:33:57 CEST 2012
-antlr--antlr--2.7.6=BSD License
+#Fri Mar 15 12:36:23 CET 2013
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-jdom--jdom--1.0=The Apache Software License, Version 2.0
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-04-08 14:44:16 UTC (rev 2707)
@@ -262,30 +262,6 @@
void add(TopiaEntity e) throws TopiaException;
/**
- * Permet d'importer des données en XML.
- *
- * @param xml le flux XML
- * @throws TopiaException si une erreur survient durant l'import
- */
- void importXML(Reader xml) throws TopiaException;
-
- /**
- * Permet d'exporter certaines données en XML.
- * <p/>
- * <b>Note:</b> Si le parametre <code>entityAndCondition</code> est vide,
- * alors on duplique toutes les entités de la base.
- *
- * @param xml le flux XML dans lequel il faut ecrire
- * @param entityAndCondition paramètre qui vont par deux, qui represente la
- * classe de l'entity a exporter et la condition
- * where que doit respecter l'objet pour etre
- * exporter (entityClass, condition)
- * @throws TopiaException si une erreur survient durant l'export
- */
- void exportXML(Writer xml, Object... entityAndCondition)
- throws TopiaException;
-
- /**
* Permet de dupliquer de ce context vers un context d'une autre base des
* données sans modification des entites.
* <p/>
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-04-08 14:44:16 UTC (rev 2707)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2004 - 2010 CodeLutin
+ * Copyright (C) 2004 - 2013 CodeLutin, Chatellier Eric
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -32,8 +32,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.Reader;
-import java.io.Writer;
import java.lang.reflect.Field;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -64,7 +62,6 @@
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
-import org.hibernate.event.service.internal.EventListenerRegistryImpl;
import org.hibernate.event.service.spi.EventListenerRegistry;
import org.hibernate.event.spi.EventType;
import org.hibernate.internal.SessionFactoryImpl;
@@ -502,26 +499,23 @@
return hibernate;
}
- protected ServiceRegistry serviceRegistry;
- public ServiceRegistry getServiceRegistry() throws TopiaNotFoundException {
- if (serviceRegistry == null) {
- ServiceRegistryBuilder serviceRegistryBuilder = new ServiceRegistryBuilder().applySettings(
- getHibernateConfiguration().getProperties());
-
- serviceRegistry = serviceRegistryBuilder.buildServiceRegistry();
- }
- return serviceRegistry;
- }
@Override
public SessionFactory getHibernateFactory() throws TopiaNotFoundException {
if (hibernateFactory == null) {
if (getParentContext() != null) {
hibernateFactory = getParentContext().getHibernateFactory();
} else {
- hibernateFactory = getHibernateConfiguration().buildSessionFactory(getServiceRegistry());
- EventListenerRegistry eventListenerRegistry = ((SessionFactoryImpl)hibernateFactory).getServiceRegistry()
- .getService(EventListenerRegistry.class);
+ // init service registry
+ ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings(
+ getHibernateConfiguration().getProperties()).buildServiceRegistry();
+
+ hibernateFactory = getHibernateConfiguration().buildSessionFactory(serviceRegistry);
+
+ // we can't reuse original serviceRegistry instance
+ // we must call getServiceRegistry on factory to get a working one
+ ServiceRegistry serviceRegistryInit = ((SessionFactoryImpl)hibernateFactory).getServiceRegistry();
+ EventListenerRegistry eventListenerRegistry = serviceRegistryInit.getService(EventListenerRegistry.class);
TopiaFiresSupport.TopiaHibernateEvent listener =
new TopiaFiresSupport.TopiaHibernateEvent(this);
eventListenerRegistry.appendListeners(EventType.PRE_INSERT, listener);
@@ -1048,85 +1042,6 @@
}
@Override
- public void importXML(Reader xml) throws TopiaException {
- checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context",
- "importXML"));
-
- /*Document doc;
-
- SAXReader xmlReader = new SAXReader();
- try {
- doc = xmlReader.read(xml);
- if (log.isDebugEnabled()) {
- log.debug("Lecture du document terminee");
- }
- } catch (DocumentException de) {
- throw new TopiaException(
- _("topia.persistence.error.on.loding.xml.doc",
- de.getMessage()), de);
- }
-
- if (doc != null) {
- Session sessionDom4j = getHibernate().getSession(EntityMode.DOM4J);
- Element rootElement = doc.getRootElement();
- Iterator<?> it = rootElement.elementIterator();
- while (it.hasNext()) {
- Element entity = (Element) it.next();
- try {
- sessionDom4j.replicate(entity, ReplicationMode.EXCEPTION);
- } catch (HibernateException he) {
- log.warn(_("topia.persistence.error.replicate.entity",
- entity, he.getMessage()), he);
- }
- }
- // must commit data, otherwise : no effects...
- sessionDom4j.flush();
- } else {
- throw new TopiaException(
- _("topia.persistence.error.empty.doc"));
- }*/
- }
-
- @Override
- public void exportXML(Writer xml, Object... entityAndcondition)
- throws TopiaException {
- checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context",
- "exportXML"));
-
- /*String[] queries = buildQueries(entityAndcondition);
-
- // performs queries
- try {
- Session sessionDom4j = getHibernate().getSession(EntityMode.DOM4J);
-
- Document doc = DocumentFactory.getInstance().createDocument();
- Element rootElement = doc.addElement("topiaExport");
- DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
- String date = format.format(new Date(System.currentTimeMillis()));
- rootElement.addAttribute("date", date);
-
- for (String query : queries) {
- List<?> list = sessionDom4j.createQuery(query).list();
- for (Object o : list) {
- rootElement.add((Element) o);
- }
- }
-
- XMLWriter result = new XMLWriter(xml,
- OutputFormat.createPrettyPrint());
- result.write(doc);
- result.close();
-
- } catch (HibernateException eee) {
- throw new TopiaException(_("topia.persistence.error.on.export",
- eee.getMessage()), eee);
- } catch (IOException eee) {
- throw new TopiaException(_("topia.persistence.error.on.export",
- eee.getMessage()), eee);
- }*/
- }
-
- @Override
public void replicate(TopiaContext dstCtxt, Object... entityAndCondition)
throws TopiaException, IllegalArgumentException {
checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context",
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-04-08 14:44:16 UTC (rev 2707)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2004 - 2010 CodeLutin
+ * Copyright (C) 2004 - 2013 CodeLutin, Chatellier Eric
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -36,6 +36,7 @@
import org.apache.commons.logging.LogFactory;
import org.hibernate.cfg.Configuration;
import org.hibernate.dialect.Dialect;
+import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table;
import org.hibernate.service.ServiceRegistry;
@@ -176,8 +177,9 @@
boolean exist = false;
try {
- Configuration configuration =
- ((TopiaContextImplementor) tx).getHibernateConfiguration();
+ TopiaContextImplementor txi = (TopiaContextImplementor) tx;
+
+ Configuration configuration = txi.getHibernateConfiguration();
PersistentClass classMapping =
configuration.getClassMapping(entityName);
if (classMapping == null) {
@@ -196,8 +198,9 @@
throw new IllegalArgumentException(
"could not find entity with name " + entityName);
}
-
- ServiceRegistry serviceRegistry = ((TopiaContextImpl) tx).getServiceRegistry();
+
+ SessionFactoryImpl sfi = (SessionFactoryImpl)txi.getHibernateFactory();
+ ServiceRegistry serviceRegistry = sfi.getServiceRegistry();
ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class);
Dialect dialect = Dialect.getDialect(configuration.getProperties());
Deleted: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java 2013-04-08 14:44:16 UTC (rev 2707)
@@ -1,365 +0,0 @@
-/*
- * #%L
- * ToPIA :: Persistence
- *
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2004 - 2012 CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
-package org.nuiton.topia.persistence;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.nuiton.topia.framework.TopiaQuery;
-import org.nuiton.topia.persistence.pager.TopiaPagerBean;
-import org.nuiton.util.PagerUtil;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Extension of the simple {@link PagerUtil} from nuiton-utils to offer
- * order and filter api.
- *
- * @author tchemit <chemit(a)codelutin.com>
- * @since 2.6.9
- * @deprecated since 2.6.14, use now {@link TopiaPagerBean}.
- */
-@Deprecated
-public class TopiaFilterPagerUtil extends PagerUtil {
-
- protected TopiaFilterPagerUtil() {
- }
-
- /**
- * @param query
- * @param pager
- * @return
- * @deprecated since 2.6.12 TopiaQuery will be removed in version 3.0 of ToPIA
- */
- @Deprecated
- public static TopiaQuery addPagerToQuery(TopiaQuery query,
- FilterPagerBean pager) {
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- query.setLimit(pager.getRecordStartIndex(),
- pager.getRecordEndIndex() - 1);
-
- if (StringUtils.isNotEmpty(pager.getSortColumn())) {
- if (pager.isSortAscendant()) {
- query.addOrder(pager.getSortColumn());
- } else {
- query.addOrderDesc(pager.getSortColumn());
- }
- }
- return query;
- }
-
- public static <E> List<E> getPageFromList(List<E> elements,
- FilterPagerBean pager) {
-
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- List<E> subList = getPage(elements, pager.getPageIndex(), pager.getPageSize());
- List<E> result = new ArrayList<E>(subList);
-
- return result;
- }
-
- public static FilterPagerBean newFilterPagerBean() {
- return new FilterPagerBean();
- }
-
- public static class FilterPagerBean extends PagerBean {
-
- private static final long serialVersionUID = 1L;
-
- // sorting order - asc or desc
- protected boolean sortAscendant;
-
- // get index row - i.e. user click to sort.
- protected String sortColumn;
-
- protected FilterOperationGroup groupOp;
-
- private List<FilterRule> rules;
-
- public boolean canFilter() {
- return groupOp != null && CollectionUtils.isNotEmpty(rules);
- }
-
- public FilterOperationGroup getGroupOp() {
- return groupOp;
- }
-
- public void setGroupOp(FilterOperationGroup groupOp) {
- this.groupOp = groupOp;
- }
-
- public List<FilterRule> getRules() {
- return rules;
- }
-
- public void setRules(List<FilterRule> rules) {
- this.rules = rules;
- }
-
- public boolean isSortAscendant() {
- return sortAscendant;
- }
-
- public void setSortAscendant(boolean sortAscendant) {
- this.sortAscendant = sortAscendant;
- }
-
- public String getSortColumn() {
- return sortColumn;
- }
-
- public void setSortColumn(String sortColumn) {
- this.sortColumn = sortColumn;
- }
- }
-
- public static class FilterRule implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- protected final FilterOperation op;
-
- protected final String field;
-
- protected final String data;
-
- public FilterRule(FilterOperation op,
- String field,
- String data) {
- this.op = op;
- this.field = field;
- this.data = data;
- }
-
- public FilterOperation getOp() {
- return op;
- }
-
- public String getField() {
- return field;
- }
-
- public String getData() {
- return data;
- }
- }
-
- public enum FilterOperationGroup {
- OR, AND
- }
-
- public enum FilterOperation {
- /** Equals operator. */
- eq {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " = :" + paramName;
- filterParams.put(paramName, data);
- return ruleFilter;
- }
- },
- /** Not equals operator. */
- ne {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " != :" + paramName;
- filterParams.put(paramName, data);
- return ruleFilter;
- }
- },
- /** Contains operator. */
- cn {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " like :" + paramName;
- filterParams.put(paramName, "%" + data + "%");
- return ruleFilter;
- }
- },
- /** Not contains operator. */
- nc {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " not like :" + paramName;
- filterParams.put(paramName, "%" + data + "%");
- return ruleFilter;
- }
- },
- /** Begins with operator. */
- bw {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " like :" + paramName;
- filterParams.put(paramName, data + "%");
- return ruleFilter;
- }
- },
- /** Not between with operator. */
- bn {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " not like :" + paramName;
- filterParams.put(paramName, data + "%");
- return ruleFilter;
- }
- },
- /** Ends with operator. */
- ew {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " like :" + paramName;
- filterParams.put(paramName, "%" + data);
- return ruleFilter;
- }
- },
- /** Not End with operator. */
- en {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " not like :" + paramName;
- filterParams.put(paramName, "%" + data);
- return ruleFilter;
- }
- },
- /** Lesser than operator. */
- lt {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " < :" + paramName;
- filterParams.put(paramName, data);
- return ruleFilter;
- }
- },
- /** Lesser or equals operator. */
- le {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " <= :" + paramName;
- filterParams.put(paramName, data);
- return ruleFilter;
- }
- },
- /** Greater than operator. */
- gt {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " > :" + paramName;
- filterParams.put(paramName, data);
- return ruleFilter;
- }
- },
- /** Greater or equals operator. */
- ge {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " >= :" + paramName;
- filterParams.put(paramName, data);
- return ruleFilter;
- }
- },
- /** Is null operator. */
- nu {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " is null";
- return ruleFilter;
- }
- },
- /** Is not null operator. */
- nn {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- String ruleFilter = propertyName + " is not null";
- return ruleFilter;
- }
- },
- /** Is among operator. */
- in {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- throw new UnsupportedOperationException();
- }
- },
- /** Not is among operator. */
- ni {
- @Override
- public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) {
- throw new UnsupportedOperationException();
- }
- };
-
- public abstract String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams);
- }
-
-
- public static FilterPagerBeanBuilder newFilterPagerBeanBuilder(String operationGroup) {
- FilterOperationGroup operationGroup1 = FilterOperationGroup.valueOf(operationGroup);
- FilterPagerBeanBuilder builder = new FilterPagerBeanBuilder(operationGroup1);
- return builder;
- }
-
- public static class FilterPagerBeanBuilder {
-
- protected final FilterOperationGroup groupOp;
-
- protected final List<FilterRule> rules;
-
- public FilterPagerBeanBuilder(FilterOperationGroup groupOp) {
- this.groupOp = groupOp;
- rules = new LinkedList<FilterRule>();
- }
-
- public FilterPagerBeanBuilder addOperations(Collection<Map<String, String>> operations) {
- for (Map<String, String> operation : operations) {
- addRule(operation);
- }
- return this;
- }
-
- public FilterPagerBeanBuilder addRule(Map<String, String> ruleMap) {
- String op = ruleMap.get("op");
- String property = ruleMap.get("field");
- String value = ruleMap.get("data");
- FilterOperation operator = FilterOperation.valueOf(op);
- return addRule(new FilterRule(operator, property, value));
- }
-
- public FilterPagerBeanBuilder addRule(FilterRule rule) {
- rules.add(rule);
- return this;
- }
-
- public void flush(FilterPagerBean bean) {
- bean.setGroupOp(groupOp);
- bean.setRules(rules);
- }
-
-
- }
-}
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2013-04-08 14:44:16 UTC (rev 2707)
@@ -101,6 +101,8 @@
boolean actual = TopiaUtil.isSchemaExist(rootContext,
PersonImpl.class.getName());
+ // FIXME echatellier 20130315 ce test fail depuis probablement a cause
+ // de hibernate.hbm2ddl.auto=update, à confirmer...
assertFalse(actual);
TopiaContext tx = rootContext.beginTransaction();
Modified: branches/topia-2.8.x-hibernate4/topia-service-migration/src/license/THIRD-PARTY.properties
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-service-migration/src/license/THIRD-PARTY.properties 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-service-migration/src/license/THIRD-PARTY.properties 2013-04-08 14:44:16 UTC (rev 2707)
@@ -1,15 +1,19 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - Apache License 2.0
# - BSD License
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Public License Version 1.0
+# - GNU Lesser General Public License, version 2.1
+# - GNU Library or Lesser General Public License
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL) v 3.0
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
# - MPL 1.1
+# - New BSD License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
# - license.txt
@@ -17,8 +21,6 @@
# Please fill the missing licenses for dependencies :
#
#
-#Thu Aug 18 07:47:56 CEST 2011
-antlr--antlr--2.7.6=BSD License
+#Fri Mar 15 12:42:01 CET 2013
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: branches/topia-2.8.x-hibernate4/topia-service-replication/src/license/THIRD-PARTY.properties
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-service-replication/src/license/THIRD-PARTY.properties 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-service-replication/src/license/THIRD-PARTY.properties 2013-04-08 14:44:16 UTC (rev 2707)
@@ -1,15 +1,19 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - Apache License 2.0
# - BSD License
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Public License Version 1.0
+# - GNU Lesser General Public License, version 2.1
+# - GNU Library or Lesser General Public License
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL) v 3.0
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
# - MPL 1.1
+# - New BSD License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
# - license.txt
@@ -17,8 +21,6 @@
# Please fill the missing licenses for dependencies :
#
#
-#Thu Aug 18 07:47:24 CEST 2011
-antlr--antlr--2.7.6=BSD License
+#Fri Mar 15 12:41:29 CET 2013
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: branches/topia-2.8.x-hibernate4/topia-service-security/src/license/THIRD-PARTY.properties
===================================================================
--- branches/topia-2.8.x-hibernate4/topia-service-security/src/license/THIRD-PARTY.properties 2013-03-12 15:48:07 UTC (rev 2706)
+++ branches/topia-2.8.x-hibernate4/topia-service-security/src/license/THIRD-PARTY.properties 2013-04-08 14:44:16 UTC (rev 2707)
@@ -1,15 +1,19 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - Apache License 2.0
# - BSD License
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Public License Version 1.0
+# - GNU Lesser General Public License, version 2.1
+# - GNU Library or Lesser General Public License
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL) v 3.0
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
# - MPL 1.1
+# - New BSD License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
# - license.txt
@@ -17,8 +21,6 @@
# Please fill the missing licenses for dependencies :
#
#
-#Thu Aug 18 07:48:01 CEST 2011
-antlr--antlr--2.7.6=BSD License
+#Fri Mar 15 12:42:13 CET 2013
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
1
0
12 Mar '13
Author: echatellier
Date: 2013-03-12 16:48:07 +0100 (Tue, 12 Mar 2013)
New Revision: 2706
Url: http://nuiton.org/projects/topia/repository/revisions/2706
Log:
Test new branch on hibernate 4.2
Added:
branches/topia-2.8.x-hibernate4/
Modified:
branches/topia-2.8.x-hibernate4/pom.xml
branches/topia-2.8.x-hibernate4/topia-persistence/pom.xml
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java
branches/topia-2.8.x-hibernate4/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java
branches/topia-2.8.x-hibernate4/topia-service-migration/pom.xml
branches/topia-2.8.x-hibernate4/topia-service-replication/pom.xml
branches/topia-2.8.x-hibernate4/topia-service-security/pom.xml
Property changes on: branches/topia-2.8.x-hibernate4
___________________________________________________________________
Added: svn:ignore
+ *.ipr
*.iws
.classpath
*.iml
.project
target
.settings
.idea
Added: svn:mergeinfo
+ /branches/from2.2.2-eugene2-beta:1662-1714
/branches/topia-2.6.x:2293-2300
Modified: branches/topia-2.8.x-hibernate4/pom.xml
===================================================================
--- branches/topia-2.6.x/pom.xml 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/pom.xml 2013-03-12 15:48:07 UTC (rev 2706)
@@ -37,7 +37,7 @@
</parent>
<artifactId>topia</artifactId>
- <version>2.7.2-SNAPSHOT</version>
+ <version>2.8-SNAPSHOT</version>
<modules>
<module>topia-persistence</module>
@@ -64,7 +64,7 @@
<processorPluginVersion>1.3</processorPluginVersion>
<nuitonI18nVersion>2.5</nuitonI18nVersion>
<xmlrpcVersion>3.1.2</xmlrpcVersion>
- <hibernateVersion>3.6.10.Final</hibernateVersion>
+ <hibernateVersion>4.2.0.CR2</hibernateVersion>
<sl4jVersion>1.6.6</sl4jVersion>
<h2Version>1.3.168</h2Version>
<hamcrestVersion>1.3</hamcrestVersion>
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/pom.xml
===================================================================
--- branches/topia-2.6.x/topia-persistence/pom.xml 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/pom.xml 2013-03-12 15:48:07 UTC (rev 2706)
@@ -35,7 +35,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
- <version>2.7.2-SNAPSHOT</version>
+ <version>2.8-SNAPSHOT</version>
</parent>
<groupId>org.nuiton.topia</groupId>
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java
===================================================================
--- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2013-03-12 15:48:07 UTC (rev 2706)
@@ -24,22 +24,23 @@
*/
package org.nuiton.topia.framework;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
-import org.hibernate.cfg.Environment;
-import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.connection.ConnectionProviderFactory;
-import org.hibernate.util.PropertiesHelper;
-import org.hibernate.util.ReflectHelper;
-
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.HibernateException;
+import org.hibernate.cfg.Environment;
+import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
+import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+
/**
* Customized connection provider.
* <p/>
@@ -61,7 +62,7 @@
* @author tchemit <chemit(a)codelutin.com>
* @since 2.5.3
*/
-public class TopiaConnectionProvider implements ConnectionProvider {
+public class TopiaConnectionProvider extends DriverManagerConnectionProviderImpl {
/** Logger. */
private static final Log log =
@@ -112,19 +113,19 @@
}
@Override
- public void configure(Properties props) throws HibernateException {
- String driverClass = props.getProperty(Environment.DRIVER);
+ public void configure(Map configurationValues) throws HibernateException {
+ String driverClass = (String)configurationValues.get(Environment.DRIVER);
- poolSize = PropertiesHelper.getInt(Environment.POOL_SIZE, props, 20); //default pool size 20
+ poolSize = ConfigurationHelper.getInt(Environment.POOL_SIZE, configurationValues, 20); //default pool size 20
if (log.isDebugEnabled()) {
log.debug("Connection pool size: " + poolSize);
}
- autocommit = PropertiesHelper.getBoolean(Environment.AUTOCOMMIT, props);
+ autocommit = ConfigurationHelper.getBoolean(Environment.AUTOCOMMIT, configurationValues);
if (log.isDebugEnabled())
log.debug("autocommit mode: " + autocommit);
- isolation = PropertiesHelper.getInteger(Environment.ISOLATION, props);
+ isolation = ConfigurationHelper.getInteger(Environment.ISOLATION, configurationValues);
if (isolation != null) {
if (log.isDebugEnabled()) {
log.debug("JDBC isolation level: " +
@@ -153,7 +154,7 @@
}
}
- url = props.getProperty(Environment.URL);
+ url = (String)configurationValues.get(Environment.URL);
if (url == null) {
String msg = "JDBC URL was not specified by property " +
Environment.URL;
@@ -164,7 +165,7 @@
}
connectionProps =
- ConnectionProviderFactory.getConnectionProperties(props);
+ ConnectionProviderInitiator.getConnectionProperties(configurationValues);
if (log.isDebugEnabled()) {
log.debug("using driver: " + driverClass + " at URL: " + url);
@@ -174,7 +175,7 @@
log.debug("connection properties: " + connectionProps);
} else if (log.isDebugEnabled()) {
log.debug("connection properties: " +
- PropertiesHelper.maskOut(connectionProps, "password"));
+ ConfigurationHelper.maskOut(connectionProps, "password"));
}
}
@@ -272,11 +273,11 @@
@Override
protected void finalize() throws Throwable {
super.finalize();
- close();
+ stop();
}
@Override
- public void close() {
+ public void stop() {
if (log.isDebugEnabled()) {
log.debug("cleaning up connection pool: " + url);
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java
===================================================================
--- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-03-12 15:48:07 UTC (rev 2706)
@@ -25,17 +25,36 @@
package org.nuiton.topia.framework;
+import static org.nuiton.i18n.I18n._;
+
+import java.beans.PropertyChangeListener;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.zip.GZIPInputStream;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.DocumentFactory;
-import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.SAXReader;
-import org.dom4j.io.XMLWriter;
-import org.hibernate.EntityMode;
import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
import org.hibernate.Query;
@@ -45,15 +64,13 @@
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
-import org.hibernate.event.PostDeleteEventListener;
-import org.hibernate.event.PostInsertEventListener;
-import org.hibernate.event.PostLoadEventListener;
-import org.hibernate.event.PostUpdateEventListener;
-import org.hibernate.event.PreDeleteEventListener;
-import org.hibernate.event.PreInsertEventListener;
-import org.hibernate.event.PreLoadEventListener;
-import org.hibernate.event.PreUpdateEventListener;
+import org.hibernate.event.service.internal.EventListenerRegistryImpl;
+import org.hibernate.event.service.spi.EventListenerRegistry;
+import org.hibernate.event.spi.EventType;
+import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.jdbc.Work;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.hbm2ddl.SchemaUpdate;
import org.nuiton.topia.TopiaContext;
@@ -70,40 +87,7 @@
import org.nuiton.topia.persistence.TopiaDAOImpl;
import org.nuiton.topia.persistence.TopiaEntity;
import org.nuiton.topia.persistence.TopiaId;
-import org.nuiton.util.ArrayUtil;
-import java.beans.PropertyChangeListener;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.lang.reflect.Field;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.zip.GZIPInputStream;
-
-import static org.nuiton.i18n.I18n._;
-
/**
* Le TopiaContextImpl est le point d'entre pour acceder aux donnees. Il est
* configurer par un fichier de propriete
@@ -518,13 +502,36 @@
return hibernate;
}
+ protected ServiceRegistry serviceRegistry;
+ public ServiceRegistry getServiceRegistry() throws TopiaNotFoundException {
+ if (serviceRegistry == null) {
+ ServiceRegistryBuilder serviceRegistryBuilder = new ServiceRegistryBuilder().applySettings(
+ getHibernateConfiguration().getProperties());
+
+ serviceRegistry = serviceRegistryBuilder.buildServiceRegistry();
+ }
+ return serviceRegistry;
+ }
@Override
public SessionFactory getHibernateFactory() throws TopiaNotFoundException {
if (hibernateFactory == null) {
if (getParentContext() != null) {
hibernateFactory = getParentContext().getHibernateFactory();
} else {
- hibernateFactory = getHibernateConfiguration().buildSessionFactory();
+ hibernateFactory = getHibernateConfiguration().buildSessionFactory(getServiceRegistry());
+
+ EventListenerRegistry eventListenerRegistry = ((SessionFactoryImpl)hibernateFactory).getServiceRegistry()
+ .getService(EventListenerRegistry.class);
+ TopiaFiresSupport.TopiaHibernateEvent listener =
+ new TopiaFiresSupport.TopiaHibernateEvent(this);
+ eventListenerRegistry.appendListeners(EventType.PRE_INSERT, listener);
+ eventListenerRegistry.appendListeners(EventType.PRE_LOAD, listener);
+ eventListenerRegistry.appendListeners(EventType.PRE_UPDATE, listener);
+ eventListenerRegistry.appendListeners(EventType.PRE_DELETE, listener);
+ eventListenerRegistry.appendListeners(EventType.POST_INSERT, listener);
+ eventListenerRegistry.appendListeners(EventType.POST_LOAD, listener);
+ eventListenerRegistry.appendListeners(EventType.POST_UPDATE, listener);
+ eventListenerRegistry.appendListeners(EventType.POST_DELETE, listener);
}
}
return hibernateFactory;
@@ -539,76 +546,6 @@
} else {
hibernateConfiguration = new Configuration();
- // Ajout du listeners pour les events
- TopiaFiresSupport.TopiaHibernateEvent listener =
- new TopiaFiresSupport.TopiaHibernateEvent(this);
-
- PreInsertEventListener[] preInsertEventListeners =
- hibernateConfiguration.getEventListeners().
- getPreInsertEventListeners();
- preInsertEventListeners = ArrayUtil.concatElems(
- preInsertEventListeners, listener);
-
- PreLoadEventListener[] preLoadEventListeners =
- hibernateConfiguration.getEventListeners().
- getPreLoadEventListeners();
- preLoadEventListeners = ArrayUtil.concatElems(
- preLoadEventListeners, listener);
-
- PreUpdateEventListener[] preUpdateEventListeners =
- hibernateConfiguration.getEventListeners().
- getPreUpdateEventListeners();
- preUpdateEventListeners = ArrayUtil.concatElems(
- preUpdateEventListeners, listener);
-
- PreDeleteEventListener[] preDeleteEventListeners =
- hibernateConfiguration.getEventListeners().
- getPreDeleteEventListeners();
- preDeleteEventListeners = ArrayUtil.concatElems(
- preDeleteEventListeners, listener);
-
- PostInsertEventListener[] postInsertEventListeners =
- hibernateConfiguration.getEventListeners().
- getPostInsertEventListeners();
- postInsertEventListeners = ArrayUtil.concatElems(
- postInsertEventListeners, listener);
-
- PostLoadEventListener[] postLoadEventListeners =
- hibernateConfiguration.getEventListeners().
- getPostLoadEventListeners();
- postLoadEventListeners = ArrayUtil.concatElems(
- postLoadEventListeners, listener);
-
- PostUpdateEventListener[] postUpdateEventListeners =
- hibernateConfiguration.getEventListeners().
- getPostUpdateEventListeners();
- postUpdateEventListeners = ArrayUtil.concatElems(
- postUpdateEventListeners, listener);
-
- PostDeleteEventListener[] postDeleteEventListeners =
- hibernateConfiguration.getEventListeners().
- getPostDeleteEventListeners();
- postDeleteEventListeners = ArrayUtil.concatElems(
- postDeleteEventListeners, listener);
-
- hibernateConfiguration.getEventListeners().
- setPreInsertEventListeners(preInsertEventListeners);
- hibernateConfiguration.getEventListeners().
- setPreLoadEventListeners(preLoadEventListeners);
- hibernateConfiguration.getEventListeners().
- setPreUpdateEventListeners(preUpdateEventListeners);
- hibernateConfiguration.getEventListeners().
- setPreDeleteEventListeners(preDeleteEventListeners);
-
- hibernateConfiguration.getEventListeners().
- setPostInsertEventListeners(postInsertEventListeners);
- hibernateConfiguration.getEventListeners().
- setPostLoadEventListeners(postLoadEventListeners);
- hibernateConfiguration.getEventListeners().
- setPostUpdateEventListeners(postUpdateEventListeners);
- hibernateConfiguration.getEventListeners().
- setPostDeleteEventListeners(postDeleteEventListeners);
-
// ajout des repertoires contenant les mappings hibernate
String[] dirs = getConfig().getProperty(
TopiaContextFactory.CONFIG_PERSISTENCE_DIRECTORIES, "").split(",");
@@ -1115,7 +1052,7 @@
checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context",
"importXML"));
- Document doc;
+ /*Document doc;
SAXReader xmlReader = new SAXReader();
try {
@@ -1147,7 +1084,7 @@
} else {
throw new TopiaException(
_("topia.persistence.error.empty.doc"));
- }
+ }*/
}
@Override
@@ -1156,7 +1093,7 @@
checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context",
"exportXML"));
- String[] queries = buildQueries(entityAndcondition);
+ /*String[] queries = buildQueries(entityAndcondition);
// performs queries
try {
@@ -1175,36 +1112,6 @@
}
}
- /*for (int i = 0; i < entityAndcondition.length;) {
- try {
- entityClass = (Class) entityAndcondition[i++];
- condition = (String) entityAndcondition[i++];
-
- String query = "from " + entityClass.getName();
- if (condition != null && !condition.isEmpty()) {
- query += " where " + condition;
- }
-
- for (Object o : sessionDom4j.createQuery(query).list()) {
- rootElement.add((Element) o);
- }
- } catch (ClassCastException eee) {
- if (i % 2 == 0) {
- throw new IllegalArgumentException(
- "Others arguement must be String not "
- + entityAndcondition[i - 1], eee);
- } else {
- throw new IllegalArgumentException(
- "Others arguement must be Class not "
- + entityAndcondition[i - 1], eee);
- }
- } catch (IndexOutOfBoundsException eee) {
- throw new IllegalArgumentException(
- "Others arguement must be couple of (Class, String)",
- eee);
- }
- }*/
-
XMLWriter result = new XMLWriter(xml,
OutputFormat.createPrettyPrint());
result.write(doc);
@@ -1216,7 +1123,7 @@
} catch (IOException eee) {
throw new TopiaException(_("topia.persistence.error.on.export",
eee.getMessage()), eee);
- }
+ }*/
}
@Override
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java
===================================================================
--- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2013-03-12 15:48:07 UTC (rev 2706)
@@ -25,26 +25,36 @@
package org.nuiton.topia.framework;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.beans.VetoableChangeSupport;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.collections.map.IdentityMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
-import org.hibernate.event.PostDeleteEvent;
-import org.hibernate.event.PostDeleteEventListener;
-import org.hibernate.event.PostInsertEvent;
-import org.hibernate.event.PostInsertEventListener;
-import org.hibernate.event.PostLoadEvent;
-import org.hibernate.event.PostLoadEventListener;
-import org.hibernate.event.PostUpdateEvent;
-import org.hibernate.event.PostUpdateEventListener;
-import org.hibernate.event.PreDeleteEvent;
-import org.hibernate.event.PreDeleteEventListener;
-import org.hibernate.event.PreInsertEvent;
-import org.hibernate.event.PreInsertEventListener;
-import org.hibernate.event.PreLoadEvent;
-import org.hibernate.event.PreLoadEventListener;
-import org.hibernate.event.PreUpdateEvent;
-import org.hibernate.event.PreUpdateEventListener;
+import org.hibernate.event.spi.PostDeleteEvent;
+import org.hibernate.event.spi.PostDeleteEventListener;
+import org.hibernate.event.spi.PostInsertEvent;
+import org.hibernate.event.spi.PostInsertEventListener;
+import org.hibernate.event.spi.PostLoadEvent;
+import org.hibernate.event.spi.PostLoadEventListener;
+import org.hibernate.event.spi.PostUpdateEvent;
+import org.hibernate.event.spi.PostUpdateEventListener;
+import org.hibernate.event.spi.PreDeleteEvent;
+import org.hibernate.event.spi.PreDeleteEventListener;
+import org.hibernate.event.spi.PreInsertEvent;
+import org.hibernate.event.spi.PreInsertEventListener;
+import org.hibernate.event.spi.PreLoadEvent;
+import org.hibernate.event.spi.PreLoadEventListener;
+import org.hibernate.event.spi.PreUpdateEvent;
+import org.hibernate.event.spi.PreUpdateEventListener;
import org.nuiton.topia.TopiaContext;
import org.nuiton.topia.TopiaException;
import org.nuiton.topia.TopiaVetoException;
@@ -63,16 +73,6 @@
import org.nuiton.util.CategorisedListenerSet;
import org.nuiton.util.ListenerSet;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.beans.VetoableChangeSupport;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* TODO-fdesbois-20100507 : Need translation of javadoc.
* <p/>
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java
===================================================================
--- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-03-12 15:48:07 UTC (rev 2706)
@@ -24,14 +24,23 @@
*/
package org.nuiton.topia.framework;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.cfg.Configuration;
-import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.connection.ConnectionProviderFactory;
import org.hibernate.dialect.Dialect;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.service.ServiceRegistryBuilder;
+import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.tool.hbm2ddl.TableMetadata;
import org.nuiton.topia.TopiaContext;
@@ -41,14 +50,6 @@
import org.nuiton.util.RecursiveProperties;
import org.nuiton.util.Resource;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.regex.Pattern;
-
/**
* TODO-fdesbois-20100507 : Need javadoc + translations for existing methods.
*
@@ -195,9 +196,9 @@
throw new IllegalArgumentException(
"could not find entity with name " + entityName);
}
- ConnectionProvider connectionProvider =
- ConnectionProviderFactory.newConnectionProvider(
- configuration.getProperties());
+
+ ServiceRegistry serviceRegistry = ((TopiaContextImpl) tx).getServiceRegistry();
+ ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class);
Dialect dialect = Dialect.getDialect(configuration.getProperties());
@@ -262,10 +263,11 @@
throw new IllegalArgumentException(
"could not find entity with name " + entityName);
}
- ConnectionProvider connectionProvider =
- ConnectionProviderFactory.newConnectionProvider(
- configuration.getProperties());
+ ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings(
+ configuration.getProperties()).buildServiceRegistry();
+ ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class);
+
Dialect dialect = Dialect.getDialect(configuration.getProperties());
Connection connection = null;
@@ -308,9 +310,9 @@
try {
- ConnectionProvider connectionProvider =
- ConnectionProviderFactory.newConnectionProvider(
- configuration.getProperties());
+ ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings(
+ configuration.getProperties()).buildServiceRegistry();
+ ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class);
Dialect dialect = Dialect.getDialect(configuration.getProperties());
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java
===================================================================
--- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2013-03-12 15:48:07 UTC (rev 2706)
@@ -313,7 +313,7 @@
String attrType = getType(attr, true);
String lazy = generateFromTagValue(HIBERNATE_ATTRIBUTE_LAZY, TopiaGeneratorUtil.getLazyTagValue(attr));
String attrColumn = TopiaGeneratorUtil.getDbName(attr);
-/*{<%=prefix%> <many-to-one name="<%=attrName%>" class="<%=attrType%>" <%=lazy%>column="<%=attrColumn%>" node="<%=attrName%>/@topiaId" embed-xml="false" <%=notNull%>/>
+/*{<%=prefix%> <many-to-one name="<%=attrName%>" class="<%=attrType%>" <%=lazy%>column="<%=attrColumn%>" node="<%=attrName%>/@topiaId" <%=notNull%>/>
}*/
// }
//Ne sert plus grâce à l'utilisation de la navigabilité
@@ -549,7 +549,7 @@
ObjectModelAttribute attr,
String prefix) throws IOException {
// boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model);
-/// *{ <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(TopiaGeneratorUtil.notEmpty(attr.getTagValue(TopiaGeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(TopiaGeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> node="<%=getName(attr)%>/@topiaId" embed-xml="false"/>
+/// *{ <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(TopiaGeneratorUtil.notEmpty(attr.getTagValue(TopiaGeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(TopiaGeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> node="<%=getName(attr)%>/@topiaId" />
//} */
// for hibernate many-to-one with unique="true" => one-to-one
@@ -587,19 +587,16 @@
inverse = "inverse=\"true\" ";
}
if (needsIndex) {
-/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=lazy%><%=cascade%>node="<%=attrName%>" embed-xml="false">
+/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=lazy%><%=cascade%>node="<%=attrName%>">
<%=prefix%> <key column="<%=reverseAttrDBName%>"/>
<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/>
-<%=prefix%> <one-to-many class="<%=attrType%>" node="topiaId" embed-xml="false"/>
+<%=prefix%> <one-to-many class="<%=attrType%>" node="topiaId"/>
<%=prefix%> </<%=collType%>>
}*/
}else {
-//fixme pour le moment, on ne calcule pas si on doit autoriser le embed-xml à true
-// on le positionne manuellement
-//TC-20090115 embed-xml wasat true but nobody could tellme why
-/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=orderBy%><%=fetch%><%=lazy%><%=cascade%>node="<%=attrName%>" embed-xml="false">
+/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=orderBy%><%=fetch%><%=lazy%><%=cascade%>node="<%=attrName%>">
<%=prefix%> <key column="<%=reverseAttrDBName%>"/>
-<%=prefix%> <one-to-many class="<%=attrType%>" node="topiaId" embed-xml="false"/>
+<%=prefix%> <one-to-many class="<%=attrType%>" node="topiaId"/>
<%=prefix%> </<%=collType%>>
}*/
}
@@ -645,7 +642,7 @@
String lazy = generateFromTagValue(HIBERNATE_ATTRIBUTE_LAZY, TopiaGeneratorUtil.getLazyTagValue(attr));
String attrColumn = TopiaGeneratorUtil.getDbName(attr);
-/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=lazy%>node="<%=attrName%>" embed-xml="true">
+/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=lazy%>node="<%=attrName%>">
<%=prefix%> <key column="OWNER"/>
}*/
if (needsIndex) {
@@ -688,7 +685,7 @@
if (isUnique) {
/*{unique="true" }*/
}
-/*{node="<%=attrName%>/@topiaId" embed-xml="false"}*/
+/*{node="<%=attrName%>/@topiaId"}*/
/*{/>
}*/
@@ -737,7 +734,7 @@
}
String reverseAttrDBName = TopiaGeneratorUtil.getReverseDbName(attr);
-/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" table="<%=tableName%>" <%=inverse%><%=lazy%><%=cascade%> node="<%=attrName%>" embed-xml="true">
+/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" table="<%=tableName%>" <%=inverse%><%=lazy%><%=cascade%> node="<%=attrName%>">
<%=prefix%> <key column="<%=reverseAttrDBName%>"/>
}*/
if (needsIndex) {
Modified: branches/topia-2.8.x-hibernate4/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java
===================================================================
--- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java 2013-03-12 15:48:07 UTC (rev 2706)
@@ -24,29 +24,30 @@
*/
package org.nuiton.topia.framework;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
-import org.hibernate.cfg.Environment;
-import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.connection.ConnectionProviderFactory;
-import org.hibernate.util.PropertiesHelper;
-import org.hibernate.util.ReflectHelper;
-
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.Map;
import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.HibernateException;
+import org.hibernate.cfg.Environment;
+import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
+import org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+
/**
* Customized connection provider.
*
* @author tchemit <chemit(a)codelutin.com>
* @since 2.5.3
*/
-public class TopiaConnectionProviderHardCoded implements ConnectionProvider {
+public class TopiaConnectionProviderHardCoded extends DriverManagerConnectionProviderImpl {
private String url;
@@ -67,17 +68,17 @@
LogFactory.getLog(TopiaConnectionProviderHardCoded.class);
@Override
- public void configure(Properties props) throws HibernateException {
- String driverClass = props.getProperty(Environment.DRIVER);
+ public void configure(Map configurationValues) throws HibernateException {
+ String driverClass = (String)configurationValues.get(Environment.DRIVER);
- poolSize = PropertiesHelper.getInt(Environment.POOL_SIZE, props, 20); //default pool size 20
+ poolSize = ConfigurationHelper.getInt(Environment.POOL_SIZE, configurationValues, 20); //default pool size 20
log.info("Using Hibernate built-in connection pool (not for production use!)");
log.info("Hibernate connection pool size: " + poolSize);
- autocommit = PropertiesHelper.getBoolean(Environment.AUTOCOMMIT, props);
+ autocommit = ConfigurationHelper.getBoolean(Environment.AUTOCOMMIT, configurationValues);
log.info("autocommit mode: " + autocommit);
- isolation = PropertiesHelper.getInteger(Environment.ISOLATION, props);
+ isolation = ConfigurationHelper.getInteger(Environment.ISOLATION, configurationValues);
if (isolation != null)
log.info("JDBC isolation level: " + Environment.isolationLevelToString(isolation));
@@ -102,7 +103,7 @@
// the real directory where db is and then make sure hibernate always
// use the connection provider...
String directory =
- props.getProperty(TopiaConnectionProviderTest.TEST_URL);
+ (String)configurationValues.get(TopiaConnectionProviderTest.TEST_URL);
url = directory;
// url = props.getProperty(Environment.URL);
@@ -113,14 +114,14 @@
// throw new HibernateException(msg);
// }
- connectionProps = ConnectionProviderFactory.getConnectionProperties(props);
+ connectionProps = ConnectionProviderInitiator.getConnectionProperties(configurationValues);
log.info("using driver: " + driverClass + " at URL: " + url);
// if debug level is enabled, then log the password, otherwise mask it
if (log.isDebugEnabled()) {
log.info("connection properties: " + connectionProps);
} else if (log.isInfoEnabled()) {
- log.info("connection properties: " + PropertiesHelper.maskOut(connectionProps, "password"));
+ log.info("connection properties: " + ConfigurationHelper.maskOut(connectionProps, "password"));
}
}
Modified: branches/topia-2.8.x-hibernate4/topia-service-migration/pom.xml
===================================================================
--- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-service-migration/pom.xml 2013-03-12 15:48:07 UTC (rev 2706)
@@ -35,7 +35,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
- <version>2.7.2-SNAPSHOT</version>
+ <version>2.8-SNAPSHOT</version>
</parent>
<groupId>org.nuiton.topia</groupId>
Modified: branches/topia-2.8.x-hibernate4/topia-service-replication/pom.xml
===================================================================
--- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-service-replication/pom.xml 2013-03-12 15:48:07 UTC (rev 2706)
@@ -35,7 +35,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
- <version>2.7.2-SNAPSHOT</version>
+ <version>2.8-SNAPSHOT</version>
</parent>
<groupId>org.nuiton.topia</groupId>
Modified: branches/topia-2.8.x-hibernate4/topia-service-security/pom.xml
===================================================================
--- branches/topia-2.6.x/topia-service-security/pom.xml 2012-12-30 21:45:12 UTC (rev 2705)
+++ branches/topia-2.8.x-hibernate4/topia-service-security/pom.xml 2013-03-12 15:48:07 UTC (rev 2706)
@@ -35,7 +35,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>topia</artifactId>
- <version>2.7.2-SNAPSHOT</version>
+ <version>2.8-SNAPSHOT</version>
</parent>
<groupId>org.nuiton.topia</groupId>
1
0
30 Dec '12
Author: tchemit
Date: 2012-12-30 22:45:12 +0100 (Sun, 30 Dec 2012)
New Revision: 2705
Url: http://nuiton.org/projects/topia/repository/revisions/2705
Log:
adding license header and missing svn properties
Modified:
trunk/doc/migration-to-topia-3.rst
trunk/topia-persistence-hibernate/src/license/THIRD-PARTY.properties
trunk/topia-persistence-tck/src/license/THIRD-PARTY.properties
trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java
trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java
trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java
trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion-orm.xml
trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationCallback.java
trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationTest.java
trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationV1_2.java
trunk/topia-service-migration/src/test/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion
trunk/topia-service-migration/src/test/resources/migration-source-database.h2.db
Property changes on: trunk/doc/migration-to-topia-3.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/topia-persistence-hibernate/src/license/THIRD-PARTY.properties
___________________________________________________________________
Modified: svn:keywords
- Author Date Id Revision
+ Author Date Id Revision HeadURL
Property changes on: trunk/topia-persistence-tck/src/license/THIRD-PARTY.properties
___________________________________________________________________
Modified: svn:keywords
- Author Date Id Revision
+ Author Date Id Revision HeadURL
Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java
===================================================================
--- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java 2012-12-30 21:43:38 UTC (rev 2704)
+++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java 2012-12-30 21:45:12 UTC (rev 2705)
@@ -1,5 +1,29 @@
package org.nuiton.topia.tck.mapping.test14;
+/*
+ * #%L
+ * ToPIA :: Persistence :: Test Compatibility Kit
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2004 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/BidiAssociationClassTest.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java
===================================================================
--- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java 2012-12-30 21:43:38 UTC (rev 2704)
+++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java 2012-12-30 21:45:12 UTC (rev 2705)
@@ -1,5 +1,29 @@
package org.nuiton.topia.tck.mapping.test14;
+/*
+ * #%L
+ * ToPIA :: Persistence :: Test Compatibility Kit
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2004 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/ManyToManyAssociationClassTest.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java
===================================================================
--- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java 2012-12-30 21:43:38 UTC (rev 2704)
+++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java 2012-12-30 21:45:12 UTC (rev 2705)
@@ -1,5 +1,29 @@
package org.nuiton.topia.tck.mapping.test14;
+/*
+ * #%L
+ * ToPIA :: Persistence :: Test Compatibility Kit
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2004 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Property changes on: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test14/OneToManyAssociationClassTest.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion-orm.xml
===================================================================
--- trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion-orm.xml 2012-12-30 21:43:38 UTC (rev 2704)
+++ trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion-orm.xml 2012-12-30 21:45:12 UTC (rev 2705)
@@ -1,4 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #%L
+ ToPIA :: Service Migration
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2004 - 2012 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Lesser Public License for more details.
+
+ You should have received a copy of the GNU General Lesser Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ #L%
+ -->
+
<entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
<entity class="org.nuiton.topia.migration.mappings.TMSVersion">
Property changes on: trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion-orm.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationCallback.java
===================================================================
--- trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationCallback.java 2012-12-30 21:43:38 UTC (rev 2704)
+++ trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationCallback.java 2012-12-30 21:45:12 UTC (rev 2705)
@@ -1,5 +1,29 @@
package org.nuiton.topia.migration;
+/*
+ * #%L
+ * ToPIA :: Service Migration
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2004 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
import org.nuiton.topia.tck.it.TopiaTckItDAOHelper;
import org.nuiton.util.Version;
import org.nuiton.util.VersionUtil;
Property changes on: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationCallback.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationTest.java
===================================================================
--- trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationTest.java 2012-12-30 21:43:38 UTC (rev 2704)
+++ trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationTest.java 2012-12-30 21:45:12 UTC (rev 2705)
@@ -1,5 +1,29 @@
package org.nuiton.topia.migration;
+/*
+ * #%L
+ * ToPIA :: Service Migration
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2004 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
import com.google.common.io.Files;
import com.google.common.io.InputSupplier;
import org.junit.Assert;
Property changes on: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationTest.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationV1_2.java
===================================================================
--- trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationV1_2.java 2012-12-30 21:43:38 UTC (rev 2704)
+++ trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationV1_2.java 2012-12-30 21:45:12 UTC (rev 2705)
@@ -1,5 +1,29 @@
package org.nuiton.topia.migration;
+/*
+ * #%L
+ * ToPIA :: Service Migration
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2004 - 2012 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
import org.nuiton.topia.TopiaException;
import org.nuiton.topia.framework.TopiaContextImplementor;
import org.nuiton.util.Version;
Property changes on: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigrationV1_2.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/topia-service-migration/src/test/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/topia-service-migration/src/test/resources/migration-source-database.h2.db
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
1
0
r2704 - in trunk: topia-persistence/src/license topia-persistence-hibernate topia-persistence-hibernate/src topia-persistence-hibernate/src/license topia-persistence-tck topia-persistence-tck/src topia-persistence-tck/src/license topia-service-migration/src/license topia-service-replication/src/license topia-service-security/src/license
by tchemit@users.nuiton.org 30 Dec '12
by tchemit@users.nuiton.org 30 Dec '12
30 Dec '12
Author: tchemit
Date: 2012-12-30 22:43:38 +0100 (Sun, 30 Dec 2012)
New Revision: 2704
Url: http://nuiton.org/projects/topia/repository/revisions/2704
Log:
optimize license and third parties
Added:
trunk/topia-persistence-hibernate/src/license/
trunk/topia-persistence-hibernate/src/license/THIRD-PARTY.properties
trunk/topia-persistence-tck/src/license/
trunk/topia-persistence-tck/src/license/THIRD-PARTY.properties
Modified:
trunk/topia-persistence-hibernate/LICENSE.txt
trunk/topia-persistence-tck/LICENSE.txt
trunk/topia-persistence/src/license/THIRD-PARTY.properties
trunk/topia-service-migration/src/license/THIRD-PARTY.properties
trunk/topia-service-replication/src/license/THIRD-PARTY.properties
trunk/topia-service-security/src/license/THIRD-PARTY.properties
Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/topia-persistence/src/license/THIRD-PARTY.properties 2012-12-30 21:41:01 UTC (rev 2703)
+++ trunk/topia-persistence/src/license/THIRD-PARTY.properties 2012-12-30 21:43:38 UTC (rev 2704)
@@ -2,7 +2,6 @@
#-------------------------------------------------------------------------------
# Already used licenses in project :
# - BSD License
-# - BSD style
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Public License Version 1.0
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
@@ -10,20 +9,17 @@
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
-# - MPL 1.1
# - Mozilla Public License Version 1.0
+# - New BSD License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
+# - The SAX License
+# - The W3C License
# - http://jaxen.codehaus.org/license.html
-# - license.txt
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Jan 12 16:55:28 CET 2012
-antlr--antlr--2.7.6=BSD License
+#Sun Dec 30 22:42:08 CET 2012
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html
-jdom--jdom--1.0=The Apache Software License, Version 2.0
Modified: trunk/topia-persistence-hibernate/LICENSE.txt
===================================================================
--- trunk/topia-persistence-hibernate/LICENSE.txt 2012-12-30 21:41:01 UTC (rev 2703)
+++ trunk/topia-persistence-hibernate/LICENSE.txt 2012-12-30 21:43:38 UTC (rev 2704)
@@ -0,0 +1,166 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
Added: trunk/topia-persistence-hibernate/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/topia-persistence-hibernate/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/topia-persistence-hibernate/src/license/THIRD-PARTY.properties 2012-12-30 21:43:38 UTC (rev 2704)
@@ -0,0 +1,25 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache License 2.0
+# - BSD License
+# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+# - Common Public License Version 1.0
+# - GNU Lesser General Public License, version 2.1
+# - Indiana University Extreme! Lab Software License, vesion 1.1.1
+# - Lesser General Public License (LGPL) v 3.0
+# - Lesser General Public License (LPGL)
+# - Lesser General Public License (LPGL) v 2.1
+# - MIT License
+# - MPL 1.1
+# - New BSD License
+# - The Apache Software License, Version 2.0
+# - The H2 License, Version 1.0
+# - license.txt
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Sun Dec 30 22:42:18 CET 2012
+commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=BSD License
Property changes on: trunk/topia-persistence-hibernate/src/license/THIRD-PARTY.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/topia-persistence-tck/LICENSE.txt
===================================================================
--- trunk/topia-persistence-tck/LICENSE.txt 2012-12-30 21:41:01 UTC (rev 2703)
+++ trunk/topia-persistence-tck/LICENSE.txt 2012-12-30 21:43:38 UTC (rev 2704)
@@ -0,0 +1,166 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
Added: trunk/topia-persistence-tck/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/topia-persistence-tck/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/topia-persistence-tck/src/license/THIRD-PARTY.properties 2012-12-30 21:43:38 UTC (rev 2704)
@@ -0,0 +1,22 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - BSD License
+# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+# - Common Public License Version 1.0
+# - Indiana University Extreme! Lab Software License, vesion 1.1.1
+# - Lesser General Public License (LGPL) v 3.0
+# - Lesser General Public License (LPGL)
+# - Lesser General Public License (LPGL) v 2.1
+# - MIT License
+# - New BSD License
+# - The Apache Software License, Version 2.0
+# - The H2 License, Version 1.0
+# - The MIT License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Sun Dec 30 22:42:14 CET 2012
+commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=BSD License
Property changes on: trunk/topia-persistence-tck/src/license/THIRD-PARTY.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/topia-service-migration/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2012-12-30 21:41:01 UTC (rev 2703)
+++ trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2012-12-30 21:43:38 UTC (rev 2704)
@@ -1,15 +1,18 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - Apache License 2.0
# - BSD License
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Public License Version 1.0
+# - GNU Lesser General Public License, version 2.1
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL) v 3.0
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
# - MPL 1.1
+# - New BSD License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
# - license.txt
@@ -17,8 +20,6 @@
# Please fill the missing licenses for dependencies :
#
#
-#Thu Aug 18 07:47:56 CEST 2011
-antlr--antlr--2.7.6=BSD License
+#Sun Dec 30 22:42:18 CET 2012
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: trunk/topia-service-replication/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2012-12-30 21:41:01 UTC (rev 2703)
+++ trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2012-12-30 21:43:38 UTC (rev 2704)
@@ -9,16 +9,12 @@
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
-# - MPL 1.1
+# - New BSD License
# - The Apache Software License, Version 2.0
-# - The H2 License, Version 1.0
-# - license.txt
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Aug 18 07:47:24 CEST 2011
-antlr--antlr--2.7.6=BSD License
+#Sun Dec 30 22:42:08 CET 2012
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: trunk/topia-service-security/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/topia-service-security/src/license/THIRD-PARTY.properties 2012-12-30 21:41:01 UTC (rev 2703)
+++ trunk/topia-service-security/src/license/THIRD-PARTY.properties 2012-12-30 21:43:38 UTC (rev 2704)
@@ -9,16 +9,13 @@
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
-# - MPL 1.1
+# - New BSD License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
-# - license.txt
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Aug 18 07:48:01 CEST 2011
-antlr--antlr--2.7.6=BSD License
+#Sun Dec 30 22:42:20 CET 2012
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
-javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
1
0
Author: tchemit
Date: 2012-12-30 22:41:01 +0100 (Sun, 30 Dec 2012)
New Revision: 2703
Url: http://nuiton.org/projects/topia/repository/revisions/2703
Log:
optimize dependencies
Modified:
trunk/pom.xml
trunk/topia-persistence/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
+++ trunk/pom.xml 2012-12-30 21:41:01 UTC (rev 2703)
@@ -95,6 +95,7 @@
<groupId>org.nuiton.eugene</groupId>
<artifactId>eugene-java-templates</artifactId>
<version>${eugeneVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: trunk/topia-persistence/pom.xml
===================================================================
--- trunk/topia-persistence/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
+++ trunk/topia-persistence/pom.xml 2012-12-30 21:41:01 UTC (rev 2703)
@@ -60,10 +60,10 @@
<artifactId>eugene</artifactId>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>org.nuiton.eugene</groupId>
<artifactId>eugene-java-templates</artifactId>
- </dependency-->
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
1
0
r2702 - in trunk: topia-persistence topia-persistence-hibernate topia-persistence-tck topia-service-migration topia-service-replication topia-service-security
by tchemit@users.nuiton.org 30 Dec '12
by tchemit@users.nuiton.org 30 Dec '12
30 Dec '12
Author: tchemit
Date: 2012-12-30 22:31:56 +0100 (Sun, 30 Dec 2012)
New Revision: 2702
Url: http://nuiton.org/projects/topia/repository/revisions/2702
Log:
optimize dependencies
Modified:
trunk/topia-persistence-hibernate/pom.xml
trunk/topia-persistence-tck/pom.xml
trunk/topia-persistence/pom.xml
trunk/topia-service-migration/pom.xml
trunk/topia-service-replication/pom.xml
trunk/topia-service-security/pom.xml
Modified: trunk/topia-persistence/pom.xml
===================================================================
--- trunk/topia-persistence/pom.xml 2012-12-30 20:18:25 UTC (rev 2701)
+++ trunk/topia-persistence/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
@@ -60,10 +60,10 @@
<artifactId>eugene</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.nuiton.eugene</groupId>
<artifactId>eugene-java-templates</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>commons-collections</groupId>
Modified: trunk/topia-persistence-hibernate/pom.xml
===================================================================
--- trunk/topia-persistence-hibernate/pom.xml 2012-12-30 20:18:25 UTC (rev 2701)
+++ trunk/topia-persistence-hibernate/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
@@ -43,6 +43,31 @@
</dependency>
<dependency>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>nuiton-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
@@ -54,6 +79,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
</dependency>
+
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
Modified: trunk/topia-persistence-tck/pom.xml
===================================================================
--- trunk/topia-persistence-tck/pom.xml 2012-12-30 20:18:25 UTC (rev 2701)
+++ trunk/topia-persistence-tck/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
@@ -42,6 +42,7 @@
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
</dependency>
+
<dependency>
<groupId>org.nuiton.i18n</groupId>
<artifactId>nuiton-i18n</artifactId>
@@ -51,11 +52,17 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<!-- BD H2 for testing -->
<dependency>
<groupId>com.h2database</groupId>
Modified: trunk/topia-service-migration/pom.xml
===================================================================
--- trunk/topia-service-migration/pom.xml 2012-12-30 20:18:25 UTC (rev 2701)
+++ trunk/topia-service-migration/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
@@ -76,15 +76,27 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<!-- Depencies for test-->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: trunk/topia-service-replication/pom.xml
===================================================================
--- trunk/topia-service-replication/pom.xml 2012-12-30 20:18:25 UTC (rev 2701)
+++ trunk/topia-service-replication/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
@@ -50,8 +50,8 @@
</dependency>
<dependency>
- <groupId>org.nuiton.i18n</groupId>
- <artifactId>nuiton-i18n</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
</dependency>
<dependency>
@@ -65,11 +65,6 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
Modified: trunk/topia-service-security/pom.xml
===================================================================
--- trunk/topia-service-security/pom.xml 2012-12-30 20:18:25 UTC (rev 2701)
+++ trunk/topia-service-security/pom.xml 2012-12-30 21:31:56 UTC (rev 2702)
@@ -45,30 +45,23 @@
<!-- Sibling dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>topia-persistence-hibernate</artifactId>
+ <artifactId>topia-persistence</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>topia-persistence-tck</artifactId>
- <version>${project.version}</version>
- <!--<classifier>tests</classifier>-->
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
@@ -76,11 +69,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
-
<!-- Depencies for test-->
<dependency>
<groupId>com.h2database</groupId>
1
0