Author: athimel Date: 2012-05-23 15:36:21 +0200 (Wed, 23 May 2012) New Revision: 2513 Url: http://nuiton.org/repositories/revision/topia/2513 Log: Move back necessary classes to src/main/java Added: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Gender.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Title.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/beangen/ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java Removed: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Gender.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Title.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/beangen/ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/naturalId.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/E4.java trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test9/E9.java Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/TopiaContextFactoryTest.java Modified: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/TopiaContextFactoryTest.java =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/TopiaContextFactoryTest.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/TopiaContextFactoryTest.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -31,7 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.framework.TopiaContextImpl; -import org.nuiton.topia.tck.TopiaDatabase; +//import org.nuiton.topia.tck.TopiaDatabase; import java.io.File; import java.io.IOException; @@ -56,7 +56,7 @@ @BeforeClass public static void init() throws IOException { - testBasedir = TopiaDatabase.getTestSpecificDirectory(TopiaContextFactoryTest.class, "dummy"); +// testBasedir = TopiaDatabase.getTestSpecificDirectory(TopiaContextFactoryTest.class, "dummy"); } Copied: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java (from rev 2510, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java) =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -0,0 +1,42 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 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.tck.it; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.it.ExtraDAOEntity; +import org.nuiton.topia.tck.it.ExtraDAOEntityDAOAbstract; + +/** + * Created: 26 mai 2010 + * + * @author fdesbois <fdesbois@codelutin.com> + * @version $Id$ + */ +public class ExtraDAOEntityDAOImpl<E extends ExtraDAOEntity> extends ExtraDAOEntityDAOAbstract<E> { + + @Override + public void extra() throws TopiaException { + } +} Property changes on: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Gender.java (from rev 2510, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Gender.java) =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Gender.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Gender.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -0,0 +1,29 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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.tck.it; + +public enum Gender { + MALE, FEMALE +} Property changes on: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Gender.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Title.java (from rev 2510, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Title.java) =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Title.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Title.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -0,0 +1,37 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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.tck.it; + +/** + * To test http://nuiton.org/issues/1732. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.6.2 + */ +public enum Title { + Mr, + Madam, + Other +} Property changes on: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/Title.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java (from rev 2510, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java) =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -0,0 +1,50 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 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.tck.it.deletetest; + + +import java.util.Set; +import java.util.TreeSet; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.tck.it.Company; +import org.nuiton.topia.tck.it.Employe; + +/** + * + * @author desbois + */ +public class Contact2DAOImpl<E extends Contact2> extends Contact2DAOAbstract<E> { + + @Override + public Set<Contact2> findAllByCompany(Company company) throws TopiaException { + Set<Contact2> contacts = new TreeSet<Contact2>(); + for (Employe e : company.getEmploye()) { + contacts.addAll(e.getContacts()); + } + return contacts; + } + +} Property changes on: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java (from rev 2510, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/naturalId.java) =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/it/naturalId.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -0,0 +1,32 @@ +package org.nuiton.topia.tck.it; + +/** + * Class that contains the natural ids of NaturalizedEntity. + * TODO AThimel 22/05/2012 This has to be generated ? To discuss + * TODO AThimel 22/05/2012 Find a better name + * + * @author Arnaud Thimel <thimel@codelutin.com> + */ +public class naturalId { + + protected Integer naturalIdNotNull; + + protected String naturalIdNull; + + public Integer getNaturalIdNotNull() { + return naturalIdNotNull; + } + + public void setNaturalIdNotNull(Integer naturalIdNotNull) { + this.naturalIdNotNull = naturalIdNotNull; + } + + public String getNaturalIdNull() { + return naturalIdNull; + } + + public void setNaturalIdNull(String naturalIdNull) { + this.naturalIdNull = naturalIdNull; + } + +} Copied: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java (from rev 2510, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/E4.java) =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test4/E4.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -0,0 +1,12 @@ +package org.nuiton.topia.tck.mapping.test4; + +/** + * TODO + * + * @author tchemit <chemit@codelutin.com> + * @since 3.0 + */ +public enum E4 { + LITERAL1, + LITERAL2, +} Copied: trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java (from rev 2510, trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test9/E9.java) =================================================================== --- trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java (rev 0) +++ trunk/topia-persistence-tck/src/main/java/org/nuiton/topia/tck/mapping/test9/E9.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -0,0 +1,12 @@ +package org.nuiton.topia.tck.mapping.test9; + +/** + * TODO + * + * @author tchemit <chemit@codelutin.com> + * @since TODO + */ +public enum E9 { + LITERAL1, + LITERAL2 +} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/ExtraDAOEntityDAOImpl.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -1,42 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 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.tck.it; - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.tck.it.ExtraDAOEntity; -import org.nuiton.topia.tck.it.ExtraDAOEntityDAOAbstract; - -/** - * Created: 26 mai 2010 - * - * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ - */ -public class ExtraDAOEntityDAOImpl<E extends ExtraDAOEntity> extends ExtraDAOEntityDAOAbstract<E> { - - @Override - public void extra() throws TopiaException { - } -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Gender.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Gender.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Gender.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -1,29 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2011 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.tck.it; - -public enum Gender { - MALE, FEMALE -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Title.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Title.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/Title.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -1,37 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2011 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.tck.it; - -/** - * To test http://nuiton.org/issues/1732. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.6.2 - */ -public enum Title { - Mr, - Madam, - Other -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/deletetest/Contact2DAOImpl.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -1,50 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 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.tck.it.deletetest; - - -import java.util.Set; -import java.util.TreeSet; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.tck.it.Company; -import org.nuiton.topia.tck.it.Employe; - -/** - * - * @author desbois - */ -public class Contact2DAOImpl<E extends Contact2> extends Contact2DAOAbstract<E> { - - @Override - public Set<Contact2> findAllByCompany(Company company) throws TopiaException { - Set<Contact2> contacts = new TreeSet<Contact2>(); - for (Employe e : company.getEmploye()) { - contacts.addAll(e.getContacts()); - } - return contacts; - } - -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/naturalId.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/naturalId.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/it/naturalId.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -1,32 +0,0 @@ -package org.nuiton.topia.tck.it; - -/** - * Class that contains the natural ids of NaturalizedEntity. - * TODO AThimel 22/05/2012 This has to be generated ? To discuss - * TODO AThimel 22/05/2012 Find a better name - * - * @author Arnaud Thimel <thimel@codelutin.com> - */ -public class naturalId { - - protected Integer naturalIdNotNull; - - protected String naturalIdNull; - - public Integer getNaturalIdNotNull() { - return naturalIdNotNull; - } - - public void setNaturalIdNotNull(Integer naturalIdNotNull) { - this.naturalIdNotNull = naturalIdNotNull; - } - - public String getNaturalIdNull() { - return naturalIdNull; - } - - public void setNaturalIdNull(String naturalIdNull) { - this.naturalIdNull = naturalIdNull; - } - -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/E4.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/E4.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test4/E4.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -1,12 +0,0 @@ -package org.nuiton.topia.tck.mapping.test4; - -/** - * TODO - * - * @author tchemit <chemit@codelutin.com> - * @since 3.0 - */ -public enum E4 { - LITERAL1, - LITERAL2, -} Deleted: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test9/E9.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test9/E9.java 2012-05-23 13:33:30 UTC (rev 2512) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/tck/mapping/test9/E9.java 2012-05-23 13:36:21 UTC (rev 2513) @@ -1,12 +0,0 @@ -package org.nuiton.topia.tck.mapping.test9; - -/** - * TODO - * - * @author tchemit <chemit@codelutin.com> - * @since TODO - */ -public enum E9 { - LITERAL1, - LITERAL2 -}