Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4161] magnoliamodules/trunk/openutils-mgnlutils
|
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.
|
