|
From: <fg...@us...> - 2012-12-17 22:59:07
|
Revision: 4157
http://openutils.svn.sourceforge.net/openutils/?rev=4157&view=rev
Author: fgiust
Date: 2012-12-17 22:59:00 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
update pom and headers
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/JUnitRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/ModuleConfiguration.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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>
@@ -8,14 +9,14 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>openutils-mgnltests</artifactId>
- <name>Generic utilities for Magnolia CMS</name>
+ <name>Test utilities for Magnolia CMS</name>
<version>5.0.0-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
- <description>A collection of Magnolia utilities and extensions</description>
- <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url>
+ <description>A collection testing utilities for Magnolia CMS</description>
+ <url>http://www.openmindlab.com/lab/products/mgnltests.html</url>
<issueManagement>
<system>jira</system>
- <url>http://jira.openmindlab.com/browse/MGNLUTILS</url>
+ <url>http://jira.openmindlab.com/browse/MGNLTESTS</url>
</issueManagement>
<licenses>
<license>
@@ -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>
@@ -89,32 +90,12 @@
</plugin>
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- </plugins>
- </reporting>
<dependencies>
<dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-rendering</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>${magnolia.version}</version>
- <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 -->
+ <optional>true</optional><!-- this is not in test scope since the module contains testng support classes -->
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -123,16 +104,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -148,17 +119,21 @@
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
<version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>${magnolia.version}</version>
<classifier>tests</classifier>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
- <optional>true</optional>
+ <optional>true</optional><!-- this is not in test scope since the module contains junit support classes -->
</dependency>
</dependencies>
<properties>
<magnolia.version>4.5.6</magnolia.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/JUnitRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/JUnitRepositoryTestcase.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/JUnitRepositoryTestcase.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/ModuleConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/ModuleConfiguration.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/ModuleConfiguration.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/TestNgRepositoryTestcase.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java 2012-12-17 22:54:36 UTC (rev 4156)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java 2012-12-17 22:59:00 UTC (rev 4157)
@@ -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
+ * Test utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltests.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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-20 19:22:04
|
Revision: 4419
http://openutils.svn.sourceforge.net/openutils/?rev=4419&view=rev
Author: fgiust
Date: 2013-10-20 19:21:59 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update repository configuration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-10-20 19:15:35 UTC (rev 4418)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-10-20 19:21:59 UTC (rev 4419)
@@ -121,6 +121,11 @@
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
+ <artifactId>magnolia-jaas</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
<version>${magnolia.version}</version>
<classifier>tests</classifier>
Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml 2013-10-20 19:15:35 UTC (rev 4418)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml 2013-10-20 19:21:59 UTC (rev 4419)
@@ -5,10 +5,11 @@
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
- <Security appName="Jackrabbit">
- <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"></AccessManager>
- <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
- <param name="anonymousId" value="anonymous" />
+ <Security appName="magnolia">
+ <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" />
+ <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+ </AccessManager>
+ <LoginModule class="info.magnolia.jaas.sp.jcr.JackrabbitAuthenticationModule">
</LoginModule>
</Security>
<Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
@@ -34,6 +35,9 @@
</FileSystem>
</SearchIndex>
<ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
+ <WorkspaceSecurity>
+ <AccessControlProvider class="info.magnolia.cms.core.MagnoliaAccessProvider" />
+ </WorkspaceSecurity>
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|