You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <gca...@us...> - 2013-03-11 15:03:22
|
Revision: 4195 http://openutils.svn.sourceforge.net/openutils/?rev=4195&view=rev Author: gcatania Date: 2013-03-11 15:03:14 +0000 (Mon, 11 Mar 2013) Log Message: ----------- BSHD-19 failing tests added (currently disabled) Modified Paths: -------------- trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml Added Paths: ----------- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java trunk/openutils-bshd5/src/test/resources/preload-data.sql Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java =================================================================== --- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java (rev 0) +++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java 2013-03-11 15:03:14 UTC (rev 4195) @@ -0,0 +1,147 @@ +/** + * + * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html) + * + * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it + * + * + * This library 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 2.1 of the License, or (at your option) any later version. + * You may obtain a copy of the License at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package it.openutils.hibernate.test; + +import it.openutils.hibernate.test.dao.BarDAO; +import it.openutils.hibernate.test.dao.FooDAO; +import it.openutils.hibernate.test.model.Bar; +import it.openutils.hibernate.test.model.Foo; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests; +import org.testng.Assert; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + + +/** + * @author gcatania + */ +@ContextConfiguration(locations = "/spring-tests.xml") +public class HibernateDAOLazyLoadTest extends AbstractTransactionalTestNGSpringContextTests +{ + + @Autowired + private FooDAO fooDAO; + + @Autowired + private BarDAO barDAO; + + @BeforeClass + protected final void preloadData() + { + executeSqlScript("/preload-data.sql", false); + } + + private List<Foo> findFoo(String s, Bar bar) + { + Foo filter = new Foo(); + filter.setBar(bar); + filter.setS(s); + List<Foo> found = fooDAO.findFiltered(filter); + return found; + } + + private void testFind(long barId, String fooStr, Bar bar) + { + List<Foo> found = findFoo(fooStr, bar); + Assert.assertEquals(found.size(), 1); + Foo foo = found.get(0); + Assert.assertEquals(foo.getS(), fooStr); + Assert.assertEquals(foo.getBar().getId().longValue(), barId); + } + + private void testDontFind(String fooStr, Bar bar) + { + List<Foo> found = findFoo(fooStr, bar); + Assert.assertEquals(found.size(), 0); + } + + private void testFindEager(long barId, String fooStr) + { + Bar bar = barDAO.get(barId); + testFind(barId, fooStr, bar); + } + + private void testFindLazy(long barId, String fooStr) + { + Bar bar = barDAO.load(barId); + testFind(barId, fooStr, bar); + } + + @Test + public void testFindWithEagerParent1() + { + testFindEager(1L, "foo1_2"); + } + + @Test + public void testFindWithEagerParent2() + { + testFindEager(1L, "fooX_X"); + } + + @Test + public void testFindWithLazyParent1() + { + testFindLazy(1L, "foo1_2"); + } + + /** + * FIXME enable this test and fix BSHD-19 + */ + @Test(enabled = false) + public void testFindWithLazyParent2() + { + testFindLazy(1L, "fooX_X"); + } + + @Test + public void testDontFindWithEagerParent() + { + long barId = 1L; + String fooStr = "foo2_2"; + + Bar bar1 = barDAO.get(barId); + testDontFind(fooStr, bar1); + } + + /** + * FIXME enable this test and fix BSHD-19 + */ + @Test(enabled = false) + public void testDontFindWithLazyParent() + { + long barId = 1L; + String fooStr = "foo2_2"; + + Bar bar1 = barDAO.load(barId); + testDontFind(fooStr, bar1); + } +} Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOLazyLoadTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java =================================================================== --- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java (rev 0) +++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java 2013-03-11 15:03:14 UTC (rev 4195) @@ -0,0 +1,55 @@ +/** + * + * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html) + * + * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it + * + * + * This library 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 2.1 of the License, or (at your option) any later version. + * You may obtain a copy of the License at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package it.openutils.hibernate.test.dao; + +import it.openutils.dao.hibernate.HibernateDAO; +import it.openutils.dao.hibernate.HibernateDAOImpl; +import it.openutils.hibernate.test.model.Bar; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + + +/** + * @author gcatania + */ +public interface BarDAO extends HibernateDAO<Bar, Long> +{ + + @Repository("barDAO") + class PersonDAOImpl extends HibernateDAOImpl<Bar, Long> implements BarDAO + { + + @Autowired + public PersonDAOImpl(SessionFactory factory) + { + super(Bar.class); + setSessionFactory(factory); + } + } + +} Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/BarDAO.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java =================================================================== --- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java (rev 0) +++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java 2013-03-11 15:03:14 UTC (rev 4195) @@ -0,0 +1,55 @@ +/** + * + * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html) + * + * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it + * + * + * This library 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 2.1 of the License, or (at your option) any later version. + * You may obtain a copy of the License at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package it.openutils.hibernate.test.dao; + +import it.openutils.dao.hibernate.HibernateDAO; +import it.openutils.dao.hibernate.HibernateDAOImpl; +import it.openutils.hibernate.test.model.Foo; + +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + + +/** + * @author gcatania + */ +public interface FooDAO extends HibernateDAO<Foo, Long> +{ + + @Repository("fooDAO") + class PersonDAOImpl extends HibernateDAOImpl<Foo, Long> implements FooDAO + { + + @Autowired + public PersonDAOImpl(SessionFactory factory) + { + super(Foo.class); + setSessionFactory(factory); + } + } + +} Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/FooDAO.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java =================================================================== --- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java (rev 0) +++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java 2013-03-11 15:03:14 UTC (rev 4195) @@ -0,0 +1,80 @@ +/** + * + * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html) + * + * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it + * + * + * This library 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 2.1 of the License, or (at your option) any later version. + * You may obtain a copy of the License at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package it.openutils.hibernate.test.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + + +/** + * @author gcatania + * @version $Id$ + */ +@Entity +public class Bar implements Cloneable +{ + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + private String s; + + /** + * @return the id + */ + public Long getId() + { + return id; + } + + /** + * @param id the id to set + */ + public void setId(Long id) + { + this.id = id; + } + + /** + * @return the s + */ + public String getS() + { + return s; + } + + /** + * @param s the s to set + */ + public void setS(String s) + { + this.s = s; + } + +} Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Bar.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java =================================================================== --- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java (rev 0) +++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java 2013-03-11 15:03:14 UTC (rev 4195) @@ -0,0 +1,102 @@ +/** + * + * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html) + * + * Copyright(C) 2005-2012, Openmind S.r.l. http://www.openmindonline.it + * + * + * This library 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 2.1 of the License, or (at your option) any later version. + * You may obtain a copy of the License at + * + * http://www.gnu.org/licenses/lgpl-2.1.html + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package it.openutils.hibernate.test.model; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + + +/** + * @author gcatania + * @version $Id$ + */ +@Entity +public class Foo implements Cloneable +{ + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @ManyToOne + private Bar bar; + + @Column + private String s; + + /** + * @return the id + */ + public Long getId() + { + return id; + } + + /** + * @param id the id to set + */ + public void setId(Long id) + { + this.id = id; + } + + /** + * @return the bar + */ + public Bar getBar() + { + return bar; + } + + /** + * @param bar the bar to set + */ + public void setBar(Bar bar) + { + this.bar = bar; + } + + /** + * @return the s + */ + public String getS() + { + return s; + } + + /** + * @param s the s to set + */ + public void setS(String s) + { + this.s = s; + } + +} Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Foo.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml =================================================================== --- trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml 2013-02-14 16:17:10 UTC (rev 4194) +++ trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml 2013-03-11 15:03:14 UTC (rev 4195) @@ -13,5 +13,8 @@ <mapping class="it.openutils.hibernate.test.model.Owner" /> <mapping class="it.openutils.hibernate.test.model.Person" /> <mapping class="it.openutils.hibernate.test.model.Sticker" /> + + <mapping class="it.openutils.hibernate.test.model.Foo" /> + <mapping class="it.openutils.hibernate.test.model.Bar" /> </session-factory> </hibernate-configuration> \ No newline at end of file Added: trunk/openutils-bshd5/src/test/resources/preload-data.sql =================================================================== --- trunk/openutils-bshd5/src/test/resources/preload-data.sql (rev 0) +++ trunk/openutils-bshd5/src/test/resources/preload-data.sql 2013-03-11 15:03:14 UTC (rev 4195) @@ -0,0 +1,17 @@ +insert into bar (id, s) +values (1, 'bar1'); +insert into bar (id, s) +values (2, 'bar2'); + +insert into foo (id, bar_id, s) +values ( 1, 1, 'foo1_1' ); +insert into foo (id, bar_id, s) +values ( 2, 1, 'foo1_2' ); +insert into foo (id, bar_id, s) +values ( 3, 1, 'fooX_X' ); +insert into foo (id, bar_id, s) +values ( 4, 2, 'foo2_1' ); +insert into foo (id, bar_id, s) +values ( 5, 2, 'foo2_2' ); +insert into foo (id, bar_id, s) +values ( 6, 2, 'fooX_X' ); \ No newline at end of file Property changes on: trunk/openutils-bshd5/src/test/resources/preload-data.sql ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hu...@op...> - 2013-02-14 17:02:36
|
See <https://hudson.openmindonline.it/job/openutils-bshd5/76/changes> Changes: [gcatania] BSHD-18 improve error message for missing hibernate entity mapping ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5 U src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java U src/main/java/it/openutils/hibernate/example/ExampleTree.java U src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java At revision 4192 WARNING: clock of the subversion server appears to be out of sync. This can result in inconsistent check out behavior. Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties Parsing POMs [openutils-bshd5] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 52610 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> clean install [INFO] Scanning for projects... [WARNING] POM for 'biz.aQute:bndlib:pom:1.50.0:runtime' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] ------------------------------------------------------------------------ [INFO] Building openutils base Spring-Hibernate DAO [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean {execution: default-clean}] [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/src/main/resources> Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.6.6/slf4j-log4j12-1.6.6.pom [WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:pom:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.pom [WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:pom:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.1.1.RELEASE/spring-orm-3.1.1.RELEASE.pom [WARNING] Unable to get resource 'org.springframework:spring-orm:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.1.1.RELEASE/spring-aop-3.1.1.RELEASE.pom [WARNING] Unable to get resource 'org.springframework:spring-aop:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final.pom [WARNING] Unable to get resource 'org.hibernate:hibernate-core:pom:4.1.1.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-test/3.1.1.RELEASE/spring-test-3.1.1.RELEASE.pom [WARNING] Unable to get resource 'org.springframework:spring-test:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.pom [WARNING] Unable to get resource 'org.hsqldb:hsqldb:pom:2.2.8' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final.jar Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.1.1.RELEASE/spring-orm-3.1.1.RELEASE.jar Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.6.6/slf4j-log4j12-1.6.6.jar [WARNING] Unable to get resource 'org.springframework:spring-orm:jar:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out [WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:jar:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out [WARNING] Unable to get resource 'org.hibernate:hibernate-core:jar:4.1.1.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.1.1.RELEASE/spring-aop-3.1.1.RELEASE.jar Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar [WARNING] Unable to get resource 'org.springframework:spring-aop:jar:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out [WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:jar:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> to /data/hudson-data/jobs/openutils-bshd5/modules/net.sourceforge.openutils$openutils-bshd5/builds/2013-02-14_16-39-16/archive/net.sourceforge.openutils/openutils-bshd5/3.0.0-SNAPSHOT/pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Failed to resolve artifact. Missing: ---------- 1) org.springframework:spring-orm:jar:3.1.1.RELEASE Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.springframework:spring-orm:jar:3.1.1.RELEASE 2) org.slf4j:slf4j-log4j12:jar:1.6.6 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.slf4j:slf4j-log4j12:jar:1.6.6 3) org.hibernate:hibernate-core:jar:4.1.1.Final Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.1.Final -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.1.Final -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.hibernate:hibernate-core:jar:4.1.1.Final 4) org.springframework:spring-aop:jar:3.1.1.RELEASE Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.springframework:spring-aop:jar:3.1.1.RELEASE 5) org.slf4j:jcl-over-slf4j:jar:1.6.6 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.slf4j:jcl-over-slf4j:jar:1.6.6 ---------- 5 required artifacts are missing. for artifact: net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT from the specified remote repositories: openmind (http://repository.openmindonline.it) [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 28 minutes 30 seconds [INFO] Finished at: Thu Feb 14 17:07:57 CET 2013 [INFO] Final Memory: 29M/158M [INFO] ------------------------------------------------------------------------ channel stopped |
From: <gca...@us...> - 2013-02-14 16:17:19
|
Revision: 4194 http://openutils.svn.sourceforge.net/openutils/?rev=4194&view=rev Author: gcatania Date: 2013-02-14 16:17:10 +0000 (Thu, 14 Feb 2013) Log Message: ----------- Blocked revisions 4097 via svnmerge ........ r4097 | gcatania | 2012-07-05 17:11:03 +0200 (gio, 05 lug 2012) | 1 line BSHD-16 formatting, pom cleanup ........ Revision Links: -------------- http://openutils.svn.sourceforge.net/openutils/?rev=4097&view=rev Property Changed: ---------------- branches/openutils-bshd5-backport/ Property changes on: branches/openutils-bshd5-backport ___________________________________________________________________ Modified: svnmerge-blocked - /trunk/openutils-bshd5:4041,4057,4093-4094 + /trunk/openutils-bshd5:4041,4057,4093-4094,4097 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gca...@us...> - 2013-02-14 15:58:53
|
Revision: 4193 http://openutils.svn.sourceforge.net/openutils/?rev=4193&view=rev Author: gcatania Date: 2013-02-14 15:58:42 +0000 (Thu, 14 Feb 2013) Log Message: ----------- Merged revisions 4192 via svnmerge from https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5 ........ r4192 | gcatania | 2013-02-14 16:32:53 +0100 (gio, 14 feb 2013) | 1 line BSHD-18 improve error message for missing hibernate entity mapping ........ Revision Links: -------------- http://openutils.svn.sourceforge.net/openutils/?rev=4192&view=rev Modified Paths: -------------- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java Property Changed: ---------------- branches/openutils-bshd5-backport/ branches/openutils-bshd5-backport/src/ Property changes on: branches/openutils-bshd5-backport ___________________________________________________________________ Modified: svnmerge-integrated - /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092 + /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4192 Modified: svn:mergeinfo - /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092* + /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*,4192* Property changes on: branches/openutils-bshd5-backport/src ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092 + /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092,4192 Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java =================================================================== --- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2013-02-14 15:32:53 UTC (rev 4192) +++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2013-02-14 15:58:42 UTC (rev 4193) @@ -261,10 +261,9 @@ { crit.add(c); } - ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity)); + ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory); ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11 - Type[] types = classMetadata.getPropertyTypes(); String[] names = classMetadata.getPropertyNames(); for (int i = 0; i < types.length; i++) Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java =================================================================== --- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2013-02-14 15:32:53 UTC (rev 4192) +++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2013-02-14 15:58:42 UTC (rev 4193) @@ -31,7 +31,9 @@ import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; +import org.hibernate.Hibernate; import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; import org.hibernate.engine.SessionImplementor; import org.hibernate.metadata.ClassMetadata; @@ -106,7 +108,8 @@ } if (size > 1) { - throw new IllegalArgumentException("More than one element in filter collection is unsupported."); + throw new IllegalArgumentException("More than one element in filter collection is unsupported.\n" + + coll); } } Class< ? extends Object> clazz = collectionValue.getClass(); @@ -128,6 +131,25 @@ } /** + * obtains the hibernate class metadata for the input entity + * @param entity the hibernate entity + * @param sessionFactory the session factory to retrieve metadata from + * @return the class metadata + * @throws IllegalStateException if no class metadata is configured for the input entity + */ + public static ClassMetadata getClassMetadata(Object entity, SessionFactory sessionFactory) + throws IllegalStateException + { + Class< ? > cl = Hibernate.getClass(entity); + ClassMetadata classMetadata = sessionFactory.getClassMetadata(cl); + if (classMetadata == null) + { + throw new IllegalStateException("No hibernate class metadata found for: " + cl); + } + return classMetadata; + } + + /** * @param strings an array of strings * @param s the string to append * @return a new array containing the input string array plus the input string at the end Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java =================================================================== --- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2013-02-14 15:32:53 UTC (rev 4192) +++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2013-02-14 15:58:42 UTC (rev 4193) @@ -115,10 +115,9 @@ String path = ExampleTreeUtils.getPath(walkedProperties); Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path); crit.add(example(entity, currFilterMetadata.keySet())); - ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity)); + ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory); ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11 - Type[] types = classMetadata.getPropertyTypes(); String[] names = classMetadata.getPropertyNames(); for (int i = 0; i < types.length; i++) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gca...@us...> - 2013-02-14 15:33:01
|
Revision: 4192 http://openutils.svn.sourceforge.net/openutils/?rev=4192&view=rev Author: gcatania Date: 2013-02-14 15:32:53 +0000 (Thu, 14 Feb 2013) Log Message: ----------- BSHD-18 improve error message for missing hibernate entity mapping Modified Paths: -------------- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java =================================================================== --- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2013-02-04 16:09:42 UTC (rev 4191) +++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2013-02-14 15:32:53 UTC (rev 4192) @@ -257,10 +257,9 @@ { crit.add(c); } - ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity)); + ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory); ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11 - Type[] types = classMetadata.getPropertyTypes(); String[] names = classMetadata.getPropertyNames(); for (int i = 0; i < types.length; i++) Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java =================================================================== --- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2013-02-04 16:09:42 UTC (rev 4191) +++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2013-02-14 15:32:53 UTC (rev 4192) @@ -31,7 +31,9 @@ import org.apache.commons.lang3.StringUtils; import org.hibernate.Criteria; +import org.hibernate.Hibernate; import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.metadata.ClassMetadata; @@ -106,7 +108,8 @@ } if (size > 1) { - throw new IllegalArgumentException("More than one element in filter collection is unsupported."); + throw new IllegalArgumentException("More than one element in filter collection is unsupported.\n" + + coll); } } Class< ? extends Object> clazz = collectionValue.getClass(); @@ -128,6 +131,25 @@ } /** + * obtains the hibernate class metadata for the input entity + * @param entity the hibernate entity + * @param sessionFactory the session factory to retrieve metadata from + * @return the class metadata + * @throws IllegalStateException if no class metadata is configured for the input entity + */ + public static ClassMetadata getClassMetadata(Object entity, SessionFactory sessionFactory) + throws IllegalStateException + { + Class< ? > cl = Hibernate.getClass(entity); + ClassMetadata classMetadata = sessionFactory.getClassMetadata(cl); + if (classMetadata == null) + { + throw new IllegalStateException("No hibernate class metadata found for: " + cl); + } + return classMetadata; + } + + /** * @param strings an array of strings * @param s the string to append * @return a new array containing the input string array plus the input string at the end Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java =================================================================== --- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2013-02-04 16:09:42 UTC (rev 4191) +++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2013-02-14 15:32:53 UTC (rev 4192) @@ -111,10 +111,9 @@ String path = ExampleTreeUtils.getPath(walkedProperties); Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path); crit.add(example(entity, currFilterMetadata.keySet())); - ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity)); + ClassMetadata classMetadata = ExampleTreeUtils.getClassMetadata(entity, sessionFactory); ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11 - Type[] types = classMetadata.getPropertyTypes(); String[] names = classMetadata.getPropertyNames(); for (int i = 0; i < types.length; i++) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 16:09:49
|
Revision: 4191 http://openutils.svn.sourceforge.net/openutils/?rev=4191&view=rev Author: fgiust Date: 2013-02-04 16:09:42 +0000 (Mon, 04 Feb 2013) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-02-04 16:08:20 UTC (rev 4190) +++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-02-04 16:09:42 UTC (rev 4191) @@ -10,7 +10,7 @@ <artifactId>openutils-mgnlmedia</artifactId> <name>SimpleMedia Module for Magnolia CMS</name> <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description> - <version>5.0.2</version> + <version>5.0.3-SNAPSHOT</version> <inceptionYear>2008</inceptionYear> <licenses> <license> @@ -24,9 +24,9 @@ <url>http://jira.openmindlab.com/browse/MEDIA</url> </issueManagement> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.2</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.2</developerConnection> - <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.2</url> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 16:08:28
|
Revision: 4190 http://openutils.svn.sourceforge.net/openutils/?rev=4190&view=rev Author: fgiust Date: 2013-02-04 16:08:20 +0000 (Mon, 04 Feb 2013) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnlmedia-5.0.2 Added Paths: ----------- tags/openutils-mgnlmedia-5.0.2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 16:07:58
|
Revision: 4189 http://openutils.svn.sourceforge.net/openutils/?rev=4189&view=rev Author: fgiust Date: 2013-02-04 16:07:48 +0000 (Mon, 04 Feb 2013) Log Message: ----------- [maven-release-plugin] prepare release openutils-mgnlmedia-5.0.2 Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-02-04 15:55:13 UTC (rev 4188) +++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-02-04 16:07:48 UTC (rev 4189) @@ -10,7 +10,7 @@ <artifactId>openutils-mgnlmedia</artifactId> <name>SimpleMedia Module for Magnolia CMS</name> <description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> <inceptionYear>2008</inceptionYear> <licenses> <license> @@ -24,9 +24,9 @@ <url>http://jira.openmindlab.com/browse/MEDIA</url> </issueManagement> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.2</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.2</developerConnection> + <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-5.0.2</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 4188 http://openutils.svn.sourceforge.net/openutils/?rev=4188&view=rev Author: fgiust Date: 2013-02-04 15:55:13 +0000 (Mon, 04 Feb 2013) Log Message: ----------- MEDIA-297 Add a configurable base url/host for generated resource urls Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-02-04 15:51:16 UTC (rev 4187) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-02-04 15:55:13 UTC (rev 4188) @@ -236,7 +236,7 @@ "/modules/media/config/search/filters/query", "wildcards", Boolean.TRUE)); - + tasks.add(new ChangeExistingPropertyTask( ContentRepository.CONFIG, "/modules/media/mediausedin/website", @@ -244,6 +244,9 @@ "mgnl:content", "mgnl:page")); + // empty placeholder + tasks.add(new CreateMissingPropertyTask(ContentRepository.CONFIG, "/modules/media/config", "baseurl", "")); + return tasks; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 15:51:26
|
Revision: 4187 http://openutils.svn.sourceforge.net/openutils/?rev=4187&view=rev Author: fgiust Date: 2013-02-04 15:51:16 +0000 (Mon, 04 Feb 2013) Log Message: ----------- MEDIA-297 Add a configurable base url/host for generated resource urls Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-02-04 15:44:03 UTC (rev 4186) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-02-04 15:51:16 UTC (rev 4187) @@ -85,6 +85,8 @@ private LockUtils locks = new LockUtils(4); + private String baseurl; + /** * Constructor */ @@ -343,4 +345,23 @@ { return locks; } + + /** + * Returns the baseurl. + * @return the baseurl + */ + public String getBaseurl() + { + return baseurl; + } + + /** + * Sets the baseurl. + * @param baseurl the baseurl to set + */ + public void setBaseurl(String baseurl) + { + this.baseurl = baseurl; + } + } Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-02-04 15:44:03 UTC (rev 4186) +++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-02-04 15:51:16 UTC (rev 4187) @@ -200,7 +200,7 @@ { return null; } - return mtc.getHandler().getUrl(media, options); + return appendBaseUrl(mtc.getHandler().getUrl(media, options)); } /** @@ -299,7 +299,7 @@ Point size = ImageUtils.parseForSize(resolution); if (width == size.x && height == size.y) { - return mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH); + return appendBaseUrl(mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH)); } } @@ -317,7 +317,7 @@ { String resPath = new FileProperties(resolutions, resString).getProperty(FileProperties.PATH); - return mcm.getURIMappingPrefix() + resPath; + return appendBaseUrl(mcm.getURIMappingPrefix() + resPath); } } @@ -361,7 +361,7 @@ } catch (RepositoryException e) { - res = null; + // do nothing } } } @@ -922,4 +922,14 @@ return tagsLoc(media, null); } + private static String appendBaseUrl(String url) + { + String baseurl = module().getBaseurl(); + if (baseurl != null && StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://")) + { + return baseurl + url; + } + return url; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 15:44:11
|
Revision: 4186 http://openutils.svn.sourceforge.net/openutils/?rev=4186&view=rev Author: fgiust Date: 2013-02-04 15:44:03 +0000 (Mon, 04 Feb 2013) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmail/pom.xml Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-02-04 15:43:43 UTC (rev 4185) +++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-02-04 15:44:03 UTC (rev 4186) @@ -9,7 +9,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlmail</artifactId> <name>simplemail module for Magnolia CMS</name> - <version>5.0.0</version> + <version>5.0.1-SNAPSHOT</version> <inceptionYear>2011</inceptionYear> <description>An extension to the mail module for Magnolia CMS</description> <url>http://www.openmindlab.com/lab/products/mgnlmail.html</url> @@ -24,9 +24,9 @@ </license> </licenses> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmail-5.0.0</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmail-5.0.0 </developerConnection> - <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmail-5.0.0</url> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail </developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmail</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 15:43:50
|
Revision: 4185 http://openutils.svn.sourceforge.net/openutils/?rev=4185&view=rev Author: fgiust Date: 2013-02-04 15:43:43 +0000 (Mon, 04 Feb 2013) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnlmail-5.0.0 Added Paths: ----------- tags/openutils-mgnlmail-5.0.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 15:43:08
|
Revision: 4184 http://openutils.svn.sourceforge.net/openutils/?rev=4184&view=rev Author: fgiust Date: 2013-02-04 15:43:01 +0000 (Mon, 04 Feb 2013) Log Message: ----------- [maven-release-plugin] prepare release openutils-mgnlmail-5.0.0 Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmail/pom.xml Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-02-04 15:32:50 UTC (rev 4183) +++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-02-04 15:43:01 UTC (rev 4184) @@ -9,7 +9,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlmail</artifactId> <name>simplemail module for Magnolia CMS</name> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.0</version> <inceptionYear>2011</inceptionYear> <description>An extension to the mail module for Magnolia CMS</description> <url>http://www.openmindlab.com/lab/products/mgnlmail.html</url> @@ -24,9 +24,9 @@ </license> </licenses> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail </developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmail</url> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmail-5.0.0</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmail-5.0.0 </developerConnection> + <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmail-5.0.0</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 15:32:59
|
Revision: 4183 http://openutils.svn.sourceforge.net/openutils/?rev=4183&view=rev Author: fgiust Date: 2013-02-04 15:32:50 +0000 (Mon, 04 Feb 2013) Log Message: ----------- update license headers Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmail/pom.xml magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimpleMailModuleVersionHandler.java magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-02-04 15:27:48 UTC (rev 4182) +++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-02-04 15:32:50 UTC (rev 4183) @@ -73,7 +73,7 @@ <include>src/**/*.java</include> </includes> <properties> - <year>${project.inceptionYear}-2011</year> + <year>${project.inceptionYear}-2013</year> <name>${project.name}</name> <description>${project.description}</description> <url>${project.url}</url> Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java 2013-02-04 15:27:48 UTC (rev 4182) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/EmailFromPage.java 2013-02-04 15:32:50 UTC (rev 4183) @@ -1,7 +1,7 @@ /** * * simplemail module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlmail.html) - * Copyright(C) 2011-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2011-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimpleMailModuleVersionHandler.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimpleMailModuleVersionHandler.java 2013-02-04 15:27:48 UTC (rev 4182) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimpleMailModuleVersionHandler.java 2013-02-04 15:32:50 UTC (rev 4183) @@ -1,7 +1,7 @@ /** * * simplemail module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlmail.html) - * Copyright(C) 2011-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2011-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-02-04 15:27:48 UTC (rev 4182) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-02-04 15:32:50 UTC (rev 4183) @@ -1,7 +1,7 @@ /** * * simplemail module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlmail.html) - * Copyright(C) 2011-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2011-2013, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-02-04 15:27:57
|
Revision: 4182 http://openutils.svn.sourceforge.net/openutils/?rev=4182&view=rev Author: fgiust Date: 2013-02-04 15:27:48 +0000 (Mon, 04 Feb 2013) Log Message: ----------- allow folder in the email repo + fix for uuidlink selection Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-resources/simplemail/icons/ico16-mail.png Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-01-28 11:57:07 UTC (rev 4181) +++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-02-04 15:27:48 UTC (rev 4182) @@ -19,13 +19,19 @@ package net.sourceforge.openutils.mgnlmail; +import info.magnolia.cms.core.ItemType; import info.magnolia.cms.gui.control.ContextMenuItem; import info.magnolia.cms.gui.control.Tree; import info.magnolia.module.admininterface.trees.WebsiteTreeConfiguration; +import java.util.List; + import javax.servlet.http.HttpServletRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author fgiust * @version $Id$ @@ -36,24 +42,68 @@ private String urlprefix = "email"; /** + * Logger. + */ + private Logger log = LoggerFactory.getLogger(SimplemailTreeConfiguration.class); + + /** * {@inheritDoc} */ @Override + public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request) + { + super.prepareTree(tree, browseMode, request); + + tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/ico16-mail.png"); + tree.addItemType(ItemType.NT_FOLDER, Tree.ICONDOCROOT + "folder.gif"); + tree.setDrawShifter(true); // for folders + } + + /** + * {@inheritDoc} + */ + @Override public void prepareContextMenu(Tree tree, boolean browseMode, HttpServletRequest request) { super.prepareContextMenu(tree, browseMode, request); - String action = "var w=window.open(mgnlEncodeURL(contextPath + '" - + (urlprefix != null ? "/" + urlprefix : "") - + "' + " + ContextMenuItem menuNewFolder = new ContextMenuItem("newFolder"); + menuNewFolder.setLabel("New Folder"); // @todo translate + menuNewFolder.setIcon(request.getContextPath() + "/.resources/icons/16/folder_add.gif"); //$NON-NLS-1$ + menuNewFolder.setOnclick(tree.getJavascriptTree() + ".createNode('" + ItemType.NT_FOLDER + "');"); //$NON-NLS-1$ + menuNewFolder.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotItemType(" //$NON-NLS-1$ + tree.getJavascriptTree() - + ".selectedNode.path + '.html'),'mgnlInline','');if (w) w.focus();"; + + ", '" + ItemType.CONTENT + "')"); //$NON-NLS-1$ - ContextMenuItem menuOpen = tree.getMenu().getMenuItemByName("open"); - menuOpen.setOnclick(action); + // check needed for browse dialog in uuid links + if (!browseMode) + { - tree.setIconOndblclick(action); + List<ContextMenuItem> menuItems = tree.getMenu().getMenuItems(); + menuItems.add(2, menuNewFolder); // add after "new page" + String action = "var w=window.open(mgnlEncodeURL(contextPath + '" + + (urlprefix != null ? "/" + urlprefix : "") + + "' + " + + tree.getJavascriptTree() + + ".selectedNode.path + '.html'),'mgnlInline','');if (w) w.focus();"; + + ContextMenuItem menuOpen = tree.getMenu().getMenuItemByName("open"); + menuOpen.setOnclick(action); + menuOpen.setLabel("Open email"); + menuOpen.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotItemType(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ", '" + ItemType.FOLDER + "')"); //$NON-NLS-1$ + tree.setIconOndblclick(action); + + ContextMenuItem menuNew = tree.getMenu().getMenuItemByName("new"); + menuNew.setLabel("New email"); + menuNew.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotItemType(" //$NON-NLS-1$ + + tree.getJavascriptTree() + + ", '" + ItemType.FOLDER + "')"); //$NON-NLS-1$ + + } + // todo: add menu item "send test mail"? } Added: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-resources/simplemail/icons/ico16-mail.png =================================================================== (Binary files differ) Property changes on: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-resources/simplemail/icons/ico16-mail.png ___________________________________________________________________ Added: svn:mime-type + image/png This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2013-01-28 11:57:14
|
Revision: 4181 http://openutils.svn.sourceforge.net/openutils/?rev=4181&view=rev Author: diego_schivo Date: 2013-01-28 11:57:07 +0000 (Mon, 28 Jan 2013) Log Message: ----------- grid.ftl: fix gridRemoveRow Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-18 17:23:27 UTC (rev 4180) +++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-28 11:57:07 UTC (rev 4181) @@ -157,7 +157,11 @@ record = new grid.store.recordType(rt); grid.store.add(record); } - grid.selModel.select(c0, c1); + if (c0 < grid.store.data.length) { + grid.selModel.select(c0, c1); + } else if (c0 > 0) { + grid.selModel.select(c0 - 1, c1); + } grid.fireEvent("afteredit", { grid: grid }); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 4180 http://openutils.svn.sourceforge.net/openutils/?rev=4180&view=rev Author: diego_schivo Date: 2013-01-18 17:23:27 +0000 (Fri, 18 Jan 2013) Log Message: ----------- MediaGridColumnType: mediaType Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-01-07 14:40:33 UTC (rev 4179) +++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-01-18 17:23:27 UTC (rev 4180) @@ -69,7 +69,14 @@ protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap, Messages msgs) { - column.put("editor", "new Ed(new MediaField({}))"); + StringBuilder sb = new StringBuilder(); + sb.append("new Ed(new MediaField({"); + if (colMap.get("mediaType") != null) + { + sb.append("mediaType: '" + String.valueOf(colMap.get("mediaType")) + "'"); + } + sb.append("}))"); + column.put("editor", sb.toString()); StringWriter render = new StringWriter(); render.append("function(v, p, record){ return v ? '<img border=\"0\" alt=\"\" src=\""); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2013-01-07 14:40:40
|
Revision: 4179 http://openutils.svn.sourceforge.net/openutils/?rev=4179&view=rev Author: diego_schivo Date: 2013-01-07 14:40:33 +0000 (Mon, 07 Jan 2013) Log Message: ----------- grid.ftl: mgnlDialogFormSubmit, itemAt Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-06 09:59:11 UTC (rev 4178) +++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-07 14:40:33 UTC (rev 4179) @@ -331,13 +331,14 @@ grid.setWidth(grid.container.getWidth()); }); - grid.on('afteredit', function(grid) { - var dat = grid.grid.store.data; - var cm = grid.grid.getColumnModel(); + var _mgnlDialogFormSubmit = mgnlDialogFormSubmit; + mgnlDialogFormSubmit = function() { + var dat = grid.store.data; + var cm = grid.getColumnModel(); var fullValue = '', j, row, k, cell; for (j = 0; j < dat.length; j++) { - row = dat.item(j); + row = dat.itemAt(j); for (k = 0; k < cm.getColumnCount(); k++) { cell = row.get(k); fullValue += Ext.isDate(cell) ? cell.format('Y-m-d') : cell; @@ -348,11 +349,11 @@ fullValue += '\n'; } hidden.value = fullValue.replace(/\r/g, ''); - }, this, true); + _mgnlDialogFormSubmit(); + }; hidden._grid = grid; }); // ]]> </script> - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2013-01-06 09:59:18
|
Revision: 4178 http://openutils.svn.sourceforge.net/openutils/?rev=4178&view=rev Author: diego_schivo Date: 2013-01-06 09:59:11 +0000 (Sun, 06 Jan 2013) Log Message: ----------- MediaField.js: actMedia Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js 2012-12-23 14:23:16 UTC (rev 4177) +++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js 2013-01-06 09:59:11 UTC (rev 4178) @@ -10,7 +10,7 @@ window.setNewMedia = function(nodeid, uuid, file, thumb){ this.setValue(uuid); }.createDelegate(this); - mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mediaType=' + this.mediaType + '&mgnlCK=' + mgnlGetCacheKiller(), 840, 560); + mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mediaType=' + this.mediaType + '&mgnlCK=' + mgnlGetCacheKiller() + '&actMedia=' + this.getValue(), 840, 560); } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2012-12-17 23:08:12
|
Revision: 4164 http://openutils.svn.sourceforge.net/openutils/?rev=4164&view=rev Author: fgiust Date: 2012-12-17 23:08:03 +0000 (Mon, 17 Dec 2012) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlutils/pom.xml Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-12-17 23:07:55 UTC (rev 4163) +++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-12-17 23:08:03 UTC (rev 4164) @@ -9,7 +9,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlutils</artifactId> <name>Generic utilities for Magnolia CMS</name> - <version>5.0.1</version> + <version>5.0.2-SNAPSHOT</version> <inceptionYear>2009</inceptionYear> <description>A collection of Magnolia utilities and extensions</description> <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url> @@ -24,9 +24,9 @@ </license> </licenses> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-5.0.1</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-5.0.1 </developerConnection> - <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-5.0.1</url> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils </developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlutils</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2012-12-17 23:08:01
|
Revision: 4163 http://openutils.svn.sourceforge.net/openutils/?rev=4163&view=rev Author: fgiust Date: 2012-12-17 23:07:55 +0000 (Mon, 17 Dec 2012) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnlutils-5.0.1 Added Paths: ----------- tags/openutils-mgnlutils-5.0.1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2012-12-17 23:07:41
|
Revision: 4162 http://openutils.svn.sourceforge.net/openutils/?rev=4162&view=rev Author: fgiust Date: 2012-12-17 23:07:34 +0000 (Mon, 17 Dec 2012) Log Message: ----------- [maven-release-plugin] prepare release openutils-mgnlutils-5.0.1 Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlutils/pom.xml Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-12-17 23:05:57 UTC (rev 4161) +++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-12-17 23:07:34 UTC (rev 4162) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd "> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd "> <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> @@ -10,7 +9,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlutils</artifactId> <name>Generic utilities for Magnolia CMS</name> - <version>5.0.1-SNAPSHOT</version> + <version>5.0.1</version> <inceptionYear>2009</inceptionYear> <description>A collection of Magnolia utilities and extensions</description> <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url> @@ -25,9 +24,9 @@ </license> </licenses> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlutils </developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlutils</url> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-5.0.1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-5.0.1 </developerConnection> + <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-5.0.1</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2012-12-17 23:06:06
|
Revision: 4161 http://openutils.svn.sourceforge.net/openutils/?rev=4161&view=rev Author: fgiust Date: 2012-12-17 23:05:57 +0000 (Mon, 17 Dec 2012) Log Message: ----------- update dependencies and headers Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlutils/pom.xml magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlPagingElFunctions.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/ClientHeadersFilter.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/SessionUtilsFilter.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/jmx/JmxServerContextListener.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/ApplicationVersionVirtualUriMapping.java magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/LocaleBasedVirtualURIMapping.java magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlPagingElFunctionsTest.java magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd "> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd "> <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-parent</artifactId> @@ -73,7 +74,7 @@ <include>src/**/*.java</include> </includes> <properties> - <year>${project.inceptionYear}-2011</year> + <year>${project.inceptionYear}-2012</year> <name>${project.name}</name> <description>${project.description}</description> <url>${project.url}</url> @@ -111,18 +112,6 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.0.1</version> - <optional>true</optional><!-- this is not in test scope since the module also contains testng support classes --> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltasks</artifactId> <version>5.0.0</version> @@ -140,23 +129,22 @@ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-testing4web</artifactId> - <version>1.2.1</version> + <artifactId>openutils-mgnltests</artifactId> + <version>5.0.0</version> <scope>test</scope> </dependency> <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-core</artifactId> - <version>${magnolia.version}</version> - <classifier>tests</classifier> - <optional>true</optional> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.0.1</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <optional>true</optional> - </dependency> </dependencies> <properties> <magnolia.version>4.5.6</magnolia.version> Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlPagingElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlPagingElFunctions.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlPagingElFunctions.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,3 +1,22 @@ +/** + * + * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + package it.openutils.mgnlutils.el; import java.util.Properties; Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/ClientHeadersFilter.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/ClientHeadersFilter.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/ClientHeadersFilter.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/SessionUtilsFilter.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/SessionUtilsFilter.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/SessionUtilsFilter.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/jmx/JmxServerContextListener.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/jmx/JmxServerContextListener.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/jmx/JmxServerContextListener.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/ApplicationVersionVirtualUriMapping.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/ApplicationVersionVirtualUriMapping.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/ApplicationVersionVirtualUriMapping.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/LocaleBasedVirtualURIMapping.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/LocaleBasedVirtualURIMapping.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/virtualuri/LocaleBasedVirtualURIMapping.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlPagingElFunctionsTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlPagingElFunctionsTest.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlPagingElFunctionsTest.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2012-12-17 23:01:11 UTC (rev 4160) +++ magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java 2012-12-17 23:05:57 UTC (rev 4161) @@ -1,7 +1,7 @@ /** * * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html) - * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it + * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,9 +28,7 @@ import info.magnolia.link.LinkTransformerManager; import info.magnolia.test.ComponentsTestUtil; import info.magnolia.test.mock.MockWebContext; -import it.openutils.mgnlutils.test.ModuleConfiguration; import it.openutils.mgnlutils.test.RepositoryTestConfiguration; -import it.openutils.mgnlutils.test.TestModule; import it.openutils.mgnlutils.test.TestNgRepositoryTestcase; import java.lang.reflect.Method; @@ -48,7 +46,7 @@ @RepositoryTestConfiguration(repositoryConfig = "/utils-repository/test-repositories.xml", jackrabbitRepositoryConfig = "/utils-repository/jackrabbit-test-configuration.xml", bootstrapFiles = { "/utils-bootstrap/config.server.xml", "/utils-bootstrap/website.pets.xml", - "/utils-bootstrap/config.modules.testmodule.xml" }, magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "testmodule", moduleclass = TestModule.class) }) + "/utils-bootstrap/config.modules.testmodule.xml" }, magnoliaProperties = "/test-magnolia.properties") public class MgnlUtilsElFunctionsTest extends TestNgRepositoryTestcase { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2012-12-17 23:01:20
|
Revision: 4160 http://openutils.svn.sourceforge.net/openutils/?rev=4160&view=rev Author: fgiust Date: 2012-12-17 23:01:11 +0000 (Mon, 17 Dec 2012) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnltests/pom.xml Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2012-12-17 23:00:59 UTC (rev 4159) +++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2012-12-17 23:01:11 UTC (rev 4160) @@ -9,7 +9,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnltests</artifactId> <name>Test utilities for Magnolia CMS</name> - <version>5.0.0</version> + <version>5.0.1-SNAPSHOT</version> <inceptionYear>2009</inceptionYear> <description>A collection testing utilities for Magnolia CMS</description> <url>http://www.openmindlab.com/lab/products/mgnltests.html</url> @@ -24,9 +24,9 @@ </license> </licenses> <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltests-5.0.0</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltests-5.0.0 </developerConnection> - <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltests-5.0.0</url> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests </developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltests</url> </scm> <build> <resources> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2012-12-17 23:01:05
|
Revision: 4159 http://openutils.svn.sourceforge.net/openutils/?rev=4159&view=rev Author: fgiust Date: 2012-12-17 23:00:59 +0000 (Mon, 17 Dec 2012) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnltests-5.0.0 Added Paths: ----------- tags/openutils-mgnltests-5.0.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |