Menu
▾
▴
openutils-svn — developer list with svn commits
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: <fg...@us...> - 2012-05-06 15:12:55
|
Revision: 3976
http://openutils.svn.sourceforge.net/openutils/?rev=3976&view=rev
Author: fgiust
Date: 2012-05-06 15:12:49 +0000 (Sun, 06 May 2012)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlutils-1.1.0
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 15:11:04 UTC (rev 3975)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 15:12:49 UTC (rev 3976)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlutils</artifactId>
<name>Generic utilities for Magnolia CMS</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</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/magnoliamodules/branches/magnolia44/openutils-mgnlutils</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/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-1.1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-1.1.0 </developerConnection>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlutils-1.1.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...> - 2012-05-06 15:11:10
|
Revision: 3975
http://openutils.svn.sourceforge.net/openutils/?rev=3975&view=rev
Author: fgiust
Date: 2012-05-06 15:11:04 +0000 (Sun, 06 May 2012)
Log Message:
-----------
MGNLUTILS-34 Add methods from info.magnolia.cms.taglibs.CmsFunctions
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-05-06 14:42:42 UTC (rev 3974)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-05-06 15:11:04 UTC (rev 3975)
@@ -21,14 +21,18 @@
import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.beans.config.ServerConfiguration;
+import info.magnolia.cms.core.AggregationState;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.core.Path;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.i18n.I18nContentWrapper;
import info.magnolia.cms.i18n.MessagesManager;
+import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.security.SecurityUtil;
import info.magnolia.cms.security.User;
import info.magnolia.cms.security.auth.Entity;
import info.magnolia.cms.util.NodeMapWrapper;
@@ -49,6 +53,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.Set;
import javax.jcr.ItemNotFoundException;
@@ -1005,4 +1010,169 @@
.getFirstResult();
}
+ /**
+ * Check if the current user belongs the given role
+ * @param role role name
+ * @return true if the user belongs to the role
+ */
+ public static boolean userHasRole(String role)
+ {
+ return MgnlContext.getUser().getAllRoles().contains(role);
+ }
+
+ /**
+ * Check if the current user belongs the given group
+ * @param group group name
+ * @return true if the user belongs to the group
+ */
+ public static boolean userHasGroup(String group)
+ {
+ return MgnlContext.getUser().getAllGroups().contains(group);
+ }
+
+ /**
+ * Returns the current active page (can be set using the loadPage tag).
+ * @return current page
+ */
+ public static Content currentPage()
+ {
+ return MgnlContext.getAggregationState().getCurrentContent();
+ }
+
+ /**
+ * Returns the main loaded page (doesn't change when using the loadPage tag).
+ * @return loaded page
+ */
+ public static Content mainPage()
+ {
+ return MgnlContext.getAggregationState().getMainContent();
+ }
+
+ /**
+ * Returns the current paragraph.
+ * @return current paragraph
+ */
+ public static Content currentParagraph()
+ {
+ return MgnlContext.getAggregationState().getCurrentContent();
+ }
+
+ /**
+ * Returns the value of a system property.
+ * @param key property key
+ * @return property value
+ */
+ public static String systemProperty(String key)
+ {
+ return SystemProperty.getProperty(key);
+ }
+
+ /**
+ * Returns the system properties.
+ * @return Property instance
+ */
+ public static Properties systemProperties()
+ {
+ return SystemProperty.getProperties();
+ }
+
+ /**
+ * Check if a user is currently logged in (not anonymous).
+ * @return true if a user is currently logged in.
+ */
+ public static boolean isLoggedIn()
+ {
+ return SecurityUtil.isAuthenticated();
+ }
+
+ /**
+ * Check if the current user can edit the active page.
+ * @return true if the current user can edit the active page.
+ */
+ public static boolean canEdit()
+ {
+ return MgnlContext.getAggregationState().getMainContent().isGranted(Permission.SET);
+ }
+
+ /**
+ * Check if the current page is open in editing mode. Shortcut for checking if the server is admin, preview unset,
+ * permissions to modify the page available for the current user.
+ * @return true if the page is open in edit mode and user has permissions to edit
+ */
+ public static boolean isEditMode()
+ {
+ final AggregationState aggregationState = MgnlContext.getAggregationState();
+ Content activePage = aggregationState.getMainContent();
+ return ServerConfiguration.getInstance().isAdmin()
+ && !aggregationState.isPreviewMode()
+ && activePage != null
+ && activePage.isGranted(Permission.SET);
+ }
+
+ /**
+ * Find and load the first parent page containing a named node. This function can be useful while building pages
+ * that should inherit a paragraph from parent pages. Loaded page must be unloaded using the
+ * <code><cms:unloadPage /></code> tag. Sample use:
+ *
+ * <pre>
+ * <c:if test="${cmsfn:firstPageWithNode("column", 3)}">
+ * content inherited from page ${cmsfn:currentPage().handle}.html
+ * <cms:contentNodeIterator contentNodeCollectionName="column">
+ * <cms:includeTemplate />
+ * </cms:contentNodeIterator>
+ * <cms:unloadPage />
+ * </c:if>
+ * </pre>
+ * @param nodeName paragraph name
+ * @param minlevel level at which we will stop also if no page is found
+ * @return <code>true</code> if a page has been found and loaded, <code>false</code> otherwise
+ */
+ public static boolean firstPageWithNode(String nodeName, int minlevel)
+ {
+ Content actpage = MgnlContext.getAggregationState().getCurrentContent();
+ if (actpage == null)
+ {
+ actpage = MgnlContext.getAggregationState().getMainContent();
+ }
+
+ try
+ {
+ while (actpage.getLevel() > minlevel)
+ {
+ actpage = actpage.getParent();
+
+ if (actpage.hasContent(nodeName))
+ {
+ MgnlContext.getAggregationState().setCurrentContent(actpage);
+ return true;
+ }
+ }
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error looking for node " + nodeName + " in " + actpage.getHandle(), e);
+ }
+
+ return false;
+ }
+
+ /**
+ * Function to iterate over a node Data that has "checkbox" as control type, for example. See
+ * http://jira.magnolia-cms.com/browse/MAGNOLIA-1969
+ */
+ public static Collection<NodeData> nodeDataIterator(Content c, String collection)
+ {
+ try
+ {
+ return c.getContent(collection).getNodeDataCollection();
+ }
+ catch (RepositoryException e)
+ {
+ log.error(
+ "Error when getting nodedata collection from " + c + " / " + collection + " :" + e.getMessage(),
+ e);
+ return null;
+ }
+ }
+
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld 2012-05-06 14:42:42 UTC (rev 3974)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld 2012-05-06 15:11:04 UTC (rev 3975)
@@ -1,5 +1,4 @@
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
version="2.0">
<description>Magnolia utility Tags and EL functions</description>
<display-name>Magnolia utility Tags and EL functions</display-name>
@@ -327,22 +326,115 @@
<function-signature>java.util.Map userProperties()</function-signature>
</function>
<function>
+ <description>Returns the value of a page property, by iterating on active page ancestor till a value is found</description>
<name>pagePropertyInherited</name>
- <description>Returns the value of a page property, by iterating on active page ancestor till a value is found</description>
<function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
<function-signature>java.lang.String pagePropertyInherited( java.lang.String)</function-signature>
</function>
<function>
+ <description>Sets the given content as the active page, calling MgnlContext.getAggregationState().setCurrentContent)</description>
<name>setActivePage</name>
- <description>Sets the given content as the active page, calling MgnlContext.getAggregationState().setCurrentContent)</description>
<function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
<function-signature>void setActivePage(info.magnolia.cms.core.Content)</function-signature>
</function>
<function>
+ <description>Get a Content node by its UUID. Internally uses JCR Criteria. Params are UUID and repository name.</description>
<name>contentByUUID</name>
- <description>Get a Content node by its UUID. Internally uses JCR Criteria. Params are UUID and repository name.</description>
<function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
<function-signature>info.magnolia.cms.core.Content contentByUUID(java.lang.String, java.lang.String)</function-signature>
</function>
+ <function>
+ <description>Check if the current user belongs the given role</description>
+ <name>userHasRole</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>boolean userHasRole(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <description>Check if the current user belongs the given group</description>
+ <name>userHasGroup</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>boolean userHasGroup(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <description>Returns the current active page (can be set using the loadPage tag).</description>
+ <name>currentPage</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>info.magnolia.cms.core.Content currentPage()</function-signature>
+ </function>
+ <function>
+ <description>Returns the main loaded page (doesn't change when using the loadPage tag).</description>
+ <name>mainPage</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>info.magnolia.cms.core.Content mainPage()</function-signature>
+ </function>
+ <function>
+ <description>Returns the current paragraph.</description>
+ <name>currentParagraph</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>info.magnolia.cms.core.Content currentParagraph()</function-signature>
+ </function>
+ <function>
+ <description>Returns the value of a system property</description>
+ <name>systemProperty</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>java.lang.String systemProperty(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <description>Returns the system properties</description>
+ <name>systemProperties</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>java.util.Properties systemProperties()</function-signature>
+ </function>
+ <function>
+ <description>Check if a user is currently logged in (not anonymous)</description>
+ <name>isLoggedIn</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>boolean isLoggedIn()</function-signature>
+ </function>
+ <function>
+ <description>Check if the current user can edit the active page</description>
+ <name>canEdit</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>boolean canEdit()</function-signature>
+ </function>
+ <function>
+ <description>
+ Check if the current page is open in editing mode. Shortcut for checking if the server is admin, preview unset,
+ permissions to modify the page available for the current user.
+ </description>
+ <name>editMode</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>boolean isEditMode()</function-signature>
+ </function>
+ <function>
+ <description>
+ <![CDATA[
+ Find and load the first parent page containing a named node.
+ This function can be useful while building pages that should inherit a paragraph from parent pages.
+ Loaded page must be unloaded using the <cms:unloadPage /> tag.
+ Sample use:
+ <pre>
+ <c:if test="${cmsfn:firstPageWithNode("node", 3)}">
+ content inherited from page ${cmsfn:currentPage().handle}.html
+ <<cms:includeTemplate contentNodeName="node" />
+ <cms:unloadPage />
+ </c:if>
+ </pre>
+ ]]>
+ </description>
+ <name>firstPageWithNode</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>boolean firstPageWithNode(java.lang.String,int)</function-signature>
+ </function>
+ <function>
+ <description>
+ Function to iterate over a node Data that has "checkbox" as control type, for example.
+ See http://jira.magnolia-cms.com/browse/MAGNOLIA-1969
+ </description>
+ <name>nodeDataIterator</name>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>java.util.Collection nodeDataIterator(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
+ </function>
+
<!-- please don't add new funtions without a meaningfull <description> -->
</taglib>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 14:42:48
|
Revision: 3974
http://openutils.svn.sourceforge.net/openutils/?rev=3974&view=rev
Author: fgiust
Date: 2012-05-06 14:42:42 +0000 (Sun, 06 May 2012)
Log Message:
-----------
MGNLUTILS-33 new contentByUUID() EL function
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-05-06 14:35:22 UTC (rev 3973)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2012-05-06 14:42:42 UTC (rev 3974)
@@ -56,6 +56,9 @@
import javax.security.auth.Subject;
import javax.servlet.http.HttpServletRequest;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.jackrabbit.util.ISO9075;
@@ -982,4 +985,24 @@
}
}
+ /**
+ * Get a Content node by its UUID. Internally uses JCR Criteria.
+ * @param uuid content UUID
+ * @param repo workspace name
+ * @return Content or null if not found
+ */
+ public static Content contentByUUID(String uuid, String repo)
+ {
+ if (StringUtils.isBlank(uuid))
+ {
+ return null;
+ }
+ return JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(repo)
+ .add(Restrictions.eq("@jcr:uuid", uuid))
+ .execute()
+ .getFirstResult();
+ }
+
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld 2012-05-06 14:35:22 UTC (rev 3973)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld 2012-05-06 14:42:42 UTC (rev 3974)
@@ -338,5 +338,11 @@
<function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
<function-signature>void setActivePage(info.magnolia.cms.core.Content)</function-signature>
</function>
+ <function>
+ <name>contentByUUID</name>
+ <description>Get a Content node by its UUID. Internally uses JCR Criteria. Params are UUID and repository name.</description>
+ <function-class>it.openutils.mgnlutils.el.MgnlUtilsElFunctions</function-class>
+ <function-signature>info.magnolia.cms.core.Content contentByUUID(java.lang.String, java.lang.String)</function-signature>
+ </function>
<!-- please don't add new funtions without a meaningfull <description> -->
</taglib>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3973
http://openutils.svn.sourceforge.net/openutils/?rev=3973&view=rev
Author: fgiust
Date: 2012-05-06 14:35:22 +0000 (Sun, 06 May 2012)
Log Message:
-----------
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2012-05-06 14:21:17 UTC (rev 3972)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2012-05-06 14:35:22 UTC (rev 3973)
@@ -32,6 +32,8 @@
import java.awt.image.WritableRaster;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.Iterator;
import javax.imageio.ImageIO;
@@ -220,13 +222,40 @@
try
{
// see MEDIA-72, we need the sun codec to make this work properly
- return com.sun.image.codec.jpeg.JPEGCodec.createJPEGDecoder(is4).decodeAsBufferedImage();
+
+ Class< ? > sunjpegcodec = Class.forName("com.sun.image.codec.jpeg.JPEGCodec");
+ Method createJPEGDecoderMethod = sunjpegcodec.getMethod("createJPEGDecoder", InputStream.class);
+ Object jpegDecoder = createJPEGDecoderMethod.invoke(null, is4);
+ Method decodeAsBufferedImageMethod = jpegDecoder.getClass().getMethod(
+ "decodeAsBufferedImage",
+ new Class[0]);
+ BufferedImage result = (BufferedImage) decodeAsBufferedImageMethod.invoke(jpegDecoder, null);
+
+ return result;
}
- catch (RuntimeException ife)
+ catch (ClassNotFoundException e)
{
- // Icom.sun.image.codec,jpeg.ImageFormatException: Can't construct a BufferedImage for given COLOR_ID try also with CMYK?
+ log.info("com.sun.image.codec.jpeg.JPEGCodec not available, can't process non-standard jpeg");
return createJPEG4(raster, ycckProfile);
}
+ catch (NoSuchMethodException e)
+ {
+ log.info("com.sun.image.codec.jpeg.JPEGCodec not available, can't process non-standard jpeg");
+ return createJPEG4(raster, ycckProfile);
+ }
+ catch (IllegalAccessException e)
+ {
+ // should never happen
+ log.error(e.getMessage(), e);
+ return createJPEG4(raster, ycckProfile);
+ }
+ catch (InvocationTargetException e)
+ {
+ log.debug(e.getTargetException().getMessage(), e.getTargetException());
+ // Icom.sun.image.codec,jpeg.ImageFormatException: Can't construct a BufferedImage for given
+ // COLOR_ID try also with CMYK?
+ return createJPEG4(raster, ycckProfile);
+ }
finally
{
IOUtils.closeQuietly(is4);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3972
http://openutils.svn.sourceforge.net/openutils/?rev=3972&view=rev
Author: fgiust
Date: 2012-05-06 14:21:17 +0000 (Sun, 06 May 2012)
Log Message:
-----------
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2012-05-06 14:13:55 UTC (rev 3971)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2012-05-06 14:21:17 UTC (rev 3972)
@@ -44,7 +44,6 @@
import com.drew.imaging.jpeg.JpegProcessingException;
import com.drew.imaging.jpeg.JpegSegmentReader;
-import com.sun.image.codec.jpeg.ImageFormatException;
/**
@@ -223,10 +222,9 @@
// see MEDIA-72, we need the sun codec to make this work properly
return com.sun.image.codec.jpeg.JPEGCodec.createJPEGDecoder(is4).decodeAsBufferedImage();
}
- catch (ImageFormatException ife)
+ catch (RuntimeException ife)
{
- // ImageFormatException: Can't construct a BufferedImage for given COLOR_ID
- // try also with CMYK?
+ // Icom.sun.image.codec,jpeg.ImageFormatException: Can't construct a BufferedImage for given COLOR_ID try also with CMYK?
return createJPEG4(raster, ycckProfile);
}
finally
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 14:14:01
|
Revision: 3971
http://openutils.svn.sourceforge.net/openutils/?rev=3971&view=rev
Author: fgiust
Date: 2012-05-06 14:13:55 +0000 (Sun, 06 May 2012)
Log Message:
-----------
add criteria dependency
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 14:13:55 UTC (rev 3971)
@@ -124,6 +124,11 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <version>3.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing4web</artifactId>
<version>1.2.1</version>
<scope>test</scope>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 14:06:18
|
Revision: 3970
http://openutils.svn.sourceforge.net/openutils/?rev=3970&view=rev
Author: fgiust
Date: 2012-05-06 14:06:11 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update versions
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -162,7 +162,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.4-SNAPSHOT</version>
</dependency>
<!--
dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-modulestore</artifactId>
@@ -272,7 +272,7 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
<stk.version>1.3.1</stk.version>
<jackrabbit.version>2.2.5</jackrabbit.version>
</properties>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlbootstrapsync/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcache/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -60,7 +60,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -78,6 +78,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcas/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -89,6 +89,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontextmenu/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -167,6 +167,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -91,7 +91,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -113,6 +113,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -177,7 +177,7 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
<jackrabbit.version>1.6.2</jackrabbit.version>
<jcr.version>1.0</jcr.version>
</properties>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlgroovy/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -90,10 +90,10 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnllms/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -102,7 +102,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -194,6 +194,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmail/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -98,10 +98,10 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -112,7 +112,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -249,6 +249,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.6</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -79,7 +79,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -121,6 +121,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmobile/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -111,7 +111,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.wurfl</groupId>
@@ -130,6 +130,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlrepoutils/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlrules/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -146,6 +146,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlstripes/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -72,7 +72,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -100,6 +100,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlstruts11/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -91,7 +91,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.0</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>struts</groupId>
@@ -110,6 +110,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -123,7 +123,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlutils/pom.xml 2012-05-06 14:06:11 UTC (rev 3970)
@@ -120,7 +120,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -143,6 +143,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.4</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 13:58:28
|
Revision: 3969
http://openutils.svn.sourceforge.net/openutils/?rev=3969&view=rev
Author: fgiust
Date: 2012-05-06 13:58:22 +0000 (Sun, 06 May 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-05-06 13:58:15 UTC (rev 3968)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-05-06 13:58:22 UTC (rev 3969)
@@ -10,13 +10,13 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltasks</artifactId>
<name>Tasks for for Magnolia CMS</name>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.1.3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.1.3</developerConnection>
- <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.1.3</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltasks</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltasks</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltasks</url>
</scm>
<licenses>
<license>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 13:58:20
|
Revision: 3968
http://openutils.svn.sourceforge.net/openutils/?rev=3968&view=rev
Author: fgiust
Date: 2012-05-06 13:58:15 +0000 (Sun, 06 May 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnltasks-4.1.3
Added Paths:
-----------
tags/openutils-mgnltasks-4.1.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 13:58:02
|
Revision: 3967
http://openutils.svn.sourceforge.net/openutils/?rev=3967&view=rev
Author: fgiust
Date: 2012-05-06 13:57:56 +0000 (Sun, 06 May 2012)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnltasks-4.1.3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-05-06 13:57:03 UTC (rev 3966)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-05-06 13:57:56 UTC (rev 3967)
@@ -10,13 +10,13 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltasks</artifactId>
<name>Tasks for for Magnolia CMS</name>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3</version>
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltasks</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44/openutils-mgnltasks</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltasks</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.1.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.1.3</developerConnection>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.1.3</url>
</scm>
<licenses>
<license>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 13:57:09
|
Revision: 3966
http://openutils.svn.sourceforge.net/openutils/?rev=3966&view=rev
Author: fgiust
Date: 2012-05-06 13:57:03 +0000 (Sun, 06 May 2012)
Log Message:
-----------
magnolia 4.4.7
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-05-06 13:54:05 UTC (rev 3965)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltasks/pom.xml 2012-05-06 13:57:03 UTC (rev 3966)
@@ -116,6 +116,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.7</magnolia.version>
</properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 13:54:12
|
Revision: 3965
http://openutils.svn.sourceforge.net/openutils/?rev=3965&view=rev
Author: fgiust
Date: 2012-05-06 13:54:05 +0000 (Sun, 06 May 2012)
Log Message:
-----------
TASKS-14 Alternative DevelopmentUtilsPage for exporting to multiple folders
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/mgnltasks/
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/mgnltasks/dev/
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.html
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/mgnl-resources/
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/mgnl-resources/tasks/
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/mgnl-resources/tasks/ico16-save.png
Added: magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java 2012-05-06 13:54:05 UTC (rev 3965)
@@ -0,0 +1,535 @@
+/**
+ *
+ * Tasks for for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) 2008-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.mgnltasks.dev;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.importexport.DataTransporter;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * <p>
+ * Similar to info.magnolia.module.admininterface.pages.DevelopmentUtilsPage, but tweaked to export all the resources to
+ * separate bootstrap folder like the ones used by SimpleModuleVersionHandler.
+ * </p>
+ * <p>
+ * Configure it by adding to your module version handler:
+ * </p>
+ *
+ * <pre>
+ *
+ * tasks.add(new ModuleDevelopmentUtilsPage.AddDevPageToMenuTask("modulename",
+ * "../../../../modulename-magnolia/src/main/resources/mgnl-bootstrap/modulename"));
+ *
+ * </pre>
+ * @author fgiust
+ * @version $Id$
+ */
+public class ModuleDevelopmentUtilsPage extends TemplatedMVCHandler
+{
+
+ private boolean templates;
+
+ private boolean paragraphs;
+
+ private boolean dialogs;
+
+ private boolean pages;
+
+ private boolean website;
+
+ private boolean media;
+
+ private boolean data;
+
+ private boolean users;
+
+ private boolean groups;
+
+ private boolean roles;
+
+ private boolean virtualURIs;
+
+ private String rootdir;
+
+ private String parentpath;
+
+ private String repository;
+
+ private String module;
+
+ public static Logger log = LoggerFactory.getLogger(ModuleDevelopmentUtilsPage.class);
+
+ public ModuleDevelopmentUtilsPage(String name, HttpServletRequest request, HttpServletResponse response)
+ {
+ super(name, request, response);
+ }
+
+ public boolean isTemplates()
+ {
+ return this.templates;
+ }
+
+ public boolean isParagraphs()
+ {
+ return this.paragraphs;
+ }
+
+ public boolean isDialogs()
+ {
+ return this.dialogs;
+ }
+
+ public boolean isPages()
+ {
+ return this.pages;
+ }
+
+ public void setPages(boolean pages)
+ {
+ this.pages = pages;
+ }
+
+ public boolean isWebsite()
+ {
+ return this.website;
+ }
+
+ public boolean isMedia()
+ {
+ return media;
+ }
+
+ public void setMedia(boolean media)
+ {
+ this.media = media;
+ }
+
+ public boolean isData()
+ {
+ return data;
+ }
+
+ public void setData(boolean data)
+ {
+ this.data = data;
+ }
+
+ public boolean isUsers()
+ {
+ return this.users;
+ }
+
+ public boolean isGroups()
+ {
+ return this.groups;
+ }
+
+ public boolean isRoles()
+ {
+ return this.roles;
+ }
+
+ public String getRootdir()
+ {
+ return this.rootdir;
+ }
+
+ public String getParentpath()
+ {
+ return this.parentpath;
+ }
+
+ public String getRepository()
+ {
+ return this.repository;
+ }
+
+ public void setDialogs(boolean dialogs)
+ {
+ this.dialogs = dialogs;
+ }
+
+ public void setParagraphs(boolean paragraphs)
+ {
+ this.paragraphs = paragraphs;
+ }
+
+ public void setTemplates(boolean templates)
+ {
+ this.templates = templates;
+ }
+
+ public void setRootdir(String rootdir)
+ {
+ this.rootdir = rootdir;
+ }
+
+ public void setWebsite(boolean website)
+ {
+ this.website = website;
+ }
+
+ public void setParentpath(String parentpath)
+ {
+ this.parentpath = parentpath;
+ }
+
+ public void setGroups(boolean groups)
+ {
+ this.groups = groups;
+ }
+
+ public void setRoles(boolean roles)
+ {
+ this.roles = roles;
+ }
+
+ public void setUsers(boolean users)
+ {
+ this.users = users;
+ }
+
+ public String getModule()
+ {
+ return this.module;
+ }
+
+ public void setModule(String module)
+ {
+ this.module = module;
+ }
+
+ public void setRepository(String repository)
+ {
+ this.repository = repository;
+ }
+
+ public boolean isVirtualURIs()
+ {
+ return this.virtualURIs;
+ }
+
+ public void setVirtualURIs(boolean virtualURIs)
+ {
+ this.virtualURIs = virtualURIs;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Iterator<String> getRepositories()
+ {
+ return ContentRepository.getAllRepositoryNames();
+ }
+
+ public Set<String> getModules()
+ {
+ return ModuleRegistry.Factory.getInstance().getModuleNames();
+ }
+
+ public String backup()
+ {
+ HierarchyManager hm = MgnlContext.getHierarchyManager(ContentRepository.CONFIG);
+ Session session = hm.getWorkspace().getSession();
+
+ try
+ {
+ Content moduleroot = hm.getContent("/modules/" + module);
+ if (templates)
+ {
+ exportChildren(ContentRepository.CONFIG, session, moduleroot, "templates", new ItemType[]{
+ ItemType.CONTENT,
+ ItemType.CONTENTNODE }, false);
+ }
+ if (paragraphs)
+ {
+ exportChildren(ContentRepository.CONFIG, session, moduleroot, "paragraphs", new ItemType[]{
+ ItemType.CONTENT,
+ ItemType.CONTENTNODE }, false);
+ }
+ if (pages)
+ {
+ exportChildren(ContentRepository.CONFIG, session, moduleroot, "pages", new ItemType[]{
+ ItemType.CONTENT,
+ ItemType.CONTENTNODE }, false);
+ }
+ if (dialogs)
+ {
+ exportChildren(ContentRepository.CONFIG, session, moduleroot, "dialogs", new ItemType[]{
+ ItemType.CONTENT,
+ ItemType.CONTENTNODE }, true);
+ }
+ if (virtualURIs)
+ {
+ exportChildren(
+ ContentRepository.CONFIG,
+ session,
+ moduleroot,
+ "virtualURIMapping",
+ new ItemType[]{ItemType.CONTENTNODE },
+ true);
+ }
+ AlertUtil.setMessage("Backup done to "
+ + new File(Path.getAbsoluteFileSystemPath(rootdir)).getCanonicalPath());
+ }
+ catch (Exception e)
+ {
+ log.error(e.getMessage(), e);
+ AlertUtil.setMessage("Error while processing module " + module, e);
+ }
+
+ if (website)
+ {
+ extractWorkspaceRoots(ContentRepository.WEBSITE);
+ }
+
+ if (media && ContentRepository.getRepositoryMapping("media") != null)
+ {
+ extractWorkspaceRoots("media");
+ }
+
+ if (data && ContentRepository.getRepositoryMapping("data") != null)
+ {
+ extractWorkspaceRoots("data");
+ }
+
+ if (users)
+ {
+ backupChildren(ContentRepository.USERS, "/admin");
+ }
+
+ if (groups)
+ {
+ extractWorkspaceRoots(ContentRepository.USER_GROUPS);
+ }
+
+ if (roles)
+ {
+ extractWorkspaceRoots(ContentRepository.USER_ROLES);
+ }
+
+ return this.show();
+ }
+
+ private void extractWorkspaceRoots(String repositoryName)
+ {
+ try
+ {
+ HierarchyManager hm = MgnlContext.getHierarchyManager(repositoryName);
+ Content wesiteRoot = hm.getRoot();
+
+ Iterator<Content> children = wesiteRoot.getChildren(ContentUtil.MAGNOLIA_FILTER).iterator();
+ while (children.hasNext())
+ {
+ Content exported = children.next();
+ exportNode(repositoryName, hm.getWorkspace().getSession(), exported, true);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error(e.getMessage(), e);
+ AlertUtil.setMessage("Error while processing " + repositoryName + " repository", e);
+ }
+ }
+
+ private void backupChildren(String repository, String parentpath)
+ {
+ HierarchyManager hm = MgnlContext.getHierarchyManager(repository);
+
+ Content parentNode = null;
+ try
+ {
+ parentNode = hm.getContent(parentpath);
+ }
+ catch (RepositoryException e)
+ {
+ // ignore
+ return;
+ }
+ try
+ {
+ Iterator<Content> children = parentNode
+ .getChildren(ContentUtil.ALL_NODES_EXCEPT_JCR_CONTENT_FILTER)
+ .iterator();
+ while (children.hasNext())
+ {
+ Content exported = children.next();
+ exportNode(repository, hm.getWorkspace().getSession(), exported, false);
+ }
+
+ }
+ catch (Exception e)
+ {
+ log.error(e.getMessage(), e);
+ AlertUtil.setMessage("Error while processing actions", e);
+ }
+
+ }
+
+ private void exportChildren(String repository, Session session, Content moduleroot, String path,
+ ItemType[] itemTypes, boolean exportContentContainingContentNodes) throws PathNotFoundException,
+ RepositoryException, AccessDeniedException, FileNotFoundException, IOException
+ {
+ Content templateRoot = null;
+ try
+ {
+ templateRoot = moduleroot.getContent(path);
+ }
+ catch (PathNotFoundException e)
+ {
+ // ignore
+ return;
+ }
+
+ // we need to track exported paths, or it will export any single control for dialogs
+ Set<String> alreadyExported = new HashSet<String>();
+
+ Iterator<Content> children = ContentUtil.collectAllChildren(templateRoot, itemTypes).iterator();
+ while (children.hasNext())
+ {
+ Content exported = children.next();
+ if (!exported.getNodeDataCollection().isEmpty() // ignore "directories"
+ || (exportContentContainingContentNodes && exported.hasChildren(ItemType.CONTENTNODE.getSystemName())))
+ {
+
+ String current = exported.getHandle();
+ boolean dontexport = false;
+
+ for (Iterator<String> iterator = alreadyExported.iterator(); iterator.hasNext();)
+ {
+ String already = iterator.next();
+ if (current.startsWith(already))
+ {
+ dontexport = true;
+ break;
+ }
+ }
+
+ if (!dontexport)
+ {
+ alreadyExported.add(exported.getHandle() + "/");
+ exportNode(repository, session, exported, false);
+ }
+ }
+ }
+ }
+
+ private void exportNode(String repository, Session session, Content exported, boolean dev)
+ throws FileNotFoundException, IOException
+ {
+ String handle = exported.getHandle();
+ String xmlName = repository + StringUtils.replace(handle, "/", ".") + ".xml";
+ xmlName = DataTransporter.encodePath(xmlName, ".", "UTF-8");
+ // create necessary parent directories
+ File folder = new File(Path.getAbsoluteFileSystemPath(dev && !StringUtils.contains(rootdir, "-dev") ? rootdir
+ + "-dev" : rootdir));
+ folder.mkdirs();
+ File xmlFile = new File(folder.getAbsoluteFile(), xmlName);
+ FileOutputStream fos = new FileOutputStream(xmlFile);
+
+ try
+ {
+ DataTransporter.executeExport(fos, false, true, session, handle, repository, DataTransporter.XML);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(fos);
+ }
+ }
+
+ public static class AddDevPageToMenuTask extends AbstractRepositoryTask
+ {
+
+ private final String module2;
+
+ private final String bootstrapRootDir;
+
+ public AddDevPageToMenuTask(String module, String bootstrapRootDir)
+ {
+ super("Dev page for module " + module, "");
+ module2 = module;
+ this.bootstrapRootDir = bootstrapRootDir;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+ {
+ HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.CONFIG);
+
+ String pagename = "development-" + module2;
+ Content pages = hm.getContent("/modules/" + module2 + "/pages", true, ItemType.CONTENT);
+ if (!pages.hasContent(pagename))
+ {
+ Content page = pages.createContent(pagename, ItemType.CONTENTNODE);
+ page.setNodeData("class", ModuleDevelopmentUtilsPage.class.getName());
+ }
+
+ Content menu = hm.getContent("/modules/adminInterface/config/menu/tools", true, ItemType.CONTENT);
+
+ if (!menu.hasChildren(pagename))
+ {
+ Content page = menu.createContent(pagename, ItemType.CONTENTNODE);
+ page.setNodeData("icon", "/.resources/tasks/ico16-save.png");
+ page.setNodeData("label", "Tools * " + module2);
+ page.setNodeData("onclick", "MgnlAdminCentral.showContent('/.magnolia/pages/"
+ + pagename
+ + ".html?module="
+ + module2
+ + "&rootdir="
+ + bootstrapRootDir
+ + "');");
+ }
+
+ }
+
+ }
+}
Property changes on: magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.html
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.html (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.html 2012-05-06 13:54:05 UTC (rev 3965)
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>Development utils</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" />
+ </head>
+ <body id="mgnl">
+ [#if message?exists]
+ <pre>${message}</pre>
+ <hr />
+ [/#if]
+ <form action="" method="post">
+ <input type="hidden" name="command" value="backup" />
+ <input type="hidden" name="rootdir" id="backup-rootdir" value="${this.rootdir}" class="text" />
+ <div class="pageframe">
+ <h3>Backup</h3>
+ <h3>Standard configuration</h3>
+ <div class="formelement">
+ <label for="website">Media</label>
+ <input type="checkbox" name="media" id="media" checked="checked" />
+ </div>
+ <div class="formelement">
+ <label for="data">Data</label>
+ <input type="checkbox" name="data" id="data" checked="checked" />
+ </div>
+ <div class="formelement">
+ <label for="website">Website</label>
+ <input type="checkbox" name="website" id="website" checked="checked" />
+ </div>
+ <div class="formelement">
+ <label for="users">Users</label>
+ <input type="checkbox" name="users" id="users" [#if this.users] checked="checked" [/#if] />
+ </div>
+ <div class="formelement">
+ <label for="groups">Groups</label>
+ <input type="checkbox" name="groups" id="groups" [#if this.groups] checked="checked" [/#if] />
+ </div>
+ <div class="formelement">
+ <label for="roles">Roles</label>
+ <input type="checkbox" name="roles" id="roles" [#if this.roles] checked="checked" [/#if] />
+ </div>
+ <h3>Templating</h3>
+ <div class="formelement">
+ <label for="backup-module">Module</label>
+ <select name="module" id="backup-module">
+ [#list this.modules as item]
+ <option [#if this.module=item] selected="selected" [/#if]>${item}</option>
+ [/#list]
+ </select>
+ </div>
+ <div class="formelement">
+ <label for="templates">Templates</label>
+ <input type="checkbox" name="templates" id="templates" checked="checked" />
+ </div>
+ <div class="formelement">
+ <label for="paragraphs">Paragraphs</label>
+ <input type="checkbox" name="paragraphs" id="paragraphs" checked="checked" />
+ </div>
+ <div class="formelement">
+ <label for="dialogs">Dialogs</label>
+ <input type="checkbox" name="dialogs" id="dialogs"checked="checked" />
+ </div>
+ <div class="formelement">
+ <label for="pages">Pages</label>
+ <input type="checkbox" name="pages" id="pages" [#if this.pages] checked="checked" [/#if] />
+ </div>
+ <div class="formelement">
+ <label for="virtualURIs">Virtual URIs</label>
+ <input type="checkbox" name="virtualURIs" id="virtualURIs" [#if this.virtualURIs] checked="checked" [/#if] />
+ </div>
+ <input type="submit" value="backup" class="mgnlControlButton" />
+ </div>
+ </form>
+ </body>
+</html>
\ No newline at end of file
Property changes on: magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/mgnl-resources/tasks/ico16-save.png
===================================================================
(Binary files differ)
Property changes on: magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/resources/mgnl-resources/tasks/ico16-save.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.
|
Revision: 3964
http://openutils.svn.sourceforge.net/openutils/?rev=3964&view=rev
Author: fgiust
Date: 2012-05-06 13:39:32 +0000 (Sun, 06 May 2012)
Log Message:
-----------
TASKS-13 Conditional bootstrap of -dev folders for multiple modules
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2012-05-06 13:29:26 UTC (rev 3963)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2012-05-06 13:39:32 UTC (rev 3964)
@@ -32,6 +32,7 @@
import java.util.Set;
import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,14 +114,24 @@
List<Delta> deltas = super.getDeltas(ctx, from);
// adding the (module)-nooverwrite in addiction to the standard bootstrap directory
- deltas.get(0).getTasks().add(
- new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-nooverwrite"));
+ deltas
+ .get(0)
+ .getTasks()
+ .add(new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-nooverwrite"));
// only for development, add the (module)-dev bootstrap directory
if (SystemProperty.getBooleanProperty("magnolia.develop"))
{
- deltas.get(0).getTasks().add(
- new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-dev"));
+ if (StringUtils.isEmpty(SystemProperty.getProperty("magnolia.bootstrapdev"))
+ || StringUtils.contains(SystemProperty.getProperty("magnolia.bootstrapdev"), ctx
+ .getCurrentModuleDefinition()
+ .getName()))
+ {
+ deltas
+ .get(0)
+ .getTasks()
+ .add(new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-dev"));
+ }
}
return deltas;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 13:29:32
|
Revision: 3963
http://openutils.svn.sourceforge.net/openutils/?rev=3963&view=rev
Author: fgiust
Date: 2012-05-06 13:29:26 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update module versions
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
Modified: magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 13:15:55 UTC (rev 3962)
+++ magnoliamodules/branches/magnolia44/magnolia-test-webapp/pom.xml 2012-05-06 13:29:26 UTC (rev 3963)
@@ -117,7 +117,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.3.4-SNAPSHOT</version>
+ <version>3.3.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -137,7 +137,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.5.1-SNAPSHOT</version>
+ <version>4.5.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -151,11 +151,6 @@
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlspring</artifactId>
- <version>3.5.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
<version>4.1.4-SNAPSHOT</version>
</dependency>
@@ -200,7 +195,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -215,7 +210,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnllms</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3962
http://openutils.svn.sourceforge.net/openutils/?rev=3962&view=rev
Author: fgiust
Date: 2012-05-06 13:15:55 +0000 (Sun, 06 May 2012)
Log Message:
-----------
avoid NPEs
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-05-06 13:05:28 UTC (rev 3961)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-05-06 13:15:55 UTC (rev 3962)
@@ -153,7 +153,12 @@
{
if (c.getNodeDataCollection().size() > 0)
{
- keys.add(StringUtils.replace(c.getHandle(), "/", ".").substring(1));
+ // fix for NPE found in logs... not sure why, but it can happen
+ String key = StringUtils.substring(StringUtils.replace(c.getHandle(), "/", "."), 1);
+ if (StringUtils.isNotEmpty(key))
+ {
+ keys.add(key);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 13:05:39
|
Revision: 3961
http://openutils.svn.sourceforge.net/openutils/?rev=3961&view=rev
Author: fgiust
Date: 2012-05-06 13:05:28 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Merged revisions 3809-3812,3815-3816,3875-3877,3889-3890,3892,3952-3954,3958 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r3809 | diego_schivo | 2012-03-16 11:58:18 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 LockUtils
........
r3810 | diego_schivo | 2012-03-16 12:10:27 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 ImageUtils
........
r3811 | diego_schivo | 2012-03-16 12:19:32 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 MediaModule: maxConcurrentThreads
........
r3812 | diego_schivo | 2012-03-16 12:21:07 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 MediaEl.module().getLocks().nextLock()
........
r3815 | diego_schivo | 2012-03-16 15:19:26 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-278 The first tab is not displayed in a LayerDialogMVC
........
r3816 | diego_schivo | 2012-03-16 15:31:29 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-278 The first tab is not displayed in a LayerDialogMVC
........
r3875 | carlocolombo | 2012-03-21 11:19:59 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnllms, path and references
........
r3876 | carlocolombo | 2012-03-21 11:29:16 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnlms
........
r3877 | carlocolombo | 2012-03-21 11:32:50 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnlms
........
r3889 | carlocolombo | 2012-03-21 17:47:52 +0100 (Wed, 21 Mar 2012) | 1 line
removed lms folders
........
r3890 | diego_schivo | 2012-03-27 09:57:02 +0200 (Tue, 27 Mar 2012) | 1 line
MESSAGES-17 Dropdown options may not contain the selected language
........
r3892 | fgiust | 2012-04-04 18:02:23 +0200 (Wed, 04 Apr 2012) | 1 line
CRIT-48 fix regression similar to CRIT-40
........
r3952 | carlocolombo | 2012-04-16 16:24:24 +0200 (Mon, 16 Apr 2012) | 3 lines
Mapped url starting with /scorm to lms repository (previously lms -> lms)
updated scormPlayerPage to use url2repositoryMapping to retrieve correct repository
update js to open page with mgnlRepository=scorm
........
r3953 | carlocolombo | 2012-04-19 16:31:49 +0200 (Thu, 19 Apr 2012) | 1 line
lms -> scorm
........
r3954 | diego_schivo | 2012-05-04 15:38:43 +0200 (Fri, 04 May 2012) | 1 line
CONTROLS-46 Grid control: combo column type showing labels instead of values
........
r3958 | fgiust | 2012-05-06 14:20:23 +0200 (Sun, 06 May 2012) | 1 line
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=3809&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3810&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3811&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3812&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3815&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3816&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3875&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3876&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3877&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3889&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3890&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3892&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3952&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3953&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3954&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3958&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/TrackingModel.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/UserReport.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ExactContentFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/CommonDataItemOrganization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Dependency.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/File.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Item.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Manifest.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Metadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organizations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/CompletionThreshold.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Data.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Map.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/TimeLimitAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ChildActivity.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionCombination.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionOperator.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ControlMode.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/DeliveryControls.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/LimitConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveBase.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PrimaryObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RandomTiming.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Randomization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupActionEnum.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionExitCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPostCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPreCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Sequencing.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingCollection.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/HideLMSUI.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/NavigationInterface.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/Presentation.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ConstrainChoiceConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsideration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/utils/JaxbUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.html
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.html
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.html
magnoliamodules/trunk/openutils-mgnllms/src/test/java/net/sourceforge/openutils/mgnllms/TestJaxb.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
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/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-nodetypes/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/LockUtils.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/lms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-nodetypes/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/lms/
Property Changed:
----------------
magnoliamodules/trunk/
magnoliamodules/trunk/openutils-mgnlmedia/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3779
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3960
Added: svn:mergeinfo
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -84,10 +84,29 @@
options.add("lazyRender: true");
options.add("listClass: 'x-combo-list-small'");
- column.put("editor", "new Ed(new "
- + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
- + "({"
- + StringUtils.join(options, ",")
- + "}))");
+ if ("true".equals(String.valueOf(colMap.get("showLabel"))))
+ {
+ column.put(
+ "editor",
+ "(function() { window.gridComboColumnTypeTmp = new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}); return new Ed(gridComboColumnTypeTmp); })()");
+ column.put("renderer", "(function(combo){"
+ + " return function(value){"
+ + " var record = combo.findRecord(combo.valueField, value);"
+ + " return record ? record.get(combo.displayField) : combo.valueNotFoundText;"
+ + " }"
+ + "})(window.gridComboColumnTypeTmp)");
+ }
+ else
+ {
+ column.put("editor", "new Ed(new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}))");
+ }
}
}
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 13:05:28 UTC (rev 3961)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/SCORM</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnllms</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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
@@ -56,7 +56,7 @@
ContextMenuItem menuNewPage = new ContextMenuItem("newFolder");
menuNewPage.setLabel(msgs.get("tree.config.menu.newFolder")); //$NON-NLS-1$
- menuNewPage.setIcon(request.getContextPath() + "/.resources/lms/icons/folder16.gif"); //$NON-NLS-1$
+ menuNewPage.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/folder16.gif"); //$NON-NLS-1$
menuNewPage.setOnclick(tree.getJavascriptTree()
+ ".createNode('" + LmsTypesManager.FOLDER.getSystemName() + "');"); //$NON-NLS-1$ //$NON-NLS-2$
menuNewPage.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotScormNode("
@@ -101,7 +101,7 @@
ContextMenuItem menuSimulate = new ContextMenuItem("simulate");
menuSimulate.setLabel(msgs.get("lms.menu.simulate")); //$NON-NLS-1$
- menuSimulate.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ menuSimulate.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
menuSimulate.setOnclick("mgnl.lms.simulate(" + tree.getJavascriptTree() + ".selectedNode.id);");
menuSimulate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
+ tree.getJavascriptTree()
@@ -121,7 +121,7 @@
// ContextMenuItem menuUserReport = new ContextMenuItem("userReport");
// menuUserReport.setLabel(msgs.get("lms.menu.userreport")); //$NON-NLS-1$
- // menuUserReport.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ // menuUserReport.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
// menuUserReport.setOnclick("mgnl.lms.userreport(" + tree.getJavascriptTree() + ".selectedNode.id);");
// menuUserReport.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
// + tree.getJavascriptTree()
@@ -138,7 +138,7 @@
ContextMenuItem menuUserReportAdmin = new ContextMenuItem("userReportAdmin");
menuUserReportAdmin.setLabel(msgs.get("lms.menu.userreportadmin")); //$NON-NLS-1$
- menuUserReportAdmin.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ menuUserReportAdmin.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
menuUserReportAdmin.setOnclick("mgnl.lms.userreportadmin(" + tree.getJavascriptTree() + ".selectedNode.id);");
menuUserReportAdmin.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
+ tree.getJavascriptTree()
@@ -304,8 +304,8 @@
{
final Messages msgs = getMessages();
- tree.addItemType(LmsTypesManager.FOLDER.getSystemName(), "/.resources/lms/icons/folder16.gif");
- tree.addItemType(LmsTypesManager.COURSE.getSystemName(), "/.resources/lms/icons/course.gif");
+ tree.addItemType(LmsTypesManager.FOLDER.getSystemName(), "/.resources/mgnllms/icons/folder16.gif");
+ tree.addItemType(LmsTypesManager.COURSE.getSystemName(), "/.resources/mgnllms/icons/course.gif");
TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.lms.folders"), true);
column0.setWidth(4);
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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
@@ -52,13 +52,13 @@
super.renderHeaderIncludes(html);
html.append("<script type=\"text/javascript\" src=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/js/lms.js\"><!-- --></script>");
+ + "/.resources/mgnllms/js/lms.js\"><!-- --></script>");
html.append("<script type=\"text/javascript\" src=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/js/conditions.js\"><!-- --></script>");
+ + "/.resources/mgnllms/js/conditions.js\"><!-- --></script>");
html.append("<link rel=\"stylesheet\" href=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/css/override.css\"><!-- --></script>");
+ + "/.resources/mgnllms/css/override.css\"><!-- --></script>");
}
/**
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, 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
@@ -19,10 +19,14 @@
package net.sourceforge.openutils.mgnllms.pages.lms;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
+import info.magnolia.cms.beans.config.URI2Reposi...
[truncated message content] |
|
From: <fg...@us...> - 2012-05-06 12:39:28
|
Revision: 3960
http://openutils.svn.sourceforge.net/openutils/?rev=3960&view=rev
Author: fgiust
Date: 2012-05-06 12:39:22 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Blocked revisions 3808,3813-3814,3893,3895-3898,3900-3901,3903,3905-3907,3909-3911,3913 via svnmerge
........
r3808 | diego_schivo | 2012-03-16 11:41:38 +0100 (Fri, 16 Mar 2012) | 1 line
pom.xml
........
r3813 | diego_schivo | 2012-03-16 14:19:31 +0100 (Fri, 16 Mar 2012) | 1 line
magnolia-test-webapp pom.xml
........
r3814 | diego_schivo | 2012-03-16 14:35:49 +0100 (Fri, 16 Mar 2012) | 1 line
magnolia.version=4.4.6
........
r3893 | fgiust | 2012-04-04 18:03:53 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlcriteria-3.3.4
........
r3895 | fgiust | 2012-04-04 18:04:20 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r3896 | fgiust | 2012-04-04 18:08:39 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] rollback the release of openutils-mgnlcriteria-3.3.4
........
r3897 | fgiust | 2012-04-04 18:11:16 +0200 (Wed, 04 Apr 2012) | 1 line
fix SCM urls
........
r3898 | fgiust | 2012-04-04 18:12:58 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlcriteria-3.3.4
........
r3900 | fgiust | 2012-04-04 18:13:35 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r3901 | fgiust | 2012-04-04 18:16:51 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] rollback the release of openutils-mgnlcriteria-3.3.4
........
r3903 | fgiust | 2012-04-04 18:19:14 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlcriteria-3.3.4
........
r3905 | fgiust | 2012-04-04 18:19:41 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r3906 | fgiust | 2012-04-04 18:28:05 +0200 (Wed, 04 Apr 2012) | 1 line
update dependencies
........
r3907 | fgiust | 2012-04-04 18:28:48 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnllms-2.0.0
........
r3909 | fgiust | 2012-04-04 18:29:15 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r3910 | fgiust | 2012-04-04 18:34:43 +0200 (Wed, 04 Apr 2012) | 1 line
update dependencies
........
r3911 | fgiust | 2012-04-04 18:35:51 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlmedia-4.5.1
........
r3913 | fgiust | 2012-04-04 18:36:17 +0200 (Wed, 04 Apr 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=3808&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3813&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3814&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3893&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3895&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3896&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3897&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3898&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3900&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3901&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3903&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3905&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3906&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3907&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3909&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3910&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3911&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3913&view=rev
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Added: svnmerge-blocked
+ /magnoliamodules/branches/magnolia44:3808,3813-3814,3893,3895-3898,3900-3901,3903,3905-3907,3909-3911,3913
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 12:36:51
|
Revision: 3959
http://openutils.svn.sourceforge.net/openutils/?rev=3959&view=rev
Author: fgiust
Date: 2012-05-06 12:36:44 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update test configuration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-06 12:20:23 UTC (rev 3958)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-06 12:36:44 UTC (rev 3959)
@@ -19,6 +19,7 @@
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene.AclSearchIndex">
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
<param name="path" value="${rep.home}/indexes/${wsp.name}" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
<param name="supportHighlighting" value="true" />
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2012-05-06 12:20:23 UTC (rev 3958)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2012-05-06 12:36:44 UTC (rev 3959)
@@ -19,6 +19,7 @@
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
<param name="path" value="${rep.home}/indexes/${wsp.name}" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
<param name="supportHighlighting" value="true" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3958
http://openutils.svn.sourceforge.net/openutils/?rev=3958&view=rev
Author: fgiust
Date: 2012-05-06 12:20:23 +0000 (Sun, 06 May 2012)
Log Message:
-----------
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2012-05-06 09:09:36 UTC (rev 3957)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2012-05-06 12:20:23 UTC (rev 3958)
@@ -56,6 +56,7 @@
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriter;
+import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
import javax.imageio.stream.ImageOutputStream;
import javax.jcr.Node;
import javax.jcr.PropertyType;
@@ -77,10 +78,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.image.codec.jpeg.JPEGEncodeParam;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-
/**
* Main utility class that works with images and media nodes
* @author molaschi
@@ -696,14 +694,27 @@
{
if (extension.equals("jpg"))
{
- JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(out);
+ JPEGImageWriteParam iwparam = new JPEGImageWriteParam(null);
+
if (quality != 1.0f)
{
- JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(image);
- param.setQuality(quality, true);
- encoder.setJPEGEncodeParam(param);
+ iwparam.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+ iwparam.setCompressionType("JPEG");
+ iwparam.setCompressionQuality(quality);
}
- encoder.encode(image);
+ else
+ {
+ iwparam.setCompressionMode(ImageWriteParam.MODE_COPY_FROM_METADATA);
+ }
+
+ ImageWriter iw = ImageIO.getImageWritersByFormatName("jpg").next();
+ ImageOutputStream ios = ImageIO.createImageOutputStream(out);
+ iw.setOutput(ios);
+ iw.write(null, new IIOImage(image, null, null), iwparam);
+ iw.dispose();
+ ios.close();
+
+ image.flush();
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 09:09:43
|
Revision: 3957
http://openutils.svn.sourceforge.net/openutils/?rev=3957&view=rev
Author: fgiust
Date: 2012-05-06 09:09:36 +0000 (Sun, 06 May 2012)
Log Message:
-----------
update old configuration files
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-test-configuration.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-acl-search-index-test-configuration.xml
Deleted: magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-acl-search-index-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-06 09:05:58 UTC (rev 3956)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-06 09:09:36 UTC (rev 3957)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
-<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" />
- </LoginModule>
- </Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
- <Workspace name="default">
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
- </FileSystem>
- <PersistenceManager class="org.apache.jackrabbit.core.state.mem.InMemPersistenceManager">
- <param name="initialCapacity" value="100000" />
- <param name="loadFactor" value="0.3" />
- <param name="persistent" value="false" />
- </PersistenceManager>
- <SearchIndex class="net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene.AclSearchIndex">
- <param name="indexingConfiguration" value="${rep.home}/../../test-classes/utils-repository/indexing_configuration.xml" />
- <param name="path" value="${wsp.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
- <param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="enableConsistencyCheck" value="true" />
- <param name="autoRepair" value="true" />
- <param name="forceConsistencyCheck" value="false" />
- <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
- <param name="supportHighlighting" value="true" />
- </SearchIndex>
- </Workspace>
- <Versioning rootPath="${rep.home}/version">
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
- </FileSystem>
- <PersistenceManager class="org.apache.jackrabbit.core.state.mem.InMemPersistenceManager">
- <param name="initialCapacity" value="100000" />
- <param name="loadFactor" value="0.3" />
- <param name="persistent" value="false" />
- </PersistenceManager>
- </Versioning>
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="indexingConfiguration" value="${rep.home}/../../test-classes/utils-repository/indexing_configuration.xml" />
- <param name="path" value="${rep.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
- <param name="forceConsistencyCheck" value="false" />
- <param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="supportHighlighting" value="true" />
- <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
- </FileSystem>
- </SearchIndex>
- <!-- <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"> <param name="minRecordLength" value="100000000"
- /> </DataStore> -->
-</Repository>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-test-configuration.xml 2012-05-06 09:05:58 UTC (rev 3956)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-repository/jackrabbit-test-configuration.xml 2012-05-06 09:09:36 UTC (rev 3957)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN" "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!-- TESTING-ONLY configuration! repositories are in memory only and any
+ change is lost upon restart -->
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
@@ -10,73 +11,50 @@
<param name="anonymousId" value="anonymous" />
</LoginModule>
</Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
- <Workspace name="default">
+ <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
+ <Workspace name="${wsp.name}">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
- <PersistenceManager class="org.apache.jackrabbit.core.state.mem.InMemPersistenceManager">
- <param name="initialCapacity" value="100000" />
- <param name="loadFactor" value="0.3" />
- <param name="persistent" value="false" />
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+ <param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/indexes/${wsp.name}" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/utils-repository/indexing_configuration.xml" />
- <param name="path" value="${wsp.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
- <param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="enableConsistencyCheck" value="true" />
- <param name="autoRepair" value="true" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
<param name="forceConsistencyCheck" value="false" />
+ <param name="autoRepair" value="true" />
+ <param name="respectDocumentOrder" value="true" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
- <param name="supportHighlighting" value="true" />
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
</SearchIndex>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
- <PersistenceManager class="org.apache.jackrabbit.core.state.mem.InMemPersistenceManager">
- <param name="initialCapacity" value="100000" />
- <param name="loadFactor" value="0.3" />
- <param name="persistent" value="false" />
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+ <param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Versioning>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/indexes/jcrsystem" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/utils-repository/indexing_configuration.xml" />
- <param name="path" value="${rep.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
<param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="false" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="supportHighlighting" value="true" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
</SearchIndex>
- <!-- <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"> <param name="minRecordLength" value="100000000"
- /> </DataStore> -->
</Repository>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-06 09:06:05
|
Revision: 3956
http://openutils.svn.sourceforge.net/openutils/?rev=3956&view=rev
Author: fgiust
Date: 2012-05-06 09:05:58 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-3779" from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Added: svnmerge-integrated
+ /magnoliamodules/branches/magnolia44:1-3779
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-05 17:14:37 UTC (rev 3955)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-acl-search-index-test-configuration.xml 2012-05-06 09:05:58 UTC (rev 3956)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN" "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!-- TESTING-ONLY configuration! repositories are in memory only and any
+ change is lost upon restart -->
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
@@ -10,38 +11,29 @@
<param name="anonymousId" value="anonymous" />
</LoginModule>
</Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
- <Workspace name="default">
+ <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
+ <Workspace name="${wsp.name}">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene.AclSearchIndex">
+ <param name="path" value="${rep.home}/indexes/${wsp.name}" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${wsp.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
+ <param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
<param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="enableConsistencyCheck" value="true" />
- <param name="autoRepair" value="true" />
- <param name="forceConsistencyCheck" value="false" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
- <param name="supportHighlighting" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
</SearchIndex>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
@@ -49,28 +41,19 @@
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Versioning>
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <SearchIndex class="net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene.AclSearchIndex">
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <param name="path" value="${rep.home}/indexes/jcrsystem" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${rep.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
<param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="supportHighlighting" value="true" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2012-05-05 17:14:37 UTC (rev 3955)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/jackrabbit-test-configuration.xml 2012-05-06 09:05:58 UTC (rev 3956)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN" "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<!-- TESTING-ONLY configuration! repositories are in memory only and any
+ change is lost upon restart -->
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
@@ -10,38 +11,29 @@
<param name="anonymousId" value="anonymous" />
</LoginModule>
</Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
- <Workspace name="default">
+ <Workspaces rootPath="${rep.home}" defaultWorkspace="defaultworkspace" />
+ <Workspace name="${wsp.name}">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/indexes/${wsp.name}" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${wsp.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
+ <param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
<param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="enableConsistencyCheck" value="true" />
- <param name="autoRepair" value="true" />
- <param name="forceConsistencyCheck" value="false" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
- <param name="supportHighlighting" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
</SearchIndex>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Workspace>
<Versioning rootPath="${rep.home}/version">
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
@@ -49,32 +41,21 @@
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="1" /><!-- store in memory -->
</PersistenceManager>
+ <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking" />
</Versioning>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <param name="path" value="${rep.home}/indexes/jcrsystem" />
<param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
- <param name="path" value="${rep.home}/index" />
- <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
- <param name="minMergeDocs" value="100" />
- <param name="volatileIdleTime" value="3" />
- <param name="maxMergeDocs" value="100000" />
- <param name="mergeFactor" value="10" />
- <param name="maxFieldLength" value="10000" />
- <param name="bufferSize" value="10" />
- <param name="cacheSize" value="1000" />
+ <param name="supportHighlighting" value="true" />
+ <param name="useCompoundFile" value="false" /><!-- solo per memory -->
+ <param name="cacheSize" value="10000" />
+ <param name="initializeHierarchyCache" value="false" />
+ <param name="enableConsistencyCheck" value="false" />
<param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
- <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
- <param name="respectDocumentOrder" value="true" />
- <param name="resultFetchSize" value="2147483647" />
- <param name="extractorPoolSize" value="3" />
- <param name="extractorTimeout" value="100" />
- <param name="extractorBackLogSize" value="100" />
- <param name="supportHighlighting" value="true" />
<param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
<FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
</FileSystem>
</SearchIndex>
- <!-- <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"> <param name="minRecordLength" value="100000000"
- /> </DataStore> -->
</Repository>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-05-05 17:14:43
|
Revision: 3955
http://openutils.svn.sourceforge.net/openutils/?rev=3955&view=rev
Author: fgiust
Date: 2012-05-05 17:14:37 +0000 (Sat, 05 May 2012)
Log Message:
-----------
remove the mobile module from build
Modified Paths:
--------------
magnoliamodules/trunk/pom.xml
Modified: magnoliamodules/trunk/pom.xml
===================================================================
--- magnoliamodules/trunk/pom.xml 2012-05-04 13:38:43 UTC (rev 3954)
+++ magnoliamodules/trunk/pom.xml 2012-05-05 17:14:37 UTC (rev 3955)
@@ -35,7 +35,7 @@
<module>openutils-mgnlrules</module>
<module>openutils-mgnlcontextmenu</module>
<module>openutils-mgnllms</module>
- <module>openutils-mgnlmobile</module>
+<!-- <module>openutils-mgnlmobile</module> -->
<module>openutils-mgnlmail</module>
<module>magnolia-test-webapp</module>
</modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3954
http://openutils.svn.sourceforge.net/openutils/?rev=3954&view=rev
Author: diego_schivo
Date: 2012-05-04 13:38:43 +0000 (Fri, 04 May 2012)
Log Message:
-----------
CONTROLS-46 Grid control: combo column type showing labels instead of values
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-04-19 14:31:49 UTC (rev 3953)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-04 13:38:43 UTC (rev 3954)
@@ -84,10 +84,29 @@
options.add("lazyRender: true");
options.add("listClass: 'x-combo-list-small'");
- column.put("editor", "new Ed(new "
- + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
- + "({"
- + StringUtils.join(options, ",")
- + "}))");
+ if ("true".equals(String.valueOf(colMap.get("showLabel"))))
+ {
+ column.put(
+ "editor",
+ "(function() { window.gridComboColumnTypeTmp = new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}); return new Ed(gridComboColumnTypeTmp); })()");
+ column.put("renderer", "(function(combo){"
+ + " return function(value){"
+ + " var record = combo.findRecord(combo.valueField, value);"
+ + " return record ? record.get(combo.displayField) : combo.valueNotFoundText;"
+ + " }"
+ + "})(window.gridComboColumnTypeTmp)");
+ }
+ else
+ {
+ column.put("editor", "new Ed(new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}))");
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2012-04-19 14:32:00
|
Revision: 3953
http://openutils.svn.sourceforge.net/openutils/?rev=3953&view=rev
Author: carlocolombo
Date: 2012-04-19 14:31:49 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
lms -> scorm
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js 2012-04-16 14:24:24 UTC (rev 3952)
+++ magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js 2012-04-19 14:31:49 UTC (rev 3953)
@@ -19,7 +19,7 @@
createNew : function(path, dialog) {
mgnlOpenWindow(".magnolia/dialogs/" + dialog + ".html?mgnlPath=" + path
- + "&mgnlNode=mgnlNew&mgnlRepository=lms");// parent.OpenWindow
+ + "&mgnlNode=mgnlNew&mgnlRepository=scorm");// parent.OpenWindow
},
// check if it is a folder
@@ -84,6 +84,4 @@
if (w) w.focus();
}
-
-});
-
+});
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2012-04-16 14:24:34
|
Revision: 3952
http://openutils.svn.sourceforge.net/openutils/?rev=3952&view=rev
Author: carlocolombo
Date: 2012-04-16 14:24:24 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Mapped url starting with /scorm to lms repository (previously lms -> lms)
updated scormPlayerPage to use url2repositoryMapping to retrieve correct repository
update js to open page with mgnlRepository=scorm
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml
magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-04-10 09:45:10 UTC (rev 3951)
+++ magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-04-16 14:24:24 UTC (rev 3952)
@@ -19,10 +19,14 @@
package net.sourceforge.openutils.mgnllms.pages.lms;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
+import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.cms.util.AlertUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import java.text.MessageFormat;
+
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -75,9 +79,10 @@
{
try
{
+ URI2RepositoryMapping mapping = URI2RepositoryManager.getInstance().getMapping(
+ MessageFormat.format("/{0}/{1}", mgnlRepository, mgnlPath));
+ Manifest manifestFromXml = JaxbUtils.getManifest(mgnlPath, mapping.getRepository());
- Manifest manifestFromXml = JaxbUtils.getManifest(mgnlPath, mgnlRepository);
-
JsonConfig jc = new JsonConfig();
manifest = JSONSerializer.toJSON(manifestFromXml, jc).toString();
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml
===================================================================
(Binary files differ)
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js 2012-04-10 09:45:10 UTC (rev 3951)
+++ magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js 2012-04-16 14:24:24 UTC (rev 3952)
@@ -56,7 +56,7 @@
// + "&mgnlRepository=lms" ,800, 600);
// commentami prima del rilascio, usami solo per i test
- var w=window.open(contextPath+"/.magnolia/pages/scormplayer.html?mgnlPath=" + path+ "&mgnlRepository=lms");
+ var w=window.open(contextPath+"/.magnolia/pages/scormplayer.html?mgnlPath=" + path+ "&mgnlRepository=scorm");
if (w) w.focus();
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
