|
From: <fg...@us...> - 2012-12-17 22:47:01
|
Revision: 4155
http://openutils.svn.sourceforge.net/openutils/?rev=4155&view=rev
Author: fgiust
Date: 2012-12-17 22:46:52 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
new project (split from mgnlutils)
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltests/
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnltests/src/
magnoliamodules/trunk/openutils-mgnltests/src/main/
magnoliamodules/trunk/openutils-mgnltests/src/main/assembly/
magnoliamodules/trunk/openutils-mgnltests/src/main/assembly/assembly-bundle.xml
magnoliamodules/trunk/openutils-mgnltests/src/main/bundle/
magnoliamodules/trunk/openutils-mgnltests/src/main/bundle/LICENSE.txt
magnoliamodules/trunk/openutils-mgnltests/src/main/bundle/README.txt
magnoliamodules/trunk/openutils-mgnltests/src/main/etc/
magnoliamodules/trunk/openutils-mgnltests/src/main/etc/header.txt
magnoliamodules/trunk/openutils-mgnltests/src/main/java/
magnoliamodules/trunk/openutils-mgnltests/src/main/resources/
magnoliamodules/trunk/openutils-mgnltests/src/site/
magnoliamodules/trunk/openutils-mgnltests/src/site/site.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/
magnoliamodules/trunk/openutils-mgnltests/src/test/java/
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/
Added: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2012-12-17 22:46:52 UTC (rev 4155)
@@ -0,0 +1,164 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-parent</artifactId>
+ <relativePath>../openutils-parent</relativePath>
+ <version>1.12</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnltests</artifactId>
+ <name>Generic utilities for Magnolia CMS</name>
+ <version>5.0.0-SNAPSHOT</version>
+ <inceptionYear>2009</inceptionYear>
+ <description>A collection of Magnolia utilities and extensions</description>
+ <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.openmindlab.com/browse/MGNLUTILS</url>
+ </issueManagement>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnltests </developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnltests</url>
+ </scm>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.5.0</version>
+ <configuration>
+ <header>src/main/etc/header.txt</header>
+ <includes>
+ <include>src/**/*.java</include>
+ </includes>
+ <properties>
+ <year>${project.inceptionYear}-2011</year>
+ <name>${project.name}</name>
+ <description>${project.description}</description>
+ <url>${project.url}</url>
+ </properties>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-rendering</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>${magnolia.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.0.1</version>
+ <optional>true</optional><!-- this is not in test scope since the module also contains testng support classes -->
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing4web</artifactId>
+ <version>1.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>${magnolia.version}</version>
+ <classifier>tests</classifier>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <properties>
+ <magnolia.version>4.5.6</magnolia.version>
+ </properties>
+</project>
Property changes on: magnoliamodules/trunk/openutils-mgnltests/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnltests/src/main/assembly/assembly-bundle.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/assembly/assembly-bundle.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/assembly/assembly-bundle.xml 2012-12-17 22:46:52 UTC (rev 4155)
@@ -0,0 +1,34 @@
+<assembly>
+ <id>for-magnolia-4.5-bundle</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <filtered>true</filtered>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>crlf</lineEnding>
+ <directory>${basedir}/src/main/bundle</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>/sources/</outputDirectory>
+ <includes>
+ <include>src/**/*</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>net.sourceforge.openutils:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnltests/src/main/bundle/LICENSE.txt
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/bundle/LICENSE.txt (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/bundle/LICENSE.txt 2012-12-17 22:46:52 UTC (rev 4155)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document c...
[truncated message content] |
|
From: <fg...@us...> - 2012-12-17 22:54:46
|
Revision: 4156
http://openutils.svn.sourceforge.net/openutils/?rev=4156&view=rev
Author: fgiust
Date: 2012-12-17 22:54:36 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
move test utils to a dedicated module
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/META-INF/
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/META-INF/magnolia/
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/META-INF/magnolia/mgnltest.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/test-magnolia.properties
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.modules.testmodule.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.server.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/website.letters.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/website.pets.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/indexing_configuration.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/jackrabbit-test-configuration.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-repository/test-repositories.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/test/
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/
magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/crit-repository/
Property Changed:
----------------
magnoliamodules/trunk/openutils-mgnltests/
Property changes on: magnoliamodules/trunk/openutils-mgnltests
___________________________________________________________________
Added: svn:ignore
+ target
Copied: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java (from rev 4140, magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/TestModule.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModule.java 2012-12-17 22:54:36 UTC (rev 4156)
@@ -0,0 +1,73 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnlutils.test;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class TestModule implements ModuleLifecycle
+{
+
+ private String testConfigValue;
+
+ private boolean started = false;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start(ModuleLifecycleContext moduleLifecycleContext)
+ {
+ started = true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop(ModuleLifecycleContext moduleLifecycleContext)
+ {
+ started = false;
+ }
+
+ public void setTestConfigValue(String testConfigValue)
+ {
+ this.testConfigValue = testConfigValue;
+ }
+
+ public String getTestConfigValue()
+ {
+ return testConfigValue;
+ }
+
+ public void setStarted(boolean started)
+ {
+ this.started = started;
+ }
+
+ public boolean isStarted()
+ {
+ return started;
+ }
+
+}
Copied: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java (from rev 4140, magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/TestModuleVersionHandler.java 2012-12-17 22:54:36 UTC (rev 4156)
@@ -0,0 +1,46 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnlutils.test;
+
+import info.magnolia.module.DefaultModuleVersionHandler;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author Luca Boati
+ */
+public class TestModuleVersionHandler extends DefaultModuleVersionHandler
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List<Task> getStartupTasks(InstallContext installContext)
+ {
+ List<Task> tasks = new ArrayList<Task>();
+ return tasks;
+ }
+
+}
Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/META-INF/magnolia/mgnltest.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/META-INF/magnolia/mgnltest.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/META-INF/magnolia/mgnltest.xml 2012-12-17 22:54:36 UTC (rev 4156)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module SYSTEM "module.dtd">
+<module>
+ <name>testmodule</name>
+ <displayName>Magnolia Test</displayName>
+ <description>Magnolia Test Module</description>
+ <class>it.openutils.mgnlutils.test.TestModule</class>
+ <versionHandler>it.openutils.mgnlutils.test.TestModuleVersionHandler</versionHandler>
+ <version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <name>adminInterface</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
+ <name>templating</name>
+ <version>4.5/*</version>
+ </dependency>
+ </dependencies>
+</module>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/META-INF/magnolia/mgnltest.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/test-magnolia.properties
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/test-magnolia.properties (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/test-magnolia.properties 2012-12-17 22:54:36 UTC (rev 4156)
@@ -0,0 +1,37 @@
+magnolia.basedir=target/magnolia-test-data
+magnolia.cache.startdir=${magnolia.basedir}/cache
+magnolia.upload.tmpdir=${magnolia.basedir}/tmp
+magnolia.exchange.history=${magnolia.basedir}/history
+
+magnolia.app.rootdir=.
+
+magnolia.repositories.home=target/test-repositories
+# points to the classpath resources, but will be extracted and the property reset
+
+magnolia.repositories.config=/test-repositories.xml
+magnolia.repositories.jackrabbit.config=/jackrabbit-test-configuration.xml
+
+log4j.config=WEB-INF/config/default/log4j.xml
+magnolia.logs.dir=${magnolia.base}/logs
+
+# The directories in which the bootstrap files are searched
+magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap/common
+
+
+magnolia.bootstrap.authorInstance=true
+magnolia.bootstrap.samples=false
+magnolia.develop=true
+
+magnolia.connection.jcr.userId = admin
+magnolia.connection.jcr.password = admin
+
+magnolia.update.auto=true
+
+####### solo per test #####
+info.magnolia.logging.AuditLoggingManager=info.magnolia.logging.AuditLoggingManager
+info.magnolia.link.LinkTransformerManager=info.magnolia.link.LinkTransformerManager
+#######
+
+info.magnolia.cms.i18n.I18nContentSupport=info.magnolia.cms.i18n.DefaultI18nContentSupport
+
+info.magnolia.cms.core.search.SearchFactory=info.magnolia.cms.core.search.DefaultSearchFactory
Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/test-magnolia.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.modules.testmodule.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.modules.testmodule.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.modules.testmodule.xml 2012-12-17 22:54:36 UTC (rev 4156)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="testmodule" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2027fc36-cba5-4e73-99d2-69a4ad47794c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-09-01T10:08:54.540+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-01T10:09:01.059+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="config">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>741b7432-a67b-4597-b44b-755077a817aa</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="testConfigValue" sv:type="String">
+ <sv:value>test</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-09-01T10:09:13.031+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-01T10:09:58.191+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.modules.testmodule.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.server.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.server.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/config.server.xml 2012-12-17 22:54:36 UTC (rev 4156)
@@ -0,0 +1,12825 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="server" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>afe3b5ce-27ce-4437-bffc-f24d2246560c</sv:value>
+ </sv:property>
+ <sv:property sv:name="admin" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="defaultBaseUrl" sv:type="String">
+ <sv:value>http://localhost:8080/magnolia/</sv:value>
+ </sv:property>
+ <sv:property sv:name="defaultExtension" sv:type="String">
+ <sv:value>html</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-09-14T12:22:19.650+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-14T12:22:19.650+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="filters">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>5f291d19-cb25-45b2-aaf2-96e6687880b2</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-05-02T16:22:29.116+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="context">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>660a98c5-c342-4b0c-9ac0-04c8283a1b5f</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.filters.ContextFilter</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-07-28T23:39:30.812+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2007-04-25T18:34:36.885+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2007-04-25T18:34:42.982+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="blossom">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>36fe8f04-9f0b-431d-b4d8-2c5af65d6335</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.blossom.preexecution.BlossomFilter</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-07-28T23:39:30.812+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2007-04-25T18:34:36.885+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-10-02T18:50:00.347+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="contentType">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6f0724ec-187b-49c0-bfeb-97b61a0a9212</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.filters.ContentTypeFilter</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-07-28T23:39:30.812+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2007-05-02T16:57:01.203+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2007-04-25T18:34:46.584+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="multipartRequest">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>406ad67a-85c9-40da-8064-d3b40637b4e8</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.filters.CosMultipartRequestFilter</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-07-28T23:39:30.812+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2007-05-31T13:53:07.930+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-05T18:09:42.344+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="unicodeNormalization">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1256b1dd-86b0-440c-ba93-627c9e5c4bf6</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.filters.UnicodeNormalizationFilter</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="Boolean">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-07-28T23:39:30.812+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2007-05-31T13:53:07.930+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-05T18:10:54.882+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="login">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:content</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ae86327b-1955-40fc-bf35-23c0c175a6cf</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.security.auth.login.LoginFilter</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-05-11T16:28:32.536+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2007-05-11T16:29:14.837+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="loginHandlers">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>a355aceb-c38a-42bb-8ad7-512068458f63</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-05-11T16:29:30.357+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2007-05-11T16:29:32.874+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="Basic">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>09a09547-08ec-457f-91e0-7c07f4e00f59</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" ...
[truncated message content] |
|
From: <fg...@us...> - 2013-05-19 08:28:36
|
Revision: 4235
http://openutils.svn.sourceforge.net/openutils/?rev=4235&view=rev
Author: fgiust
Date: 2013-05-19 08:28:33 +0000 (Sun, 19 May 2013)
Log Message:
-----------
update parent
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlext/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/SYNC</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlbootstrapsync</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlbootstrapsync</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlbootstrapsync</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlbootstrapsync</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlbootstrapsync</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlbootstrapsync</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/CACHE</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcache</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcache</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcache</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcache</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcache</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcache</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MGNLCAS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcas</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcas</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcas</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcas</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcas</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcas</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,9 +26,9 @@
<url>http://jira.openmindlab.com/browse/MENU</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontextmenu</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontextmenu</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontextmenu</url>
</scm>
<build>
<plugins>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/CONTROLS</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontrols</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlcontrols</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontrols</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontrols</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcontrols</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlcontrols</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
@@ -26,7 +26,7 @@
<scm>
<connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
<developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewvc/openutils/magnoliamodules/trunk/openutils-mgnlcriteria</url>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
<resources>
@@ -129,22 +129,7 @@
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
- <!--
- no cycles
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>${jcr.version}</version>
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -12,9 +12,9 @@
<name>openutils-mgnlext</name>
<version>5.0.0-SNAPSHOT</version>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlext</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlext</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlext</url>
</scm>
<licenses>
<license>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/GROOVY</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlgroovy</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlgroovy</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlgroovy</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlgroovy</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlgroovy</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlgroovy</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/SCORM</url>
</issueManagement>
<scm>
- <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>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-mgnllms</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-mgnllms</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnllms</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmail </developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmail</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmail</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmail </developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmail</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/java/net/sourceforge/openutils/mgnlmail/SimplemailTreeConfiguration.java 2013-05-19 08:28:33 UTC (rev 4235)
@@ -54,7 +54,7 @@
{
super.prepareTree(tree, browseMode, request);
- tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/ico16-mail.png");
+ tree.addIcon(ItemType.CONTENT.getSystemName(), "/.resources/simplemail/icons/ico16-mail.png");
tree.addItemType(ItemType.NT_FOLDER, Tree.ICONDOCROOT + "folder.gif");
tree.setDrawShifter(true); // for folders
}
Deleted: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.paragraphs.simplemail-text.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="simplemail-text" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>76d6f1b3-b133-4072-8015-7b1d76fa5a3a</sv:value>
- </sv:property>
- <sv:property sv:name="description" sv:type="String">
- <sv:value>Test paragraph</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/simplemail/simple-paragraph.ftl</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Simplemail paragraph</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>freemarker</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-06-19T23:36:58.317+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="simplemail-simple" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>2d0e29fd-dadc-4d20-a1bc-d5649dc3503b</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>it.openutils.mgnlutils.templating.ExtendedTemplate</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="repositories" sv:type="String">
- <sv:value>email</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/simplemail/simple.ftl</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Simple mail template</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>freemarker</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-06-14T17:42:07.883+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/email.simple.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -26,10 +26,10 @@
<sv:value>2011-06-14T17:43:11.781+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-06-14T17:43:17.233+02:00</sv:value>
+ <sv:value>2013-05-01T22:23:03.069+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>simplemail-simple</sv:value>
+ <sv:value>simplemail:pages/simplemail-simple</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2013-05-19 08:28:33 UTC (rev 4235)
@@ -1,8 +1,9 @@
-[#assign cms=JspTaglibs["cms-taglib"]] [@cms.mainBar dialog="simplemail-simple" /]
+[#assign cms=JspTaglibs["http://magnolia-cms.com/taglib/templating-components/cms"]]
<html>
<head>
<title>${content.title!}</title>
+[@cms.init /]
</head>
<body>
<table cellpadding="0" cellspacing="0" border="0" align="center" width="100%" bgcolor="#FFF">
@@ -26,13 +27,7 @@
</td>
<td width="620" valign="top" align="left" bgcolor="#ffffff" style="font-family:Georgia, serif;background:#fff">
<div style="padding: 20px;">
-[@cms.contentNodeIterator contentNodeCollectionName="main"]
- [@cms.editBar /]
- [@cms.includeTemplate /]
-[/@cms.contentNodeIterator]
-[@cms.newBar contentNodeCollectionName="main" newLabel="New Content" paragraph="simplemail-text" /]
-
-
+[@cms.area name="main" /]
</div>
</td>
<td width="16" bgcolor="#ffffff" style="font-family:Georgia, serif;background:#fff">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmedia</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmedia</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmessages</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmessages</url>
</scm>
<build>
<resources>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:28:09 UTC (rev 4234)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:28:33 UTC (rev 4235)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.13</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,9 +26,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamo...
[truncated message content] |
|
From: <fg...@us...> - 2013-05-19 12:34:14
|
Revision: 4239
http://openutils.svn.sourceforge.net/openutils/?rev=4239&view=rev
Author: fgiust
Date: 2013-05-19 12:34:11 +0000 (Sun, 19 May 2013)
Log Message:
-----------
upgrade to new criteria release
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -136,7 +136,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -156,12 +156,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmessages</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -177,7 +177,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
===================================================================
(Binary files differ)
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/META-INF/magnolia/simplemail.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -8,10 +8,18 @@
<version>${project.version}</version>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
</dependency>
<dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
+ <dependency>
<name>mail</name>
<version>4.5/*</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -170,7 +170,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -24,11 +24,18 @@
</components>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
- <optional>true</optional>
</dependency>
<dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
+ <dependency>
<name>standard-templating-kit</name>
<version>1.2/*</version>
<optional>true</optional>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -96,7 +96,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -29,9 +29,17 @@
</components>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
</dependency>
+ <dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
</dependencies>
<repositories>
<repository>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -76,7 +76,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/resources/META-INF/magnolia/repoutils.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -7,8 +7,16 @@
<version>${project.version}</version>
<dependencies>
<dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
<name>adminInterface</name>
<version>4.5/*</version>
</dependency>
+ <dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
</dependencies>
</module>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -118,7 +118,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml 2013-05-19 08:34:18 UTC (rev 4238)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml 2013-05-19 12:34:11 UTC (rev 4239)
@@ -5,4 +5,14 @@
<displayName>Magnolia utils module</displayName>
<description>Useful EL functions and generic Magnolia utilities</description>
<version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.5/*</version>
+ </dependency>
+ <dependency>
+ <name>criteria</name>
+ <version>5.0.1/*</version>
+ </dependency>
+ </dependencies>
</module>
\ 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...> - 2013-05-20 09:43:20
|
Revision: 4248
http://openutils.svn.sourceforge.net/openutils/?rev=4248&view=rev
Author: fgiust
Date: 2013-05-20 09:43:15 +0000 (Mon, 20 May 2013)
Log Message:
-----------
templating magic, no more need for wrappers!
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/web.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
Added Paths:
-----------
magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -186,12 +186,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.1-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltagcloud</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "http://jackrabbit.apache.org/dtd/indexing-configuration-1.0.dtd">
+<configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0">
+ <analyzers>
+ <analyzer class="org.apache.lucene.analysis.KeywordAnalyzer">
+ <property>tags</property>
+ </analyzer>
+ </analyzers>
+</configuration>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samplesCriteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>a09f5032-bc54-4f8b-b011-111f922119f6</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/template_criteria/criteria.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Sample Criteria</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-05-19T19:46:43.497+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="samplesMagnoliaUtils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>da5823f7-dac4-4a6f-a769-a09e95601f44</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>info.magnolia.module.samples.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="renderType" sv:type="String">
+ <sv:value>jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="templateScript" sv:type="String">
+ <sv:value>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>Sample Magnoliautils</sv:value>
+ </sv:property>
+ <sv:property sv:name="titleSize" sv:type="String">
+ <sv:value>1</sv:value>
+ </sv:property>
+ <sv:property sv:name="visible" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-05-19T19:46:42.181+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parameters">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6dba0719-7b5c-4991-9eeb-4193a0b8b6db</sv:value>
+ </sv:property>
+ <sv:property sv:name="dummy" sv:type="String">
+ <sv:value>This parameter has been set in the template definition</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-05-19T19:46:04.237+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesCriteria.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesCriteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>aaf3511c-2084-4f54-9e5a-ba0fca2a58f0</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/template_criteria/criteria.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Sample Criteria</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-08-25T16:46:38.062+02:00</sv:value>
- </sv:property>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.samplesMagnoliaUtils.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesMagnoliaUtils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>1e213413-c125-4958-b8c5-350b88cbb39c</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
- </sv:property>
- <sv:property sv:name="i18nBasename" sv:type="String">
- <sv:value>info.magnolia.module.samples.messages</sv:value>
- </sv:property>
- <sv:property sv:name="templatePath" sv:type="String">
- <sv:value>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Sample Magnoliautils</sv:value>
- </sv:property>
- <sv:property sv:name="titleSize" sv:type="String">
- <sv:value>1</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>jsp</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T10:16:28.038+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="parameters">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>c971ec11-95dc-4547-9fad-ae0275ea3856</sv:value>
- </sv:property>
- <sv:property sv:name="dummy" sv:type="String">
- <sv:value>This parameter has been set in the template definition</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-15T12:12:06.690+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,7 +3,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -29,17 +29,17 @@
<sv:value>2010-08-25T16:28:31.718+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-08-25T16:48:30.468+02:00</sv:value>
+ <sv:value>2013-05-19T19:48:26.588+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesCriteria</sv:value>
+ <sv:value>samples:pages/samplesCriteria</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="pets">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -65,17 +65,17 @@
<sv:value>2010-05-13T11:04:10.640+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-05-13T11:04:22.468+02:00</sv:value>
+ <sv:value>2013-05-19T19:48:36.682+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>plaintext</sv:value>
+ <sv:value>standard-templating-kit:pages/stkArticle</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="cats">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -111,7 +111,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -154,7 +154,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -197,7 +197,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -240,7 +240,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -284,7 +284,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -320,7 +320,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -363,7 +363,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -406,7 +406,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -449,7 +449,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -493,7 +493,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -529,7 +529,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -573,7 +573,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -609,7 +609,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -653,7 +653,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -689,7 +689,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -732,7 +732,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -776,7 +776,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -812,7 +812,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-05-20 09:39:55 UTC (rev 4247)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-05-20 09:43:15 UTC (rev 4248)
@@ -3,12 +3,15 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>9854e9ac-0cde-4a3a-b019-e95a8634207c</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:v...
[truncated message content] |
|
From: <luc...@us...> - 2013-08-22 11:07:06
|
Revision: 4282
http://openutils.svn.sourceforge.net/openutils/?rev=4282&view=rev
Author: lucaboati
Date: 2013-08-22 11:06:56 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
license format
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapEnableRoot.java
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapExportRoot.java
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManagerMBean.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCachedItem.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/ResetableBufferedFileOutputStream.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/SimpleCacheHeaders.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filters/CacheFilter.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/LockableCacheContent.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/NoArgsSynchedOp.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/SynchCacheContentOperations.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/lock/SynchedOp.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CacheHeaders.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CacheManager.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CacheResponseWrapper.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/CachedItem.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/managers/ResetableBufferedOutputStream.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/module/SimplecacheModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenu.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuItem.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultGetGlobalEntriesNodeStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/DefaultPersistenceStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GetGlobalEntriesNodeStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/GridPersistenceStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/PersistenceStrategy.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/Scope.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogGlobalTab.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/module/ContextMenuModule.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
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/DateGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnTypeManager.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/TextGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectList.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListAndRadioGroup.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogDependentSelectListSaveHandler.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogRadioGroup.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/I18nDialogTab.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/I18nTabNewLocaleDialog.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/lifecycle/ControlsModule.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleButtonSetOptionsProvider.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleRadioOptionsProvider2.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/samples/SampleSelectOptionsProvider.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/setup/ControlsModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/lifecycle/GroovyShellModule.java
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellScript.java
magnoliamodules/trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/setup/GroovyShellModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/Option.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterEmpty.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterInMultivalue.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterMultiplevalue.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSpecFieldMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcImageProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileDocument.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.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/dialog/LayerDialogMVC.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/pages/MediaAdvancedSearchFormPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/SortMode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BaseImageResolutionProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInAndFillWithBandsImageResolutionProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImagePostProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ImageResolutionProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/LogSizePostProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeCropCenteredImageResolutionProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/ResizeNoCropImageResolutionProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/RoundedCornersProcessor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/AddExtensionToType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/ExternalVideoSupport.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/IcoUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/LockUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaMetadataFormatUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/RtmpMedatadaFetcher.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/VideoMedataUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ZeroSizeImageException.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/virtualurimapping/MediaThumbnailVirtualUriMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporter.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/ZipImporterException.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/AbstractPlaylistLink.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/DefaultPlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/MessageFormatPlaylistLink.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistEntryBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistLink.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistsBrowserPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageProcessorsManagerMock.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/MessagesServlet.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/EmptyResourceBundle.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/MultiBundleMgnlMessagesManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/OpenutilsMgnlMessagesManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesMo...
[truncated message content] |
|
From: <fg...@us...> - 2013-09-12 08:20:07
|
Revision: 4284
http://openutils.svn.sourceforge.net/openutils/?rev=4284&view=rev
Author: fgiust
Date: 2013-09-12 08:20:02 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
cleanup some deprecations
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
magnoliamodules/trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
magnoliamodules/trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolver.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/NodeElResolverUtils.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/save/SafeMultiValueSaveHandler.java
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -1,11 +1,11 @@
package info.magnolia.module.development;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.SetPropertyTask;
import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.NodeSortTask;
import java.util.ArrayList;
@@ -41,7 +41,7 @@
}
// I hate spending time in looking through the unsorted list of modules...
- tasks.add(new NodeSortTask(ContentRepository.CONFIG, "/modules"));
+ tasks.add(new NodeSortTask(RepositoryConstants.CONFIG, "/modules"));
return tasks;
}
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag 2013-09-12 08:20:02 UTC (rev 4284)
@@ -45,14 +45,14 @@
<td>state.originalURI</td>
<td>${state.originalURI}</td>
</tr>
-<!-- <tr>
+ <tr>
<td>state.mainContent</td>
<td>${state.mainContent} ${state.mainContent.class}</td>
- </tr>-->
-<!-- <tr>
+ </tr>
+ <tr>
<td>state.mainContent.JCRNode</td>
<td>${state.mainContent.JCRNode} ${state.mainContent.JCRNode.class}</td>
- </tr>-->
+ </tr>
<tr>
<td>state.mainContent.JCRNode.identifier</td>
<td>${state.mainContent.JCRNode.identifier}</td>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,13 +19,13 @@
package it.openutils.mgnlbootstrapsync.lifecycle;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnlbootstrapsync.listener.AbstractBootstrapSyncListener;
import it.openutils.mgnlbootstrapsync.listener.BootstrapSyncListener;
import it.openutils.mgnlbootstrapsync.watch.BootstrapSyncRepositoryWatch;
@@ -95,15 +95,15 @@
{
// set default nodeType
nodeType = ItemType.CONTENT.getSystemName();
- if (ContentRepository.USERS.equalsIgnoreCase(repository))
+ if (RepositoryConstants.USERS.equalsIgnoreCase(repository))
{
nodeType = ItemType.USER.getSystemName();
}
- else if (ContentRepository.USER_ROLES.equalsIgnoreCase(repository))
+ else if (RepositoryConstants.USER_ROLES.equalsIgnoreCase(repository))
{
nodeType = ItemType.ROLE.getSystemName();
}
- else if (ContentRepository.USER_GROUPS.equalsIgnoreCase(repository))
+ else if (RepositoryConstants.USER_GROUPS.equalsIgnoreCase(repository))
{
nodeType = ItemType.GROUP.getSystemName();
}
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,10 +19,10 @@
package net.sourceforge.openutils.mgnlcontextmenu.setup;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Task;
+import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.CreateMissingPropertyTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -66,19 +66,19 @@
}
tasks.add(new CreateMissingPropertyTask(
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
"/modules/contextmenu/config/getGlobalEntriesNodeStrategy",
"class",
DefaultGetGlobalEntriesNodeStrategy.class.getName()));
tasks.add(new CreateMissingPropertyTask(
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
"/modules/contextmenu/config/getGlobalEntriesNodeStrategy",
"ancestorLevel",
Long.valueOf(1)));
tasks.add(new CreateMissingPropertyTask(
- ContentRepository.CONFIG,
+ RepositoryConstants.CONFIG,
"/modules/contextmenu/config/persistenceStrategy",
"class",
DefaultPersistenceStrategy.class.getName()));
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogButtonSet.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,12 +19,12 @@
package net.sourceforge.openutils.mgnlcontrols.dialog;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.gui.control.Button;
import info.magnolia.cms.gui.control.ControlImpl;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Iterator;
@@ -226,7 +226,7 @@
}
else
{
- String repository = control.getConfigValue("repository", ContentRepository.WEBSITE);
+ String repository = control.getConfigValue("repository", RepositoryConstants.WEBSITE);
String path = control.getConfigValue("path");
if (StringUtils.isNotEmpty(path))
{
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -25,7 +25,6 @@
import java.util.NoSuchElementException;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.RowIterator;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -22,7 +22,6 @@
import info.magnolia.jcr.RuntimeRepositoryException;
import javax.jcr.Item;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.query.InvalidQueryException;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -22,7 +22,6 @@
import info.magnolia.cms.security.AccessDeniedException;
import javax.jcr.Item;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -21,9 +21,7 @@
import java.util.Iterator;
-import javax.jcr.Node;
-
/**
* The result of a jcr query. You can access to the actual result items using getItems(). This bean will also give you
* information about the total number of available items, the current page number, the total number of pages.
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitQueryParser.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -39,17 +39,17 @@
import java.io.IOException;
import java.io.StringReader;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
+import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.util.Version;
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -37,7 +37,6 @@
import javax.jcr.Node;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -40,7 +40,6 @@
import javax.jcr.Session;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -33,7 +33,6 @@
import javax.jcr.Node;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
Modified: 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/samples/listeners/StudentLevelListener.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -35,6 +35,7 @@
import info.magnolia.cms.util.UrlPattern;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.MgnlContext.VoidOp;
+import info.magnolia.repository.RepositoryConstants;
import java.security.Principal;
import java.util.ArrayList;
@@ -142,7 +143,7 @@
Content node = MgnlContext
.getSystemContext()
- .getHierarchyManager(ContentRepository.USER_ROLES)
+ .getHierarchyManager(RepositoryConstants.USER_ROLES)
.getContent(role);
Iterator it = node.getChildren(ItemType.CONTENTNODE.getSystemName(), "acl*").iterator();
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/SetupModuleRepositoriesWithoutSubscriberTask.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.security.Permission;
import info.magnolia.cms.security.Role;
import info.magnolia.cms.security.RoleManager;
@@ -30,6 +29,8 @@
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.module.model.ModuleDefinition;
import info.magnolia.module.model.RepositoryDefinition;
+import info.magnolia.objectfactory.Components;
+import info.magnolia.repository.RepositoryManager;
import java.util.Collection;
import java.util.List;
@@ -65,7 +66,7 @@
for (final String workspace : workspaces)
{
// bootstrap the workspace if empty
- if (!ContentRepository.checkIfInitialized(workspace))
+ if (!Components.getComponent(RepositoryManager.class).checkIfInitialized(workspace))
{
final String[] bootstrapDirs = Bootstrapper.getBootstrapDirs();
Bootstrapper.bootstrapRepository(bootstrapDirs, workspace, new Bootstrapper.BootstrapFilter()
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -20,7 +20,6 @@
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
@@ -32,20 +31,17 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Map.Entry;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -57,7 +53,6 @@
import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils;
import net.sourceforge.openutils.mgnlmedia.playlist.utils.PlaylistIterateUtils.MediaNodeAndEntryPath;
-import org.apache.commons.lang.LocaleUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -20,12 +20,8 @@
package net.sourceforge.openutils.mgnlmedia.playlist.utils;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
-import info.magnolia.jcr.predicate.AbstractPredicate;
-import info.magnolia.jcr.util.ContentMap;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
@@ -51,7 +47,6 @@
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmessages.configuration;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
@@ -29,6 +28,7 @@
import info.magnolia.cms.util.FactoryUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Collections;
@@ -122,7 +122,7 @@
@SuppressWarnings("unchecked")
public static List<String> getBaseNames()
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(RepositoryConstants.CONFIG);
try
{
Content basenamesNode = mgr.getContent("/modules/messages/basenames");
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-09-12 08:05:01 UTC (rev 4283)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-09-12 08:20:02 UTC (rev 4284)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmessages.pages;
-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;
@@ -31,6 +30,7 @@
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
+import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
import java.util.Collection;
@@ -79,7 +79,7 @@
public String show()
{
dialogsRoot = new ArrayList<String>();
- QueryManager qm = MgnlContext.getQueryManager(ContentRepository.CONFIG);
+ QueryManager qm = MgnlContext.getQueryManager(RepositoryConstants.CONFIG);
Query q;
try
{
@@ -115,7 +115,7 @@
*/
public String extract()
{
- HierarchyManager hmConfig = MgnlContext.getHierarchyManager(ContentRepository.CONFIG);
+ HierarchyManager hmConfig = MgnlContext.getHierarchyManager(RepositoryConstants.CONFIG);
QueryManager qm = hmConfig.getQueryManager();
HierarchyManager hm = MgnlContext.getHierarchyManager(MessagesModuleLifecycle.REPO);
...
[truncated message content] |
|
From: <fg...@us...> - 2013-09-12 20:50:53
|
Revision: 4295
http://openutils.svn.sourceforge.net/openutils/?rev=4295&view=rev
Author: fgiust
Date: 2013-09-12 20:50:49 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-12 20:50:49 UTC (rev 4295)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -68,6 +69,16 @@
</build>
<dependencies>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlutils</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
<version>${magnolia.version}</version>
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,23 +19,27 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.jcr.query.InvalidQueryException;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,20 +82,27 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- QueryManager configQueryManager = installContext
- .getHierarchyManager(RepositoryConstants.CONFIG)
- .getQueryManager();
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.CONFIG)
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENTNODE))
+ .addOrder(Order.desc("@jcr:score"));
- Collection<Content> templates = configQueryManager
- .createQuery("//modules/*/" + templateOrParagraph + "s/*", Query.XPATH)
- .execute()
- .getContent("mgnl:contentNode");
+ if (StringUtils.equals(templateOrParagraph, "template"))
+ {
+ criteria.setBasePath("//modules/*/templates/pages/*");
+ }
+ else
+ {
+ criteria.setBasePath("//modules/*/templates/components/*");
+ }
+ AdvancedResult result = criteria.execute();
+
List<String> templ = new ArrayList<String>();
- Iterator<Content> availableTemplates = templates.iterator();
- while (availableTemplates.hasNext())
+
+ for (AdvancedResultItem template : result.getItems())
{
- Content template = availableTemplates.next();
templ.add(template.getName());
}
@@ -109,47 +120,29 @@
private void checkInvalidPages(InstallContext installContext, List<String> templates) throws RepositoryException,
InvalidQueryException
{
- Session hm = installContext.getJCRSession(RepositoryConstants.WEBSITE);
- QueryManager qm = hm.getQueryManager();
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .add(Restrictions.eq("@jcr:primaryType", nodetype))
+ .add(Restrictions.not(Restrictions.in("MetaData/mgnl:template", templates)))
+ .addOrder(Order.desc("@jcr:score"));
- StringBuilder query = new StringBuilder("//*[jcr:primaryType='"
- + this.nodetype
- + "' and MetaData/mgnl:template and not(");
+ log.debug("Running query: {}", criteria.toXpathExpression());
- Iterator<String> nameIterator = templates.iterator();
- while (nameIterator.hasNext())
- {
- String template = nameIterator.next();
+ AdvancedResult result = criteria.execute();
- query.append("MetaData/mgnl:template='");
- query.append(template);
- query.append("'");
- if (nameIterator.hasNext())
- {
- query.append(" or ");
- }
- }
-
- query.append(")]");
-
- String queryAAsString = query.toString();
-
- log.debug("Running query: {}", queryAAsString);
-
- Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent(this.nodetype);
-
int count = 0;
StringBuilder sb = new StringBuilder();
- for (Content page : nodes)
+ for (Node page : result.getItems())
{
- String template = page.getMetaData().getTemplate();
+ String template = MetaDataUtil.getTemplate(page);
if (StringUtils.isNotEmpty(template))
{
count++;
- sb.append(page.getHandle());
+ sb.append(page.getPath());
sb.append(" ");
sb.append(template);
sb.append("\n");
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,17 +19,13 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import java.util.Collection;
-
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -70,11 +66,11 @@
protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
{
Session hm = ctx.getJCRSession(RepositoryConstants.USER_ROLES);
- final Node parentNode = hm.getNode("/");
+ final Node parentNode = hm.getRootNode();
- final Collection<Content> childNodes = ContentUtil.collectAllChildren(parentNode, ItemType.ROLE);
+ Iterable<Node> childNodes = NodeUtil.getNodes(parentNode, MgnlNodeType.ROLE);
- for (Content content : childNodes)
+ for (Node content : childNodes)
{
operateOnChildNode(content, ctx);
}
@@ -85,19 +81,19 @@
* @param ctx Context
* @throws RepositoryException for any exception wile operating on the repository
*/
- protected void operateOnChildNode(Content node, InstallContext ctx) throws RepositoryException
+ protected void operateOnChildNode(Node node, InstallContext ctx) throws RepositoryException
{
String aclpath = "acl_" + repository;
- if (!node.hasContent(aclpath))
+ if (!node.hasNode(aclpath))
{
log.info("adding permissions on {} to role {}", repository, node.getName());
- Content aclnode = node.createContent(aclpath, MgnlNodeType.NT_CONTENTNODE);
- Content permNode = aclnode.createContent("0", MgnlNodeType.NT_CONTENTNODE);
- permNode.createNodeData("path", "/*");
- permNode.createNodeData("permissions", new Long(permissions));
+ Node aclnode = node.addNode(aclpath, MgnlNodeType.NT_CONTENTNODE);
+ Node permNode = aclnode.addNode("0", MgnlNodeType.NT_CONTENTNODE);
+ permNode.setProperty("path", "/*");
+ permNode.setProperty("permissions", permissions);
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -72,12 +72,12 @@
* {@inheritDoc}
*/
@Override
- protected boolean skipResource(String name)
+ protected boolean skipResource(InstallContext installContext, String name) throws RepositoryException
{
// export the current node in the repository to a temporary file; compare it with the new bootstrap; only if the
// files are different import the new file (the previous node gets automatically deleted), else skip
// it.
- boolean unchanged = bootstrapResourceEqualsExisting(name);
+ boolean unchanged = bootstrapResourceEqualsExisting(installContext, name);
if (unchanged)
{
log.debug("Skipping file {}", name);
@@ -110,7 +110,7 @@
for (Node childNode : NodeUtil.getNodes(node, MgnlNodeType.NT_CONTENTNODE))
{
- String fileName = childNode.getHierarchyManager().getName()
+ String fileName = childNode.getSession().getWorkspace().getName()
+ childNode.getPath().replace("/", ".")
+ ".xml";
String resourceToBootstrap = "/mgnl-bootstrap/" + modulename + "/" + fileName;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -69,22 +69,6 @@
includedRepositories.add("config");
}
- @Deprecated
- public ModuleConfigBootstrapTask(String modulename, List<String> excludeRepositories)
- {
- super("Bootstrap", "Bootstraps module configuration for " + modulename + " (will not overwrite website!).");
- this.modulename = modulename;
-
- log
- .warn("\n\n****************************\n"
- + "ModuleConfigBootstrapTask has changed in openutils-mgnltasks 4.1\n"
- + "By default only the config repository is bootstrapped, and you need to specificy *additional* repositories only if needed."
- + "The constructor with List<String> (excluded repositories) is now deprecated, you can use the default one or the one with the\n"
- + "Set<String> incleded repositories parameter\n"
- + "****************************\n");
-
- }
-
public ModuleConfigBootstrapTask(String modulename, Set<String> includedRepositories)
{
super("Bootstrap", "Bootstraps module configuration for "
@@ -127,7 +111,7 @@
* {@inheritDoc}
*/
@Override
- public void execute(final InstallContext installContext) throws TaskExecutionException
+ public void execute(InstallContext installContext) throws TaskExecutionException
{
try
{
@@ -144,7 +128,7 @@
List<String> filteredResources = new ArrayList<String>();
for (String name : resourcesToBootstrap)
{
- if (!skipResource(name))
+ if (!skipResource(installContext, name))
{
filteredResources.add(name);
}
@@ -169,7 +153,7 @@
* @param name
* @return
*/
- protected boolean skipResource(String name)
+ protected boolean skipResource(InstallContext installContext, String name) throws RepositoryException
{
return false;
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,20 +19,22 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import java.util.Collection;
-
import javax.jcr.RepositoryException;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,31 +76,27 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.WEBSITE);
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_COMPONENT))
+ .add(Restrictions.eq("MetaData/mgnl:template", actualTemplate))
+ .addOrder(Order.desc("@jcr:score"));
- QueryManager qm = hm.getQueryManager();
+ log.debug("Running query: {}", criteria.toXpathExpression());
- StringBuilder query = new StringBuilder("//*[MetaData/mgnl:template ='");
- query.append(actualTemplate);
- query.append("']");
+ AdvancedResult result = criteria.execute();
- String queryAAsString = query.toString();
-
- log.debug("Running query: {}", queryAAsString);
-
- Collection<Content> nodes = qm
- .createQuery(queryAAsString, Query.XPATH)
- .execute()
- .getContent(MgnlNodeType.NT_CONTENTNODE.getSystemName());
-
- for (Content page : nodes)
+ for (AdvancedResultItem page : result.getItems())
{
- log.warn(
- "Replacing template " + page.getMetaData().getTemplate() + " with {} in {}",
+ log.warn("Replacing template {} with {} in {}", new Object[]{
+ MetaDataUtil.getTemplate(page),
newTemplate,
- page.getHandle());
- page.getMetaData().setTemplate(newTemplate);
+ page.getHandle() });
+
+ MetaDataUtil.getMetaData(page).setTemplate(newTemplate);
}
+
}
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,19 +19,22 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import java.util.Collection;
-
import javax.jcr.RepositoryException;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,28 +76,25 @@
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(RepositoryConstants.WEBSITE);
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE))
+ .add(Restrictions.not(Restrictions.eq("MetaData/mgnl:template", actualTemplate)))
+ .addOrder(Order.desc("@jcr:score"));
- QueryManager qm = hm.getQueryManager();
+ log.debug("Running query: {}", criteria.toXpathExpression());
- StringBuilder query = new StringBuilder("//*[MetaData/mgnl:template ='");
- query.append(actualTemplate);
- query.append("']");
+ AdvancedResult result = criteria.execute();
- String queryAAsString = query.toString();
-
- log.debug("Running query: {}", queryAAsString);
-
- Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent();
-
- for (Content page : nodes)
+ for (AdvancedResultItem page : result.getItems())
{
- log.warn(
- "Replacing template " + page.getMetaData().getTemplate() + " with {} in {}",
+ log.warn("Replacing template {} with {} in {}", new Object[]{
+ MetaDataUtil.getTemplate(page),
newTemplate,
- page.getHandle());
- page.getMetaData().setTemplate(newTemplate);
+ page.getHandle() });
+
+ MetaDataUtil.getMetaData(page).setTemplate(newTemplate);
}
}
-
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,7 +19,6 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.Path;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractTask;
@@ -51,7 +50,6 @@
*/
public void execute(final InstallContext ctx) throws TaskExecutionException
{
- final HierarchyManager hm = ctx.getConfigHierarchyManager();
final MD5CheckingFileExtractor extractor = new MD5CheckingFileExtractor(new FileExtractionLogger()
{
@@ -59,7 +57,7 @@
{
ctx.warn(message);
}
- }, hm);
+ }, ctx.getConfigHierarchyManager());
try
{
extractor.extractFiles(new FileExtractor.Transformer()
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,9 +19,7 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
@@ -31,7 +29,9 @@
import java.util.Comparator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
/**
@@ -67,24 +67,20 @@
@Override
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- Content parent = installContext.getHierarchyManager(repository).getContent(parentNode);
+ Session session = installContext.getJCRSession(repository);
- List<Content> children = (List<Content>) ContentUtil.getAllChildren(parent);
+ Node parent = session.getNode(parentNode);
+ List<Node> children = NodeUtil.asList(NodeUtil.getNodes(parent, NodeUtil.EXCLUDE_META_DATA_FILTER));
- if (children.isEmpty())
- {
- children = (List<Content>) parent.getChildren(MgnlNodeType.NT_CONTENTNODE);
- }
-
final List<String> orderedList = Arrays.asList(nodesOrder);
- Collections.sort(children, new Comparator<Content>()
+ Collections.sort(children, new Comparator<Node>()
{
- public int compare(Content o1, Content o2)
+ public int compare(Node o1, Node o2)
{
- Integer index1 = orderedList.indexOf(o1.getName());
- Integer index2 = orderedList.indexOf(o2.getName());
+ Integer index1 = orderedList.indexOf(NodeUtil.getName(o1));
+ Integer index2 = orderedList.indexOf(NodeUtil.getName(o2));
if (index1 < 0)
{
index1 = Integer.MAX_VALUE;
@@ -98,9 +94,9 @@
}
});
- Content previous = null;
+ Node previous = null;
- for (Content content : children)
+ for (Node content : children)
{
if (previous != null)
{
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -19,12 +19,12 @@
package it.openutils.mgnltasks;
-import info.magnolia.cms.core.SystemProperty;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Delta;
import info.magnolia.module.delta.DeltaBuilder;
import info.magnolia.module.model.Version;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.util.ArrayList;
import java.util.HashSet;
@@ -73,27 +73,6 @@
}
/**
- * Add a repository to bootstrap exclusion list
- * @param repository repository to exclude from bootstrap
- */
- @Deprecated
- public void addExcludeRepositoryFromBootstrap(String repository)
- {
- if (!includedRepositoriesInBootstrap.contains(repository))
- {
- log
- .warn(
- "The behaviour of SimpleModuleVersionHandler has changed in order to bootstrap only the config repository by default.\n"
- + "You should not specificy anymore excluded repository, and you can use addIncludedRepositoryInBootstrap to add more.",
- new Exception("(This exception has been added to highlight the importance of this warning)"));
- }
- else
- {
- includedRepositoriesInBootstrap.remove(repository);
- }
- }
-
- /**
* Add a repository to bootstrap *inclusion* list
* @param repository repository to include in bootstrap
*/
@@ -120,10 +99,10 @@
.add(new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-nooverwrite"));
// only for development, add the (module)-dev bootstrap directory
- if (SystemProperty.getBooleanProperty("magnolia.develop"))
+ if (MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop"))
{
- if (StringUtils.isEmpty(SystemProperty.getProperty("magnolia.bootstrapdev"))
- || StringUtils.contains(SystemProperty.getProperty("magnolia.bootstrapdev"), ctx
+ if (StringUtils.isEmpty(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"))
+ || StringUtils.contains(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"), ctx
.getCurrentModuleDefinition()
.getName()))
{
@@ -143,7 +122,7 @@
List<Delta> deltas = new ArrayList<Delta>();
- if (SystemProperty.getBooleanProperty(modulename + ".update.disabled"))
+ if (MgnlUtilsDeprecatedAdapters.getBooleanProperty(modulename + ".update.disabled"))
{
return deltas;
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2013-09-12 16:08:35 UTC (rev 4294)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2013-09-12 20:50:49 UTC (rev 4295)
@@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
/**
* Copyright Openmind http://www.openmindonline.it
*
@@ -37,15 +36,14 @@
...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-13 10:26:55
|
Revision: 4298
http://openutils.svn.sourceforge.net/openutils/?rev=4298&view=rev
Author: lucaboati
Date: 2013-09-13 10:26:51 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
templatePath to templateScript
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html
Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html 2013-09-13 09:56:25 UTC (rev 4297)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/it/openutils/magnoliastripes/pages/StripesConfigurationPage.html 2013-09-13 10:26:51 UTC (rev 4298)
@@ -58,16 +58,15 @@
${paragraph.dialog}
</a>
</td>
- <td>${paragraph.templatePath}</td>
+ <td>${paragraph.templateScript}</td>
<td>${this.messages.get(paragraph.title)}</td>
<td>${this.messages.get(paragraph.description)}</td>
[#else]
<th align="left" scope="row">${paragraph.name}</th>
<td>${paragraph.dialog}</td>
- <td>${paragraph.templatePath}</td>
- <!-- <td>${paragraph.type}</td>-->
- <td></td>
- <td></td>
+ <td>${paragraph.templateScript}</td>
+ <td><!-- --></td>
+ <td><!-- --></td>
[/#if]
</tr>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html 2013-09-13 09:56:25 UTC (rev 4297)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/it/openutils/mgnlstruts11/pages/StrutsConfigurationPage.html 2013-09-13 10:26:51 UTC (rev 4298)
@@ -51,13 +51,13 @@
<a href="javascript:MgnlAdminCentral.showTree('config','${this.getDialogPath(paragraph.name)}')" >(D)</a>
</th>
- <td>${paragraph.templatePath}</td>
+ <td>${paragraph.templateScript}</td>
<td>${paragraph.strutsType}</td>
<td>${this.messages.get(paragraph.title)}</td>
<td>${this.messages.get(paragraph.description)}</td>
[#else]
<th align="left" scope="row">${paragraph.name}</th>
- <td>${paragraph.templatePath}</td>
+ <td>${paragraph.templateScript}</td>
<td>${paragraph.strutsType}</td>
<td> </td>
<td> </td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-13 16:52:34
|
Revision: 4302
http://openutils.svn.sourceforge.net/openutils/?rev=4302&view=rev
Author: lucaboati
Date: 2013-09-13 16:52:30 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
NodeUtilsExt moved on MgnlUtils
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnlutils/
Added: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-09-13 16:52:30 UTC (rev 4302)
@@ -0,0 +1,123 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnlutils.api;
+
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.PropertyUtil;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id: NodeUtilsExt.java 4292 2013-09-12 15:54:10Z fgiust $
+ */
+public class NodeUtilsExt
+{
+
+ public static boolean exists(Session session, String absolutepath)
+ {
+ try
+ {
+ return session.getRootNode().hasNode(StringUtils.stripStart(absolutepath, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ public static Node getNodeIfExists(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ return session.getNode(absolutepath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ return null;
+ }
+
+ public static boolean deleteIfExisting(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ session.getNode(absolutepath).remove();
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean setPropertyIfDifferent(Node node, String propertyname, Object propertyvalue)
+ {
+ return setPropertyIfDifferentFromValue(node, propertyname, propertyvalue, propertyvalue);
+ }
+
+ public static boolean setPropertyIfDifferentFromValue(Node node, String propertyname, Object propertyvalue,
+ Object oldvalue)
+ {
+ try
+ {
+ if (!node.hasProperty(propertyname)
+ || oldvalue == null
+ || !StringUtils.equals(node.getProperty(propertyname).getString(), oldvalue.toString()))
+ {
+ PropertyUtil.setProperty(node, propertyname, propertyvalue);
+ return true;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return false;
+ }
+
+ public static void deletePropertyIfExist(Node node, String propertyname)
+ {
+ try
+ {
+ if (node != null && node.hasProperty(propertyname))
+ {
+ node.getProperty(propertyname).remove();
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-15 14:45:35
|
Revision: 4308
http://openutils.svn.sourceforge.net/openutils/?rev=4308&view=rev
Author: fgiust
Date: 2013-09-15 14:45:32 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2013-09-15 14:45:32 UTC (rev 4308)
@@ -19,12 +19,13 @@
package it.openutils.mgnltasks;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.Delta;
import info.magnolia.module.delta.DeltaBuilder;
import info.magnolia.module.model.Version;
-import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
+import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.HashSet;
@@ -99,12 +100,14 @@
.add(new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-nooverwrite"));
// only for development, add the (module)-dev bootstrap directory
- if (MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop"))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop"))
{
- if (StringUtils.isEmpty(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"))
- || StringUtils.contains(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"), ctx
- .getCurrentModuleDefinition()
- .getName()))
+ if (StringUtils.isEmpty(Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(
+ "magnolia.bootstrapdev"))
+ || StringUtils.contains(
+ Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(
+ "magnolia.bootstrapdev"),
+ ctx.getCurrentModuleDefinition().getName()))
{
deltas
.get(0)
@@ -122,7 +125,8 @@
List<Delta> deltas = new ArrayList<Delta>();
- if (MgnlUtilsDeprecatedAdapters.getBooleanProperty(modulename + ".update.disabled"))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ modulename + ".update.disabled"))
{
return deltas;
}
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java 2013-09-15 14:45:32 UTC (rev 4308)
@@ -104,16 +104,6 @@
return null;
}
- public static String getProperty(String name)
- {
- return SystemProperty.getProperty(name);
- }
-
- public static boolean getBooleanProperty(String name)
- {
- return SystemProperty.getBooleanProperty(name);
- }
-
public static Properties systemProperties()
{
return SystemProperty.getProperties();
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java 2013-09-15 14:45:32 UTC (rev 4308)
@@ -32,6 +32,7 @@
import info.magnolia.cms.security.auth.Entity;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.jaas.principal.EntityImpl;
import info.magnolia.jcr.util.ContentMap;
import info.magnolia.jcr.util.NodeUtil;
@@ -217,7 +218,7 @@
*/
public static boolean develop()
{
- return MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop");
+ return Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop");
}
/**
@@ -1249,7 +1250,7 @@
*/
public static String systemProperty(String key)
{
- return MgnlUtilsDeprecatedAdapters.getProperty(key);
+ return Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(key);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-18 12:31:38
|
Revision: 4320
http://openutils.svn.sourceforge.net/openutils/?rev=4320&view=rev
Author: fgiust
Date: 2013-09-18 12:31:25 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
upgrade magnolia version
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-tagcloud/
Property Changed:
----------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps/
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -270,7 +270,7 @@
</dependencies>
</dependencyManagement>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
<stk.version>2.0</stk.version>
<jackrabbit.version>2.4.1</jackrabbit.version>
</properties>
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps 2013-09-18 12:31:25 UTC (rev 4320)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/jsps
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
expressions
+rules
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates 2013-09-18 12:31:25 UTC (rev 4320)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
___________________________________________________________________
Modified: svn:ignore
## -6,3 +6,4 ##
samples-contextmenu
samples-stripes
samples-struts11
+samples-rules
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -92,6 +92,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -85,6 +85,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -95,6 +95,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -170,6 +170,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java 2013-09-18 12:31:25 UTC (rev 4320)
@@ -1,3 +1,22 @@
+/**
+ *
+ * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html)
+ * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 net.sourceforge.openutils.mgnlcontextmenu.servlet;
import info.magnolia.cms.security.Permission;
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -119,6 +119,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -100,6 +100,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -206,6 +206,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -108,6 +108,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -270,6 +270,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -139,6 +139,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -99,6 +99,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -147,6 +147,6 @@
</repository>
</repositories>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -105,6 +105,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -115,6 +115,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -127,6 +127,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -133,6 +133,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-09-18 11:01:51 UTC (rev 4319)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2013-09-18 12:31:25 UTC (rev 4320)
@@ -150,6 +150,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.5.6</magnolia.version>
+ <magnolia.version>4.5.11</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...> - 2013-09-18 21:04:41
|
Revision: 4327
http://openutils.svn.sourceforge.net/openutils/?rev=4327&view=rev
Author: fgiust
Date: 2013-09-18 21:04:37 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
drop ContentMap, use Node for everything
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/tld/mgnlutils.tld
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/media-samples.css
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-09-18 21:04:37 UTC (rev 4327)
@@ -39,6 +39,7 @@
import java.util.Locale;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -109,9 +110,9 @@
return null;
}
- ContentMap contentMap = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
+ Node node = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, MediaModule.REPO);
- if (contentMap != null)
+ if (node != null)
{
Content currentpage = null;
@@ -122,11 +123,11 @@
if (currentpage == null)
{
- currentpage = new DefaultContent(contentMap.getJCRNode());
+ currentpage = new DefaultContent(node);
}
Content content = new NodeMapWrapper(
- new I18nContentWrapper(new DefaultContent(contentMap.getJCRNode())),
+ new I18nContentWrapper(new DefaultContent(node)),
currentpage.getHandle());
return content;
}
@@ -531,10 +532,10 @@
return null;
}
- ContentMap playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
+ Node playlistNode = it.openutils.mgnlutils.el.MgnlUtilsElFunctions.node(obj, PlaylistConstants.REPO);
Iterator<ContentMap> iter = Iterators.transform(
- PlaylistIterateUtils.iterate(playlistNode.getJCRNode()),
+ PlaylistIterateUtils.iterate(playlistNode),
new Function<MediaNodeAndEntryPath, ContentMap>()
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-09-18 21:04:37 UTC (rev 4327)
@@ -5,7 +5,7 @@
<jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
<jsp:directive.attribute name="id" required="false" rtexprvalue="true" description="html element id"/>
<jsp:directive.attribute name="item" required="false" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node; if not specified, 'node' and 'property' attributes will be used"/>
- <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="the content object to use; if not specified, object 'content' will be used"/>
+ <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="java.lang.Object" description="the content object to use; if not specified, object 'content' will be used"/>
<jsp:directive.attribute name="property" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the nodeData storing the media uuid; if not specified, 'media' will be used"/>
<jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)"/>
<jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-09-18 12:47:40 UTC (rev 4326)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-09-18 21:04:37 UTC (rev 4327)
@@ -11,10 +11,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>${content.title}</title>
<cms:init />
+ <link rel="stylesheet" type="text/css"
+ href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/media-samples.css" />
</head>
<body>
- <h1>${content.title}</h1>
- <cms:area name="main" />
+ <div class="container">
+ <h1>${content.title}</h1>
+ <cms:area name="main" />
+ </div>
</body>
</html>
-</jsp:root>
+</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media-samples/css/bootstrap.min.css 2013-09-18 21:04:37 UTC (rev 4327)
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-09-19 14:31:43
|
Revision: 4329
http://openutils.svn.sourceforge.net/openutils/?rev=4329&view=rev
Author: fgiust
Date: 2013-09-19 14:31:39 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -110,11 +110,16 @@
*/
@Override
@SuppressWarnings("unchecked")
- protected void onRegister(Content node)
+ protected void onRegister(Content content)
{
+
+ Node node = content.getJCRNode();
+
+
+
for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
{
- Content typeNode = (Content) iter.next();
+ Node typeNode = iter.next();
if (!NodeDataUtil.getBoolean(typeNode, "enabled", true))
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,11 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
-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.core.SystemProperty;
import info.magnolia.cms.exchange.ActivationManagerFactory;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.security.Permission;
@@ -32,7 +30,12 @@
import info.magnolia.commands.CommandsManager;
import info.magnolia.context.Context;
import info.magnolia.context.MgnlContext;
+import info.magnolia.init.MagnoliaConfigurationProperties;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
@@ -45,6 +48,7 @@
import java.util.List;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -61,6 +65,7 @@
import org.apache.commons.lang.StringUtils;
import com.google.common.collect.Iterators;
+import com.sun.xml.internal.ws.util.MetadataUtil;
/**
@@ -184,7 +189,7 @@
sorting = getDefaultSorting().name();
}
// for activation status handling
- develop = SystemProperty.getBooleanProperty("magnolia.develop");
+ develop = Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop");
}
/**
@@ -216,7 +221,7 @@
{
return null;
}
- Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+ Node folder = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, path);
if (folder == null)
{
return null;
@@ -278,7 +283,7 @@
{
// casts Iterator<AdvancedResultItem> to Iterator<Content>
- Iterator<Content> contentIterator = Iterators.filter(searchResult.getItems(), Content.class);
+ Iterator<Node> contentIterator = Iterators.filter(searchResult.getItems(), Node.class);
medias = Iterators.transform(contentIterator, new MediaBeanBuilder());
pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 10, "page");
}
@@ -374,7 +379,7 @@
* @throws ExchangeException publication problem
* @throws RepositoryException repository exception
*/
- public Content copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
+ public Node copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
RepositoryException
{
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
@@ -412,11 +417,11 @@
// copy
hm.copyTo(source, goTo);
}
- Content newContent = hm.getContent(destination);
+ Node newContent = hm.getNode(destination);
try
{
- newContent.updateMetaData();
- newContent.getMetaData().setUnActivated();
+ MetaDataUtil.updateMetaData(newContent);
+ MetaDataUtil.getMetaData(newContent).setUnActivated();
}
catch (Exception e)
{
@@ -499,19 +504,12 @@
public String download()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
+ Node media = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, path);
- Content media;
- try
+ if (media == null)
{
- media = hm.getContent(path);
- }
- catch (RepositoryException e)
- {
- log.error("Error downloading media " + path, e);
return null;
}
-
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(media);
String url = mtc.getHandler().getUrl(media);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,11 +19,12 @@
package net.sourceforge.openutils.mgnlmedia.media.setup;
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.InstallContext;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.delta.SetupModuleRepositoriesTask;
import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.BootstrapMissingNodesTask;
import it.openutils.mgnltasks.ChangeExistingPropertyTask;
@@ -79,7 +80,8 @@
{
List<Task> tasks = new ArrayList<Task>();
- if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+ if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ "magnolia.bootstrap.samples"))
{
tasks.add(new SamplesExtractionTask());
}
@@ -254,7 +256,7 @@
{
try
{
- return ModuleRegistry.Factory.getInstance().getDefinition(module) != null;
+ return Components.getComponent(ModuleRegistry.class).getDefinition(module) != null;
}
catch (IllegalArgumentException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -30,7 +30,10 @@
import javax.jcr.RepositoryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Update configuration for media types.
* @author fgiust
@@ -40,6 +43,11 @@
{
/**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(MoveHandlerNodedataToNode.class);
+
+ /**
* Update mediatype configuration
*/
public MoveHandlerNodedataToNode()
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -23,6 +23,7 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.awt.image.BufferedImage;
@@ -103,7 +104,7 @@
catch (Throwable e)
{
log.warn("Unable to generate a preview for {} due to a {}: {}", new Object[]{
- media.getHandle(),
+ NodeUtil.getPathIfPossible(media),
e.getClass().getName(),
e.getMessage() });
}
@@ -164,12 +165,12 @@
}
else
{
- log.error("Error creating preview for " + media.getHandle(), e);
+ log.error("Error creating preview for " + NodeUtil.getPathIfPossible(media), e);
}
}
catch (Throwable e)
{
- log.error("Error creating preview for " + media.getHandle(), e);
+ log.error("Error creating preview for " + NodeUtil.getPathIfPossible(media), e);
}
finally
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,8 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
-import info.magnolia.cms.core.Content;
+import info.magnolia.jcr.util.NodeUtil;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -43,7 +44,7 @@
/**
* {@inheritDoc}
*/
- public String getThumbnailUrl(Content media)
+ public String getThumbnailUrl(Node media)
{
if (hasPreview(media))
@@ -53,7 +54,7 @@
return "";
}
return MediaConfigurationManager.getInstance().getURIMappingPrefix()
- + media.getHandle()
+ + NodeUtil.getPathIfPossible(media)
+ "/resolutions/thumbnail/"
+ media.getName()
+ "."
@@ -66,7 +67,7 @@
public abstract String getReplacementThumbnail();
- protected boolean hasPreview(Content media)
+ protected boolean hasPreview(Node media)
{
if (media != null)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistTrackExtensionContributor.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,11 +19,11 @@
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
-import info.magnolia.cms.core.Content;
-
import java.io.PrintWriter;
+import javax.jcr.Node;
+
/**
* @author dschivo
* @version $Id$
@@ -35,6 +35,6 @@
* @param media
* @param writer
*/
- void addMediaAttributes(Content media, PrintWriter writer);
+ void addMediaAttributes(Node media, PrintWriter writer);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -18,14 +18,14 @@
*/
package net.sourceforge.openutils.mgnlmedia.playlist.pages;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
+
import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.ModuleRegistry;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
import java.io.IOException;
import java.io.PrintWriter;
@@ -92,7 +92,7 @@
private boolean xml;
- private List<Content> mediaContentList;
+ private List<Node> mediaContentList;
private List<MediaBean> mediaBeans;
@@ -175,18 +175,18 @@
{
if (StringUtils.isNotBlank(path))
{
- Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
+ Node node = NodeUtilsExt.getNodeByIdOrPath(PlaylistConstants.REPO, path);
if (node != null)
{
playlist = new PlaylistBean();
playlist.setUuid(node.getUUID());
- playlist.setHandle(node.getHandle());
+ playlist.setHandle(NodeUtil.getPathIfPossible(node));
playlist.setTitle(NodeDataUtil.getString(node, "title"));
playlist.setDescription(NodeDataUtil.getString(node, "description"));
List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>();
- for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node.getJCRNode()); iterator
+ for (Iterator<MediaNodeAndEntryPath> iterator = PlaylistIterateUtils.iterate(node); iterator
.hasNext();)
{
MediaNodeAndEntryPath item = iterator.next();
@@ -236,7 +236,7 @@
public String save()
{
success = false;
- Content node = ContentUtil.getContent(PlaylistConstants.REPO, path);
+ Node node = NodeUtilsExt.getNodeByIdOrPath(PlaylistConstants.REPO, path);
if (node != null)
{
try
@@ -245,7 +245,7 @@
NodeDataUtil.getOrCreateAndSet(node, "description", description);
if (MediaEl.module().isSingleinstance())
{
- node.getMetaData().setActivated();
+ MetaDataUtil.getMetaData(node).setActivated();
}
node.save();
success = true;
@@ -260,7 +260,7 @@
public String saveMedia()
{
success = false;
- Content node = ContentUtil.getContent(MediaModule.REPO, mediaHandle);
+ Node node = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, mediaHandle);
if (node != null)
{
try
@@ -269,7 +269,7 @@
NodeDataUtil.getOrCreateAndSet(node, "description", description);
if (MediaEl.module().isSingleinstance())
{
- node.getMetaData().setActivated();
+ MetaDataUtil.getMetaData(node).setActivated();
}
node.save();
success = true;
@@ -292,13 +292,13 @@
else
{
// Set mediaContent
- mediaContentList = new ArrayList<Content>();
+ mediaContentList = new ArrayList<Node>();
for (PlaylistEntryBean plb : this.getPlaylist().getEntries())
{
+
try
{
- mediaContentList.add(MgnlContext.getHierarchyManager(MediaModule.REPO).getContentByUUID(
- plb.getMedia()));
+ mediaContentList.add(NodeUtil.getNodeByIdentifier(MediaModule.REPO, plb.getMedia()));
}
catch (RepositoryException e)
{
@@ -326,12 +326,12 @@
public String mediaFolder()
{
- Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+ Node folder = NodeUtilsExt.getNodeByIdOrPath(MediaModule.REPO, path);
if (folder != null)
{
- Collection<Content> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
+ Collection<Node> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
mediaBeans = new ArrayList<MediaBean>(nodes.size());
- for (Content node : nodes)
+ for (Node node : nodes)
{
MediaBean bean = new MediaBeanBuilder().apply(node);
mediaBeans.add(bean);
@@ -362,7 +362,7 @@
* Returns the mediaContentList.
* @return the mediaContentList
*/
- public List<Content> getMediaContentList()
+ public List<Node> getMediaContentList()
{
return mediaContentList;
}
@@ -371,7 +371,7 @@
* Sets the mediaContentList.
* @param mediaContentList the mediaContentList to set
*/
- public void setMediaContentList(List<Content> mediaContentList)
+ public void setMediaContentList(List<Node> mediaContentList)
{
this.mediaContentList = mediaContentList;
}
@@ -412,9 +412,9 @@
return metas;
}
- public void writePlaylistTrackExtension(Content media, PrintWriter writer)
+ public void writePlaylistTrackExtension(Node media, PrintWriter writer)
{
- MediaModule module = (MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(MediaModule.NAME);
+ MediaModule module = (MediaModule) Components.getComponent(ModuleRegistry.class).getModuleInstance(MediaModule.NAME);
for (Object item : module.getPlaylistTrackExtensionContributors())
{
PlaylistTrackExtensionContributor contributor = (PlaylistTrackExtensionContributor) item;
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-09-19 09:45:42 UTC (rev 4328)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-09-19 14:31:39 UTC (rev 4329)
@@ -19,9 +19,15 @@
package it.openutils.mgnlutils.api;
+import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
+import java.util.regex.Pattern;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.LoginException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -36,6 +42,9 @@
public class NodeUtilsExt
{
+ private static Pattern UUID_PATTERN = Pattern
+ .compile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");
+
public static boolean exists(Session session, String absolutepath)
{
try
@@ -120,4 +129,52 @@
throw new RuntimeRepositoryException(e);
}
}
+
+ public static Node getNodeByIdOrPath(String workspace, String uuidOrPath)
+ {
+ if (uuidOrPath == null)
+ {
+ return null;
+ }
+
+ if (isUUID(uuidOrPath))
+ {
+ try
+ {
+ return NodeUtil.getNodeByIdentifier(workspace, uuidOrPath);
+ }
+ catch (ItemNotFoundException e)
+ {
+ // ignore
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ else
+ {
+ try
+ {
+ return getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ return null;
+ }
+
+ public static boolean isUUID(String string)
+ {
+ // 97ed692a-31a9-4670-9c36-4d8ee8f6128d
+ if (StringUtils.length(string) != 36)
+ {
+ return false;
+ }
+
+ return UUID_PATTERN.matcher(string).find();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2013-09-26 17:14:13
|
Revision: 4350
http://openutils.svn.sourceforge.net/openutils/?rev=4350&view=rev
Author: lucaboati
Date: 2013-09-26 17:14:07 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
first mgnl5 empty webapp
Added Paths:
-----------
magnoliamodules/trunk/magnolia5-test-webapp/
magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/cms/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/META-INF/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/META-INF/magnolia/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/META-INF/magnolia/dev.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.server.i18n.authoringLegacy.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/dev/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/dev/config.modules.dev.dialogs.pages.t-homepage.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/dev/config.modules.dev.templates.pages.t-homepage.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/dev-dev/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-bootstrap/dev-dev/website.home.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/mgnl-resources/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/net/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/net/sourceforge/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/net/sourceforge/openutils/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties
magnoliamodules/trunk/magnolia5-test-webapp/src/main/resources/tagcloud_indexing_configuration.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesCriteria.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/media.manyimages.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/userroles.criteria-dogsexcluded.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/userroles.criteria-dogsonly.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/users.admin.criteria-dogsexcluded.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/users.admin.criteria-dogsonly.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/classes/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/magnolia.properties
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/default/repositories.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/jaas.config
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/lib/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/lib/taglibs.zip
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/struts-config.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/web.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/favicon.ico
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/robots.txt
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/ico16-form-hint.png
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/ico16-form-label.png
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/ico16-media.png
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/ico16-text.png
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/paragraph-form.css
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/paragraph-form.js
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/samples-contextmenu/pointer.gif
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dev/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dev/pages/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dev/pages/t-homepage.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dms/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dms/paragraphs/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dms/paragraphs/dms.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/areas/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/areas/footer.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/areas/list.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/areas/navigation.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/areas/single.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/fields.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/flash.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/howTo.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/link.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/linkList.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/searchResult.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/components/text.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/includes/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/includes/searchForm.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/macros/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/macros/navigation.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/pages/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/pages/main.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/pages/virtualURI.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-contextmenu/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-contextmenu/paragraph-message.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-contextmenu/paragraph-textmedia.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-contextmenu/template.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/area.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/paragraph-buttonSet.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/paragraph-dependentSelectList.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/paragraph-grid.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/template.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/paragraph-conditional.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/paragraph-evaluate.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/paragraph-grid.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/paragraph-if-then-else.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/template.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-lms/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-lms/courses.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-lms/coursesList.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-lms/index.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/area.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/paragraph-grid.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/paragraph-mediael.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/paragraph-mediatag.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/paragraph-playlist.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/template.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/p-sample-ipad.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/p-sample-mobile.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/p-sample.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-stripes/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-stripes/area.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-stripes/paragraph.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-stripes/template.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-struts11/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-struts11/area.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-struts11/paragraph.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-struts11/template.jsp
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-tagcloud/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-tagcloud/template.jsp
magnoliamodules/trunk/magnolia5-test-webapp/tree.txt
Added: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml (rev 0)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml 2013-09-26 17:14:07 UTC (rev 4350)
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-parent</artifactId>
+ <relativePath>../openutils-parent</relativePath>
+ <version>1.13</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>war</packaging>
+ <artifactId>magnolia5-test-webapp</artifactId>
+ <name>Magnolia test webapp</name>
+ <description>A basic Magnolia webapp that can be used while developing openutils magnolia modules</description>
+ <version>0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-rendering</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia.ui</groupId>
+ <artifactId>magnolia-ui-admincentral</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia.ui</groupId>
+ <artifactId>magnolia-ui-contentapp</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-legacy-admininterface</artifactId>
+ <version>5.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia.dam</groupId>
+ <artifactId>magnolia-dam</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>info.magnolia</groupId> -->
+ <!-- <artifactId>magnolia-module-cache</artifactId> -->
+ <!-- <version>${magnolia.version2}</version> -->
+ <!-- <exclusions> -->
+ <!-- <exclusion> -->
+ <!-- <groupId>info.magnolia</groupId> -->
+ <!-- <artifactId>magnolia-module-admininterface</artifactId> -->
+ <!-- </exclusion> -->
+ <!-- </exclusions> -->
+ <!-- </dependency> -->
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-mail</artifactId>
+ <version>5.0.1</version>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>info.magnolia</groupId> -->
+ <!-- <artifactId>magnolia-module-fckeditor</artifactId> -->
+ <!-- <version>${magnolia.version2}</version> -->
+ <!-- </dependency> -->
+ <dependency>
+ <groupId>info.magnolia.activation</groupId>
+ <artifactId>magnolia-module-activation</artifactId>
+ <version>5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-templating</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-templating-jsp</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-jaas</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-templating-jsp</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia.sample</groupId>
+ <artifactId>magnolia-sample-app</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia.security</groupId>
+ <artifactId>magnolia-security-app</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia.messages</groupId>
+ <artifactId>magnolia-messages-app</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia.pages</groupId>
+ <artifactId>magnolia-pages</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <!-- <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-templating-samples</artifactId> <version>${magnolia.version}</version>
+ </dependency> <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-templating-jsp</artifactId> <version>${magnolia.version}</version>
+ </dependency> <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-exchange-simple</artifactId> <version>${magnolia.version}</version>
+ </dependency> <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-gui</artifactId> <version>${magnolia.version}</version>
+ </dependency> <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-fckeditor</artifactId> <version>${magnolia.version}</version>
+ </dependency> <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-templating-editor</artifactId> <version>${magnolia.version}</version>
+ </dependency> -->
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-log4j</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <!-- <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-dms</artifactId> <version>1.6</version>
+ </dependency> -->
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>info.magnolia</groupId> -->
+ <!-- <artifactId>magnolia-module-standard-templating-kit</artifactId> -->
+ <!-- <version>${stk.version}</version> -->
+ <!-- </dependency> -->
+ <!-- info.magnolia.module.model.reader.ModuleDependencyException: Module Magnolia Standard Templating Kit Demo Project
+ (version 2.0.0) is dependent on categorization version null, which was not found. <dependency> <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-demo-project</artifactId> <version>${stk.version}</version> </dependency> -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-elfunctions</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <version>5.0.2-SNAPSHOT</version>
+ </dependency>
+<!-- <dependency> -->
+<!-- <groupId>net.sourceforge.openutils</groupId> -->
+<!-- <artifactId>openutils-mgnlmedia</artifactId> -->
+<!-- <version>5.0.3-SNAPSHOT</version> -->
+<!-- </dependency> -->
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>5.0.1-SNAPSHOT</version>
+ </dependency>
+ <!-- <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlbootstrapsync</artifactId> <version>5.0.0-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcas</artifactId> <version>5.0.0-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcontrols</artifactId> <version>5.0.1-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcache</artifactId> <version>5.0.0-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlext</artifactId> <version>5.0.0-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlgroovy</artifactId> <version>5.0.1-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmedia</artifactId> <version>5.0.3-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmessages</artifactId> <version>5.0.2-SNAPSHOT</version>
+ </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlrepoutils</artifactId>
+ <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlstripes</artifactId>
+ <version>5.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlstruts11</artifactId>
+ <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltasks</artifactId>
+ <version>5.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlutils</artifactId>
+ <version>5.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnltagcloud</artifactId>
+ <version>5.0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlrules</artifactId>
+ <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlcontextmenu</artifactId>
+ <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnllms</artifactId>
+ <version>5.0.0-SNAPSHOT</version> </dependency> -->
+ <!-- <dependency> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils-mgnlmobile</artifactId> <version>5.0.0-SNAPSHOT</version>
+ </dependency> -->
+ </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>0.7.3</version>
+ <scope>provided</scope>
+ <!-- exclude from webapp, org.apache.pdfbox:pdfbox 1.0.0 is needed for thumbnail generation -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.devlib.schmidt</groupId>
+ <artifactId>imageinfo</artifactId>
+ <version>1.9</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <properties>
+ <magnolia.version>5.0.4</magnolia.version>
+ <magnolia.version2>5.0-prev1-rc1</magnolia.version2>
+ <!-- <magnolia.version2>5.0.4</magnolia.version2> -->
+ <stk.version>2.5.3</stk.version>
+ <jackrabbit.version>2.6.2</jackrabbit.version>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <wtpContextName>open</wtpContextName>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <classpathContainer><![CDATA[org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0]]></classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>magnolia.enterprise</id>
+ <url>http://repo.magnolia-cms.com/enterprise</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>repository.magnolia-cms.com</id>
+ <name>magnolia repository</name>
+ <url>http://nexus.magnolia-cms.com/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>magnolia.enterprise.releases</id>
+ <url>http://nexus.magnolia-cms.com/content/repositories/magnolia.enterprise.releases</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>openutils.sourceforge.net</id>
+ <name>openutils.sourceforge.net</name>
+ <url>http://openutils.sourceforge.net/repository/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
Added: magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValuesTask.java
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/java/info/magnolia/module/delta/PropertyValue...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-12 13:54:05
|
Revision: 4369
http://openutils.svn.sourceforge.net/openutils/?rev=4369&view=rev
Author: fgiust
Date: 2013-10-12 13:53:58 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
deprecations
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogHiddenParameters.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayHandle.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DisplayUUID.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveHandlerNodedataToNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/SwfTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistFoldersTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTree.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/setup/TagCloudModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/util/JackrabbitUtil.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/filters/ClientHeadersFilter.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/jmx/JmxServerContextListener.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/AutoGenerateTemplateModel.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/ObservedManagerAdapter.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MoveOriginalNodeTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/voters/AllInOneCacheVoter.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
import info.magnolia.cms.beans.config.ServerConfiguration;
import info.magnolia.cms.security.UserManager;
import info.magnolia.context.MgnlContext;
+import info.magnolia.objectfactory.Components;
import info.magnolia.voting.voters.AbstractBoolVoter;
import javax.servlet.http.HttpServletRequest;
@@ -193,7 +194,7 @@
if (!allowAdmin)
{
- if (ServerConfiguration.getInstance().isAdmin())
+ if (Components.getComponent(ServerConfiguration.class).isAdmin())
{
log.debug(logmessage, "on admin server");
return DONTCACHE;
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,12 +20,14 @@
package net.sourceforge.openutils.mgnlcontextmenu.el;
import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.util.DeprecationUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.context.WebContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.util.ArrayList;
import java.util.Collections;
@@ -103,7 +105,7 @@
{
String ctx = MgnlContext.getContextPath();
boolean canEdit = NodeUtil.isGranted(
- MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ MgnlUtilsDeprecatedAdapters.getMainContent(),
Permission.SET);
StringBuilder out = new StringBuilder();
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -23,6 +23,7 @@
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.io.IOException;
import java.util.ArrayList;
@@ -91,7 +92,7 @@
try
{
canEdit = NodeUtil.isGranted(
- MgnlContext.getAggregationState().getMainContent().getJCRNode(),
+ MgnlUtilsDeprecatedAdapters.getMainContent(),
Permission.SET);
}
@@ -104,7 +105,7 @@
Map<String, String> item = new HashMap<String, String>();
item.put("containerId", containerId);
item.put("url", MgnlContext.getContextPath() + "/mgnl-set-property");
- item.put("path", MgnlContext.getAggregationState().getCurrentContent().getHandle());
+ item.put("path", NodeUtil.getPathIfPossible(MgnlUtilsDeprecatedAdapters.getCurrentContent()));
item.put("name", orderProperty);
item.put("order", '[' + order + ']');
List items = (List) pageContext.getRequest().getAttribute(ContextMenuElFunctions.SORT_LIST_KEY);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -61,7 +61,7 @@
if (media != null)
{
PropertyUtil.setProperty(media, property, value);
- media.save();
+ media.getSession().save();
return true;
}
return false;
@@ -87,7 +87,7 @@
if (media != null && media.hasProperty(property))
{
media.getProperty(property).remove();
- media.save();
+ media.getSession().save();
return true;
}
return false;
@@ -243,7 +243,7 @@
MediaWithPreviewImageTypeHandler.PREVIEW_NODEDATA_NAME,
"preview",
null);
- media.save();
+ media.getSession().save();
return true;
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -4,6 +4,8 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.context.MgnlContext;
+import info.magnolia.context.SystemContext;
+import info.magnolia.objectfactory.Components;
import java.io.IOException;
@@ -29,8 +31,8 @@
@Override
public void uploadVideo(final String mediaUUID) throws IOException, RepositoryException
{
- Content media = MgnlContext
- .getSystemContext()
+ Content media = Components
+ .getComponent(SystemContext.class)
.getHierarchyManager(MediaModule.REPO)
.getContentByUUID(mediaUUID);
NodeData file = media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,17 +19,18 @@
package net.sourceforge.openutils.mgnlmedia.grid;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
import java.io.StringWriter;
import java.util.Map;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlcontrols.configuration.AbstractGridColumnType;
@@ -106,11 +107,17 @@
{
if (StringUtils.startsWith(column[index], "/"))
{
- Content node = ContentUtil.getContentByUUID(MediaModule.REPO, column[index]);
- if (node != null)
+ Node node;
+ try
{
- column[index] = node.getUUID();
+ node = NodeUtil.getNodeByIdentifier(MediaModule.REPO, column[index]);
+
+ column[index] = NodeUtil.getNodeIdentifierIfPossible(node);
}
+ catch (RepositoryException e)
+ {
+ // ignore, can't convert
+ }
}
}
}
@@ -130,11 +137,17 @@
{
if (StringUtils.startsWith(column[index], "/"))
{
- Content node = ContentUtil.getContentByUUID(MediaModule.REPO, column[index]);
- if (node != null)
+ Node node;
+ try
{
- column[index] = node.getUUID();
+ node = NodeUtil.getNodeByIdentifier(MediaModule.REPO, column[index]);
+
+ column[index] = NodeUtil.getNodeIdentifierIfPossible(node);
}
+ catch (RepositoryException e)
+ {
+ // ignore, can't convert
+ }
}
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -106,7 +106,7 @@
Criteria c = JCRCriteriaFactory
.createCriteria()
.setWorkspace(MediaModule.REPO)
- .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName()));
+ .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.NT_MEDIA));
// media type
if (!StringUtils.isEmpty(mediaType))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -22,6 +22,7 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.util.AlertUtil;
@@ -131,8 +132,8 @@
try
{
return !getRule().isAllowed(content.getNodeTypeName())
- && !ItemType.CONTENT.getSystemName().equals(content.getNodeTypeName())
- && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+ && !MgnlNodeType.NT_CONTENT.equals(content.getNodeTypeName())
+ && !MediaConfigurationManager.NT_RESOLUTIONS.equals(content.getNodeTypeName());
}
catch (RepositoryException e)
{
@@ -156,7 +157,7 @@
*/
protected void activateSingleNode(String parentPath, Content node) throws RepositoryException, ExchangeException
{
- if (MediaConfigurationManager.MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
+ if (MediaConfigurationManager.NT_MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
{
// already activated media, should deactivate in order to remove stale resolutions
log
@@ -196,7 +197,7 @@
{
log.info("Activating parent folder {}", folder.getHandle());
// folder only, no content
- setRule(new Rule(new String[]{ItemType.NT_METADATA, ItemType.NT_RESOURCE }));
+ setRule(new Rule(new String[]{MgnlNodeType.NT_METADATA, MgnlNodeType.NT_RESOURCE }));
getSyndicator().activate(folder.getParent().getHandle(), folder, getOrderingInfo(folder));
}
@@ -226,7 +227,7 @@
try
{
return !getRule().isAllowed(content.getNodeTypeName())
- && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName());
+ && !MediaConfigurationManager.NT_RESOLUTIONS.equals(content.getNodeTypeName());
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -24,6 +24,7 @@
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.cms.core.search.QueryResult;
@@ -34,6 +35,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
@@ -80,17 +82,17 @@
/**
* Folder type
*/
- public static final ItemType FOLDER = ItemType.CONTENT;
+ public static final String NT_FOLDER = MgnlNodeType.NT_CONTENT;
/**
* Media type
*/
- public static final ItemType MEDIA = new ItemType(MGNL_MEDIA_TYPE);
+ public static final String NT_MEDIA = MGNL_MEDIA_TYPE;
/**
* Resolutions node type
*/
- public static final ItemType RESOLUTIONS = new ItemType(MGNL_RESOLUTION_TYPE);
+ public static final String NT_RESOLUTIONS = MGNL_RESOLUTION_TYPE;
private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class);
@@ -259,7 +261,7 @@
{
sbQuery.append('/');
}
- sbQuery.append("element(*," + MediaConfigurationManager.MEDIA.getSystemName() + ")");
+ sbQuery.append("element(*," + MediaConfigurationManager.NT_MEDIA + ")");
List<String> clauses = new ArrayList<String>();
if (StringUtils.isNotBlank(search))
{
@@ -317,7 +319,7 @@
*/
public String getURIMappingPrefix()
{
- Collection<URI2RepositoryMapping> mappings = URI2RepositoryManager.getInstance().getMappings();
+ Collection<URI2RepositoryMapping> mappings = Components.getComponent(URI2RepositoryManager.class).getMappings();
for (URI2RepositoryMapping mapping : mappings)
{
if (mapping.getRepository().equals(MediaModule.REPO))
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -19,13 +19,14 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.ArrayList;
import java.util.Collection;
@@ -57,12 +58,12 @@
* @version $Id$
*/
@Singleton
-public class MediaUsedInManager extends ObservedManager
+public class MediaUsedInManager extends ObservedManagerAdapter
{
public static MediaUsedInManager getInstance()
{
- return Components.getSingleton(MediaUsedInManager.class);
+ return Components.getComponents(MediaUsedInManager.class);
}
private static Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
@@ -82,9 +83,9 @@
* {@inheritDoc}
*/
@Override
- protected void onRegister(Content node)
+ protected void onRegister(Node node)
{
- Collection<Content> uiwNodes = node.getChildren(ItemType.CONTENTNODE);
+ Collection<Content> uiwNodes = node.getChildren(MgnlNodeType.NT_CONTENTNODE);
for (Content uiwNode : uiwNodes)
{
try
@@ -96,7 +97,7 @@
}
if (StringUtils.isEmpty(uiw.getNodeType()))
{
- uiw.setNodeType(ItemType.CONTENT.getSystemName());
+ uiw.setNodeType(MgnlNodeType.NT_CONTENT);
}
usedInWorkspaceMap.put(uiw.getWorkspaceName(), uiw);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -20,6 +20,7 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.repository.RepositoryConstants;
@@ -34,7 +35,7 @@
private String workspaceName;
- private String nodeType = ItemType.CONTENT.getSystemName();
+ private String nodeType = MgnlNodeType.NT_PAGE;
private String basePath = "/";
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-10 16:03:33 UTC (rev 4368)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java 2013-10-12 13:53:58 UTC (rev 4369)
@@ -102,7 +102,7 @@
.append("|")
.append(y)
.toString());
- systemNode.save();
+ systemNode.getSession().save();
}
catch (RepositoryException ex)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java
===================================================================
--- magnoliamodules/trunk...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-13 13:43:46
|
Revision: 4370
http://openutils.svn.sourceforge.net/openutils/?rev=4370&view=rev
Author: fgiust
Date: 2013-10-13 13:43:41 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
update APIs
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/UsedInWorkspace.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/crop/PzcServlet.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileNoPreview.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ConditionallySubscribeMediaRepositoriesTask.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveExtensionFromType.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ExternalVideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/PlaylistConstants.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistEntryDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/tree/PlaylistsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Property Changed:
----------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2013-10-13 13:43:41 UTC (rev 4370)
@@ -206,7 +206,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontextmenu</artifactId>
- <version>4.5.3-SNAPSHOT</version>
+ <version>4.5.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -276,7 +276,7 @@
</dependencyManagement>
<properties>
<magnolia.version>4.5.11</magnolia.version>
- <stk.version>2.0</stk.version>
+ <stk.version>2.0.10</stk.version>
<jackrabbit.version>2.4.1</jackrabbit.version>
</properties>
<build>
Index: magnoliamodules/trunk/openutils-mgnlcontextmenu
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu 2013-10-13 13:43:41 UTC (rev 4370)
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu
___________________________________________________________________
Modified: svn:ignore
## -3,3 +3,4 ##
.project
.settings
target
+release.properties
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-13 13:43:41 UTC (rev 4370)
@@ -147,7 +147,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-standard-templating-kit</artifactId>
- <version>2.0</version>
+ <version>2.0.10</version>
<optional>true</optional>
<exclusions>
<exclusion>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaAsset.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.dam;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
import info.magnolia.module.templatingkit.dam.AssetNotFoundException;
@@ -33,12 +32,15 @@
* Dam-support for the SimpleMedia module.
* @author Ernst Bunders
*/
+@SuppressWarnings("deprecation")
public class SimpleMediaAsset extends InternalAsset
{
- public SimpleMediaAsset(SimpleMediaContentHandler handler, Content metaDataNode, NodeData binaryNodeData, TemplatingFunctions templatingFunctions)
- throws AssetNotFoundException,
- RepositoryException
+ public SimpleMediaAsset(
+ SimpleMediaContentHandler handler,
+ Content metaDataNode,
+ NodeData binaryNodeData,
+ TemplatingFunctions templatingFunctions) throws AssetNotFoundException, RepositoryException
{
super(handler, metaDataNode, "", binaryNodeData, templatingFunctions);
}
@@ -52,7 +54,7 @@
@Override
public String getCaption()
{
- return getMetaDataValue("title", super.getTitle());
+ return getMetaDataValue("title", super.getTitle(), true);
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/dam/SimpleMediaContentHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,7 +19,6 @@
package net.sourceforge.openutils.mgnlmedia.dam;
-
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
@@ -42,6 +41,7 @@
* Dam-support for the SimpleMedia module.
* @author Ernst Bunders
*/
+@SuppressWarnings("deprecation")
public class SimpleMediaContentHandler extends DMSDAMHandler
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoTypeHandler.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -107,7 +107,7 @@
throws AccessDeniedException, RepositoryException
{
media.setProperty("provider", "weebo");
- ExternalVideoUtil.setStatus(media.getUUID(), AsyncUploadExternalVideoProvider.STATUS_TO_UPLOAD);
+ ExternalVideoUtil.setStatus(media.getIdentifier(), AsyncUploadExternalVideoProvider.STATUS_TO_UPLOAD);
super.saveFromZipFile(media, f, cleanFileName, extension);
}
@@ -166,6 +166,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getFilename(Node media)
{
ExternalVideoProvider provider = getVideoProvider(media);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/ExternalVideoUtil.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -1,9 +1,6 @@
package net.sourceforge.openutils.mgnlmedia.externalvideo;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
@@ -110,9 +107,9 @@
return StringUtils.join(new String[]{ND_ERROR, suffix != null ? "-" : null, suffix });
}
- public static String getStatus(final Content mediaNode, String statusSuffix)
+ public static String getStatus(final Node mediaNode, String statusSuffix)
{
- return NodeDataUtil.getString(mediaNode, getStatusProperty(statusSuffix));
+ return PropertyUtil.getString(mediaNode, getStatusProperty(statusSuffix));
}
public static boolean setStatus(final String mediaUUID, final String statusSuffix, final String status)
@@ -124,19 +121,16 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
if (media != null)
{
String statusProperty = getStatusProperty(statusSuffix);
- if (!media.hasNodeData(statusProperty)
- || !StringUtils.equals(NodeDataUtil.getString(media, statusProperty), status))
+ if (!media.hasProperty(statusProperty)
+ || !StringUtils.equals(PropertyUtil.getString(media, statusProperty), status))
{
- NodeDataUtil.getOrCreateAndSet(media, statusProperty, status);
- NodeDataUtil.getOrCreateAndSet(
- media,
- statusProperty + "LastModified",
- Calendar.getInstance());
- media.save();
+ media.setProperty(statusProperty, status);
+ media.setProperty(statusProperty + "LastModified", Calendar.getInstance());
+ media.getSession().save();
}
return true;
}
@@ -150,10 +144,10 @@
}
}
- public static boolean hasStatus(final Content mediaNode, final String statusSuffix, final String status)
+ public static boolean hasStatus(final Node mediaNode, final String statusSuffix, final String status)
{
String statusProperty = getStatusProperty(statusSuffix);
- return StringUtils.equals(NodeDataUtil.getString(mediaNode, statusProperty), status);
+ return StringUtils.equals(PropertyUtil.getString(mediaNode, statusProperty), status);
}
public static boolean hasStatus(final String mediaUUID, final String statusSuffix, final String status)
@@ -165,7 +159,7 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
return media != null && hasStatus(media, statusSuffix, status);
}
});
@@ -190,15 +184,12 @@
public Boolean exec() throws RepositoryException
{
- Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID);
+ Node media = NodeUtil.getNodeByIdentifier(MediaModule.REPO, mediaUUID);
if (media != null)
{
- NodeDataUtil.getOrCreateAndSet(media, getErrorProperty(suffix), true);
- NodeDataUtil.getOrCreateAndSet(
- media,
- getErrorProperty(suffix) + "-" + ND_ERROR_MESSAGE,
- message);
- media.save();
+ media.setProperty(getErrorProperty(suffix), true);
+ media.setProperty(getErrorProperty(suffix) + "-" + ND_ERROR_MESSAGE, message);
+ media.getSession().save();
return true;
}
return false;
@@ -211,6 +202,7 @@
}
}
+ @SuppressWarnings("deprecation")
public static boolean copyPreviewImageToRepository(Node media, final String previewUrl) throws IOException
{
if (StringUtils.isNotBlank(previewUrl))
@@ -238,7 +230,7 @@
try
{
SaveHandlerImpl.saveDocument(
- ContentUtil.asContent(media),
+ info.magnolia.cms.util.ContentUtil.asContent(media),
doc,
MediaWithPreviewImageTypeHandler.PREVIEW_NODEDATA_NAME,
"preview",
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/externalvideo/FtpAsyncUploadExternalVideoProvider.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -1,21 +1,17 @@
package net.sourceforge.openutils.mgnlmedia.externalvideo;
import info.magnolia.cms.beans.runtime.FileProperties;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.context.MgnlContext;
import info.magnolia.context.SystemContext;
import info.magnolia.objectfactory.Components;
import java.io.IOException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
-import org.apache.commons.lang.math.NumberUtils;
-
/**
* @author molaschi
* @version $Id: $
@@ -31,17 +27,24 @@
@Override
public void uploadVideo(final String mediaUUID) throws IOException, RepositoryException
{
- Content media = Components
+ Node media = Components
.getComponent(SystemContext.class)
- .getHierarchyManager(MediaModule.REPO)
- .getContentByUUID(mediaUUID);
- NodeData file = media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
- long size = NumberUtils.toLong(file.getAttribute(FileProperties.PROPERTY_SIZE), -1);
+ .getJCRSession(MediaModule.REPO)
+ .getNodeByIdentifier(mediaUUID);
+ Node file = media.getNode(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME);
+
+ long size = -1;
+ if (file.hasProperty(FileProperties.PROPERTY_SIZE))
+ {
+ size = file.getProperty(FileProperties.PROPERTY_SIZE).getLong();
+ }
+
+ // TODO check binary nodedata handling
FtpUtil.upload(
account,
- media.getNodeData(BaseVideoTypeHandler.ORGINAL_NODEDATA_NAME).getStream(),
+ file.getProperty("jcr:data").getValue().getBinary().getStream(),
size,
- this.getUploadFileName(media.getJCRNode()),
+ this.getUploadFileName(media),
new FtpUtil.UploadProgress()
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -43,6 +43,8 @@
* @author dschivo
* @version $Id$
*/
+@SuppressWarnings("deprecation")
+// not to be upgraded, to be rewritten for m5
public class MediaGridColumnType extends AbstractGridColumnType
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,15 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.commands;
-
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.exchange.ExchangeException;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.Rule;
import info.magnolia.context.Context;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
import java.util.ArrayList;
@@ -35,6 +36,7 @@
import java.util.Iterator;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -49,6 +51,8 @@
* @author molaschi
* @version $Id$
*/
+@SuppressWarnings("deprecation")
+// activation APIs need a cleanup in Magnolia, everrything is still based on Content
public class MediaActivationCommand extends ActivationCommand
{
@@ -122,7 +126,7 @@
ExchangeException
{
- activateSingleNode(parentPath, node);
+ activateSingleNode(parentPath, node.getJCRNode());
Iterator<Content> children = node.getChildren(new Content.ContentFilter()
{
@@ -155,36 +159,40 @@
* @throws RepositoryException
* @throws ExchangeException
*/
- protected void activateSingleNode(String parentPath, Content node) throws RepositoryException, ExchangeException
+ protected void activateSingleNode(String parentPath, Node node) throws RepositoryException, ExchangeException
{
- if (MediaConfigurationManager.NT_MEDIA.equals(node.getItemType()) && node.getMetaData().getIsActivated())
+ if (MediaConfigurationManager.NT_MEDIA.equals(node.getPrimaryNodeType().getName())
+ && MetaDataUtil.getMetaData(node).getIsActivated())
{
// already activated media, should deactivate in order to remove stale resolutions
log
.warn(
"Activating already active media {}, will deactivate existing node in order to remove stale resolutions",
- node.getHandle());
+ NodeUtil.getPathIfPossible(node));
- getSyndicator().deactivate(node);
+ getSyndicator().deactivate(info.magnolia.cms.util.ContentUtil.asContent(node));
}
checkFolderActivation(node);
- getSyndicator().activate(parentPath, node, getOrderingInfo(node));
+ getSyndicator().activate(
+ parentPath,
+ info.magnolia.cms.util.ContentUtil.asContent(node),
+ getOrderingInfo(info.magnolia.cms.util.ContentUtil.asContent(node)));
}
/**
* @param node
* @throws ExchangeException
*/
- private void checkFolderActivation(Content node) throws ExchangeException
+ private void checkFolderActivation(Node node) throws ExchangeException
{
try
{
- List<Content> foldersInPath = new ArrayList<Content>(3);
+ List<Node> foldersInPath = new ArrayList<Node>();
- Content parent = node.getParent();
- while (parent.getLevel() != 0 && !parent.getMetaData().getIsActivated())
+ Node parent = node.getParent();
+ while (parent.getDepth() != 0 && !MetaDataUtil.getMetaData(parent).getIsActivated())
{
foldersInPath.add(parent);
parent = parent.getParent();
@@ -193,12 +201,15 @@
if (!foldersInPath.isEmpty())
{
Collections.reverse(foldersInPath);
- for (Content folder : foldersInPath)
+ for (Node folder : foldersInPath)
{
- log.info("Activating parent folder {}", folder.getHandle());
+ log.info("Activating parent folder {}", NodeUtil.getPathIfPossible(folder));
// folder only, no content
setRule(new Rule(new String[]{MgnlNodeType.NT_METADATA, MgnlNodeType.NT_RESOURCE }));
- getSyndicator().activate(folder.getParent().getHandle(), folder, getOrderingInfo(folder));
+ getSyndicator().activate(
+ NodeUtil.getPathIfPossible(folder.getParent()),
+ ContentUtil.asContent(folder),
+ getOrderingInfo(ContentUtil.asContent(folder)));
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaDeactivationCommand.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -43,7 +43,7 @@
{
if (!MediaEl.module().isSingleinstance())
{
- Command cmd = Components.getSingleton(CommandsManager.class).getCommand(
+ Command cmd = Components.getComponent(CommandsManager.class).getCommand(
CommandsManager.DEFAULT_CATALOG,
"deactivate");
return cmd.execute(context);
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-12 13:53:58 UTC (rev 4369)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ImageProcessorsManager.java 2013-10-13 13:43:41 UTC (rev 4370)
@@ -19,18 +19,17 @@
package net.sourceforge.openutils.mgnlmedia.media.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.inject.Singleton;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.processors.FitInAndFillWithBandsImageResolutionProcessor;
@@ -80,7 +79,7 @@
* @version $Id: $
*/
@Singleton
-public class ImageProcessorsManager extends ObservedManager
+public class ImageProcessorsManager extends ObservedManagerAdapter
{
private static final String IMAGE_RESOLUTION_PROCESSORS_NAME = "image-resolution";
@@ -97,7 +96,7 @@
*/
public static ImageProcessorsManager getInstance()
{
- return Components.getSingleton(ImageProcessorsManager.class);
+ return Components.getComponent(ImageProcessorsManager.class);
}
/**
@@ -115,49 +114,71 @@
*/
@SuppressWarnings("unchecked")
@Override
- protected void onRegister(Content parentNode)
+ protected void onRegister(Node parentNode)
{
- for (Iterator iter = ContentUtil.getAllChildren(parentNode).iterator(); iter.hasNext();)
+
+ Iterable<Node> nodes;
+ try
{
- Content processorsNode = (Content) iter.next();
+ nodes = NodeUtil.getNodes(parentNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Error initializing image processor configuration", e);
+ return;
+ }
- for (Iterator iterProcessor = ContentUtil.getAllChildren(processorsNode).iterator(); iterProcessor
- .hasNext();)
+ for (Node processorsNode : nodes)
+ {
+
+ Iterable<Node> processors;
+ try
{
- Content node = (Content) iterProcessor.next();
+ processors = NodeUtil.getNodes(processorsNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ }
+ catch (RepositoryException e)
+ {
+ log
+ .error(
+ "Error initializing image processor configuration for " + NodeUtil.getName(processorsNode),
+ e);
+ continue;
+ }
+ for (Node node : processors)
+ {
try
{
- if (IMAGE_POST_PROCESSORS_NAME.equals(processorsNode.getName()))
+ if (IMAGE_POST_PROCESSORS_NAME.equals(NodeUtil.getName(processorsNode)))
{
- String classNameHandler = NodeDataUtil.getString(node, "class");
+ String classNameHandler = PropertyUtil.getString(node, "class");
Class classHandler = Class.forName(classNameHandler);
if (!ImagePostProcessor.class.isAssignableFrom(classHandler))
{
log.error(
"Error getting post processor for {}: class {} not implements ImagePostProcessor",
- node.getHandle(),
+ NodeUtil.getPathI...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-13 15:34:15
|
Revision: 4372
http://openutils.svn.sourceforge.net/openutils/?rev=4372&view=rev
Author: fgiust
Date: 2013-10-13 15:34:11 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
update APIs
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/NoDefaultBundlesMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/mgnl-bootstrap/messages/config.modules.messages.pages.messagesExtract.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2013-10-13 15:34:11 UTC (rev 4372)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -101,10 +102,16 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>5.0.0</version>
+ <version>5.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltests</artifactId>
+ <version>5.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
<version>1.1.2</version>
</dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -19,26 +19,26 @@
package net.sourceforge.openutils.mgnlmessages.configuration;
-import info.magnolia.cms.beans.config.ObservedManager;
-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.util.ContentUtil;
-import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
+import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.api.ObservedManagerAdapter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import javax.inject.Singleton;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
@@ -49,13 +49,13 @@
* @author molaschi
*/
@Singleton
-public class MessagesConfigurationManager extends ObservedManager
+public class MessagesConfigurationManager extends ObservedManagerAdapter
{
/**
* Folder type
*/
- public static final ItemType FOLDER = ItemType.CONTENT;
+ public static final String FOLDER = MgnlNodeType.NT_CONTENT;
private List<Locale> locales = new ArrayList<Locale>();
@@ -75,66 +75,75 @@
*/
@Override
@SuppressWarnings("unchecked")
- protected void onRegister(Content node)
+ protected void onRegister(Node node)
{
- if (node.getNodeDataCollection() != null)
+ try
{
- locales.clear();
-
- for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();)
+ if (node.hasProperties())
{
- Content langNode = (Content) iter.next();
- locales.add(new Locale(NodeDataUtil.getString(langNode, "language"), NodeDataUtil.getString(
- langNode,
- "country")));
- }
+ locales.clear();
- Collections.sort(locales, new Comparator<Locale>()
- {
+ Iterable<Node> nodes = NodeUtil.getNodes(node, NodeUtil.EXCLUDE_META_DATA_FILTER);
+ for (Node langNode : nodes)
+ {
+ locales.add(new Locale(PropertyUtil.getString(langNode, "language"), PropertyUtil.getString(
+ langNode,
+ "country")));
+ }
- /**
- * {@inheritDoc}
- */
- public int compare(Locale o1, Locale o2)
+ Collections.sort(locales, new Comparator<Locale>()
{
- if (o1.getLanguage().equals(o2.getLanguage()))
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compare(Locale o1, Locale o2)
{
- return o1.getCountry().compareTo(o2.getCountry());
+ if (o1.getLanguage().equals(o2.getLanguage()))
+ {
+ return o1.getCountry().compareTo(o2.getCountry());
+ }
+
+ return o1.getLanguage().compareTo(o2.getLanguage());
}
- return o1.getLanguage().compareTo(o2.getLanguage());
- }
-
- });
+ });
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
}
- public static MessagesConfigurationManager getInstance()
- {
- return (MessagesConfigurationManager) FactoryUtil.getSingleton(MessagesConfigurationManager.class);
- }
-
public static List<Locale> getAvaiableLocales()
{
- return getInstance().getLocales();
+ return Components.getComponent(MessagesConfigurationManager.class).getLocales();
}
@SuppressWarnings("unchecked")
public static List<String> getBaseNames()
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(RepositoryConstants.CONFIG);
+ Session session;
try
{
- Content basenamesNode = mgr.getContent("/modules/messages/basenames");
- if (basenamesNode == null || !basenamesNode.hasChildren(ItemType.CONTENTNODE.getSystemName()))
- {
- return new ArrayList<String>();
- }
+ session = Components.getComponent(SystemContext.class).getJCRSession(RepositoryConstants.CONFIG);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ try
+ {
+ Node basenamesNode = session.getNode("/modules/messages/basenames");
+
+ Iterable<Node> nodes = NodeUtil.getNodes(basenamesNode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
List<String> basenames = new ArrayList<String>();
- for (Iterator it = basenamesNode.getChildren(ItemType.CONTENTNODE.getSystemName()).iterator(); it.hasNext();)
+
+ for (Node bn : nodes)
{
- Content bn = (Content) it.next();
- basenames.add(NodeDataUtil.getString(bn, "basename"));
+ basenames.add(PropertyUtil.getString(bn, "basename"));
}
return basenames;
}
@@ -146,49 +155,35 @@
public static void saveKeyValue(String key, String value, String locale) throws RepositoryException
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MessagesModuleLifecycle.REPO);
+ Session session;
+ try
+ {
+ session = Components.getComponent(SystemContext.class).getJCRSession(MessagesModuleLifecycle.REPO);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+
String path = "/" + StringUtils.replace(key, ".", "/");
- Content content = getOrCreateFullPath(mgr, path);
+ Node content = NodeUtil.createPath(session.getRootNode(), path, MgnlNodeType.NT_CONTENTNODE);
+
if (!StringUtils.isEmpty(locale))
{
- NodeData nd = NodeDataUtil.getOrCreate(content, locale);
if (!StringUtils.isEmpty(value))
{
- nd.setValue(value);
+ content.setProperty(locale, value);
}
else
{
- nd.delete();
+ NodeUtilsExt.deletePropertyIfExist(content, locale);
}
}
- mgr.save();
+ session.save();
}
- private static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
- {
- try
- {
- return mgr.getContent(path);
- }
- catch (RepositoryException ex)
- {
- String parent = StringUtils.substringBeforeLast(path, "/");
- String label = StringUtils.substringAfterLast(path, "/");
- if (!StringUtils.isEmpty(parent))
- {
- getOrCreateFullPath(mgr, parent);
- }
- else
- {
- parent = "/";
- }
-
- return mgr.createContent(parent, label, ItemType.CONTENTNODE.getSystemName());
- }
- }
-
/**
* Returns the locales.
* @return the locales
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -20,13 +20,19 @@
package net.sourceforge.openutils.mgnlmessages.el;
import info.magnolia.cms.beans.config.ServerConfiguration;
-import info.magnolia.cms.i18n.I18nContentSupportFactory;
+import info.magnolia.cms.i18n.I18nContentSupport;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.security.PermissionUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.objectfactory.Components;
+import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
import java.text.MessageFormat;
+import javax.jcr.RepositoryException;
+
import net.sourceforge.openutils.elfunctions.ElStringUtils;
import org.apache.commons.lang.StringEscapeUtils;
@@ -47,20 +53,19 @@
{
if (defaultLocale)
{
- return MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getFallbackLocale()).get(
- key,
- arguments);
+ return MessagesManager
+ .getMessages(Components.getComponent(I18nContentSupport.class).getFallbackLocale())
+ .get(key, arguments);
}
else
{
- String value = MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getLocale()).get(
- key,
- arguments);
+ String value = MessagesManager
+ .getMessages(Components.getComponent(I18nContentSupport.class).getLocale())
+ .get(key, arguments);
if (fallback && (StringUtils.isBlank(value) || StringUtils.startsWith(value, "???")))
{
- return MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getFallbackLocale()).get(
- key,
- arguments);
+ return MessagesManager.getMessages(
+ Components.getComponent(I18nContentSupport.class).getFallbackLocale()).get(key, arguments);
}
return value;
}
@@ -70,27 +75,39 @@
public static String messageSimple(String key, Object[] arguments)
{
- if (MgnlContext.getAggregationState().getMainContent() != null
- && (ServerConfiguration.getInstance().isAdmin() && !MgnlContext.getAggregationState().isPreviewMode())
- && MgnlContext.getAggregationState().getMainContent().isGranted(Permission.WRITE)) // equivalent of
- // CmsFunctions.canEdit()
+ try
{
- String keyCssClass = StringUtils.replace(key, ".", "_");
+ if (MgnlContext.getAggregationState().getMainContent() != null
+ && (Components.getComponent(ServerConfiguration.class).isAdmin() && !MgnlContext
+ .getAggregationState()
+ .isPreviewMode())
+ && PermissionUtil.isGranted(MgnlUtilsDeprecatedAdapters.getMainContent(), Permission.WRITE))
+ {
- String tag = MessageFormat.format(MSGS_TPL, keyCssClass, key, I18nContentSupportFactory
- .getI18nSupport()
- .getLocale(), I18nContentSupportFactory.getI18nSupport().getFallbackLocale(),
- // evito di sostituire i placeholder quando sono in
- // edit-mode
- // StringEscapeUtils.escapeHtml(message(key, false, true,
- // arguments)),
- StringEscapeUtils.escapeHtml(message(key, false, true)),
- // evito di sostituire i placeholder quando sono in
- // edit-mode
- // message(key, false, false, arguments));
- message(key, false, false));
- return tag;
+ String keyCssClass = StringUtils.replace(key, ".", "_");
+
+ String tag = MessageFormat.format(
+ MSGS_TPL,
+ keyCssClass,
+ key,
+ Components.getComponent(I18nContentSupport.class).getLocale(),
+ Components.getComponent(I18nContentSupport.class).getFallbackLocale(),
+ // evito di sostituire i placeholder quando sono in
+ // edit-mode
+ // StringEscapeUtils.escapeHtml(message(key, false, true,
+ // arguments)),
+ StringEscapeUtils.escapeHtml(message(key, false, true)),
+ // evito di sostituire i placeholder quando sono in
+ // edit-mode
+ // message(key, false, false, arguments));
+ message(key, false, false));
+ return tag;
+ }
}
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
return message(key, true, false, arguments);
}
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -19,12 +19,11 @@
package net.sourceforge.openutils.mgnlmessages.i18n;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.AbstractMessagesImpl;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.cms.util.ObservationUtil;
-import info.magnolia.context.MgnlContext;
+import info.magnolia.context.SystemContext;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.Iterator;
@@ -32,9 +31,11 @@
import java.util.Locale;
import java.util.MissingResourceException;
+import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.PropertyIterator;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.observation.EventIterator;
import javax.jcr.observation.EventListener;
@@ -89,22 +90,22 @@
try
{
String handle = StringUtils.replace(key, ".", "/");
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(
+ Session hm = Components.getComponent(SystemContext.class).getJCRSession(
MessagesConfigurationManager.MESSAGES_REPO);
- Content c = hm.getContent(handle);
+ Node c = hm.getNode(handle);
String locale1 = this.locale.getLanguage() + "_" + this.locale.getCountry();
String locale2 = this.locale.getLanguage();
- if (c == null || (!c.hasNodeData(locale1) && !c.hasNodeData(locale2)))
+ if (c == null || (!c.hasProperty(locale1) && !c.hasProperty(locale2)))
{
return "???" + key + "???";
}
- if (c.hasNodeData(locale1))
+ if (c.hasProperty(locale1))
{
- return NodeDataUtil.getString(c, locale1);
+ return PropertyUtil.getString(c, locale1);
}
else
{
- return NodeDataUtil.getString(c, locale2);
+ return PropertyUtil.getString(c, locale2);
}
}
catch (MissingResourceException e)
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/SimpleMessagesImpl.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -22,6 +22,7 @@
import info.magnolia.cms.i18n.AbstractMessagesImpl;
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.cms.util.ClasspathResourcesUtil;
+import info.magnolia.objectfactory.Components;
import java.io.IOException;
import java.io.InputStream;
@@ -103,7 +104,7 @@
stream = ClasspathResourcesUtil.getStream("/"
+ StringUtils.replace(basename, ".", "/")
+ "_"
- + MessagesManager.getInstance().getDefaultLocale().getLanguage()
+ + Components.getComponent(MessagesManager.class).getDefaultLocale().getLanguage()
+ ".properties", false);
}
if (stream == null)
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/lifecycle/MessagesModuleLifecycle.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -22,6 +22,7 @@
import info.magnolia.cms.i18n.MessagesManager;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.objectfactory.Components;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import org.slf4j.Logger;
@@ -47,9 +48,9 @@
public void start(ModuleLifecycleContext ctx)
{
log.info("Starting module messages");
- ctx.registerModuleObservingComponent("locales", MessagesConfigurationManager.getInstance());
+ ctx.registerModuleObservingComponent("locales", Components.getComponent(MessagesConfigurationManager.class));
- MessagesManager.getInstance().init();
+ Components.getComponent(MessagesManager.class).init();
}
/**
Deleted: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-10-13 13:46:57 UTC (rev 4371)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/ExtractMessagesFromDialogsPage.java 2013-10-13 15:34:11 UTC (rev 4372)
@@ -1,231 +0,0 @@
-/**
- *
- * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
- * Copyright(C) 2008-2013, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * 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 net.sourceforge.openutils.mgnlmessages.pages;
-
-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.search.Query;
-import info.magnolia.cms.core.search.QueryManager;
-import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.cms.util.ContentUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
-import info.magnolia.module.admininterface.TemplatedMVCHandler;
-import info.magnolia.repository.RepositoryConstants;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.jcr.RepositoryException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author molaschi
- * @version $Id: $
- */
-public class ExtractMessagesFromDialogsPage extends TemplatedMVCHandler
-{
-
- private List<String> dialogsRoot;
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(ExtractMessagesFromDialogsPage.class);
-
- /**
- * @param name
- * @param request
- * @param response
- */
- public ExtractMessagesFromDialogsPage(String name, HttpServletRequest request, HttpServletResponse response)
- {
- super(name, request, response);
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- @Override
- public String show()
- {
- dialogsRoot = new ArrayList<String>();
- QueryManager qm = MgnlContext.getQueryManager(RepositoryConstants.CONFIG);
- Query q;
- try
- {
- q = qm.createQuery("//dialogs", Query.XPATH);
-
- QueryResult qr = q.execute();
- Collection<Content> dialogs = qr.getContent();
- for (Content dialog : dialogs)
- {
- dialogsRoot.add(dialog.getHandle());
- }
-
- q = qm.createQuery("//paragraphs", Query.XPATH);
-
- qr = q.execute();
- dialogs = qr.getContent();
- for (Content dialog : dialogs)
- {
- dialogsRoot.add(dialog.getHandle());
- }
- }
- catch (RepositoryException e)
- {
- // ignore
- }
-
- return super.show();
- }
-
- /**
- * Extract messages keys
- * @return view
- */
- public String extract()
- {
- HierarchyManager hmConfig = MgnlContext.getHierarchyManager(RepositoryConstants.CONFIG);
- QueryManager qm = hmConfig.getQueryManager();
- HierarchyManager hm = MgnlContext.getHierarchyManager(MessagesModuleLifecycle.REPO);
- for (String dialogRoot : this.request.getParameterValues("dialogsRoots"))
- {
- try
- {
- doExtraction(dialogRoot, "label", qm, hm, hmConfig);
- }
- catch (RepositoryException e)
- {
- log.error("Error extracting labels from dialogs and paragraphs", e);
- }
-
- try
- {
- doExtraction(dialogRoot, "description", qm, hm, hmConfig);
- }
- catch (RepositoryException e)
- {
- log.error("Error extracting description from dialogs and paragraphs", e);
- }
-
- try
- {
- doExtraction(dialogRoot, "title", qm, hm, hmConfig);
- }
- catch (RepositoryException e)
- {
- log.error("Error extracting description from dialogs and paragraphs", e);
- }
- }
-
- return this.show();
- }
-
- @SuppressWarnings("unchecked")
- private void doExtraction(String root, String property, QueryManager qm, HierarchyManager hmMessages,
- HierarchyManager hmConfig) throws RepositoryException
- {
- Query q = qm.createQuery(root.substring(1) + "//*[@" + property + "]", Query.XPATH);
-
- QueryResult qr = q.execute();
- Collection<Content> labelParents = new ArrayList<Content>();
- labelParents.addAll(qr.getContent(ItemType.CONTENTNODE.getSystemName()));
- labelParents.addAll(qr.getContent(ItemType.CONTENT.getSystemName()));
- for (Content labelParent : labelParents)
- {
- NodeData labelNd = labelParent.getNodeData(property);
- String label = labelNd.getString();
- if (!StringUtils.isEmpty(label) && MgnlContext.getMessages().get(label).startsWith("???"))
- {
- String parentPath = labelParent.getHandle();
- parentPath = StringUtils.replace(parentPath, "/modules", "");
- Content parent = getOrCreateFullPath(hmMessages, parentPath);
- Content message = ContentUtil.getOrCreateContent(parent, property, ItemType.CONTENTNODE);
- NodeData nd = NodeDataUtil.getOrCreate(message, "en");
- nd.setValue(label);
- nd = NodeDataUtil.getOrCreate(message, "it");
- nd.setValue(label);
-
- String messageKey = message.getHandle().substring(1);
- messageKey = StringUtils.replace(messageKey, "/", ".");
- labelNd.setValue(messageKey);
- }
- }
- hmMessages.save();
- hmConfig.save();
- }
-
- private Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
- {
- try
- {
- return mgr.getContent(path);
- }
- catch (RepositoryException ex)
- {
- String parent = StringUtils.substringBeforeLast(path, "/");
- String label = StringUtils.substringAfterLast(path, "/");
- if (!StringUtils.isEmpty(parent))
- {
- getOrCreateFullPath(mgr, parent);
- }
- else
- {
- parent = "/";
- ...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-13 20:39:32
|
Revision: 4377
http://openutils.svn.sourceforge.net/openutils/?rev=4377&view=rev
Author: fgiust
Date: 2013-10-13 20:39:28 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
migration fixes
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -248,10 +248,29 @@
Integer width = NumberUtils.toInt(PropertyUtil.getString(prop, FileProperties.PROPERTY_WIDTH));
Integer height = NumberUtils.toInt(PropertyUtil.getString(prop, FileProperties.PROPERTY_HEIGHT));
Point size = ImageUtils.parseForSize(resolution);
+
+ boolean isSameSizeAsOriginal = false;
if (width == size.x && height == size.y)
{
- return appendBaseUrl(mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH));
+ isSameSizeAsOriginal = true;
}
+
+ if (!isSameSizeAsOriginal)
+ {
+ char controlchar = StringUtils.lowerCase(resolution).charAt(0);
+ if (controlchar == 'l')
+ {
+ if ((width == size.x && height < size.y) || (width < size.x && height == size.y))
+ {
+ isSameSizeAsOriginal = true;
+ }
+ }
+ }
+
+ if (isSameSizeAsOriginal)
+ {
+ return appendBaseUrl(mcm.getURIMappingPrefix() + NodeUtilsExt.getBinaryPath(prop));
+ }
}
if (!ImageUtils.checkOrCreateResolution(media, resolution, null, module().isLazyResolutionCreation()))
@@ -263,7 +282,7 @@
String resString = "res-" + ImageUtils.getResolutionPath(resolution);
if (resolutions != null && resolutions.hasNode(resString))
{
- String resPath = PropertyUtil.getString(resolutions.getNode(resString), FileProperties.PATH);
+ String resPath = NodeUtilsExt.getBinaryPath(resolutions.getNode(resString));
return appendBaseUrl(mcm.getURIMappingPrefix() + resPath);
@@ -580,10 +599,19 @@
private static String appendBaseUrl(String url)
{
- String baseurl = module().getBaseurl();
- if (baseurl != null && StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
+
+ if (StringUtils.isNotEmpty(url) && !StringUtils.contains(url, "://"))
{
- return baseurl + url;
+ if (MgnlContext.isWebContext())
+ {
+ url = StringUtils.defaultString(MgnlContext.getWebContext().getContextPath()) + url;
+ }
+
+ String baseurl = module().getBaseurl();
+ if (baseurl != null)
+ {
+ return baseurl + url;
+ }
}
return url;
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -84,46 +84,34 @@
{
Node data = getOriginalFileNodeData(media);
- try
+
+ if (StringUtils.equalsIgnoreCase(PropertyUtil.getString(data, FileProperties.EXTENSION), "pdf"))
{
- if (NodeUtil.isNodeType(data, NodeType.NT_RESOURCE))
+
+ try
{
+ String filename = PropertyUtil.getString(data, FileProperties.PROPERTY_FILENAME) + ".png";
- if (StringUtils.equalsIgnoreCase(PropertyUtil.getString(data, FileProperties.EXTENSION), "pdf"))
+ InputStream stream = data.getProperty(MgnlNodeType.JCR_DATA).getValue().getBinary().getStream();
+ try
{
-
- try
- {
- String filename = PropertyUtil.getString(data, FileProperties.PROPERTY_FILENAME) + ".png";
-
- InputStream stream = getOriginalFileNodeData(data)
- .getProperty(MgnlNodeType.JCR_DATA)
- .getValue()
- .getBinary()
- .getStream();
- try
- {
- createPdfPreview(media, stream, filename);
- }
- finally
- {
- IOUtils.closeQuietly(stream);
- }
- }
- catch (Throwable e)
- {
- log.warn(
- "Unable to generate a preview for {} due to a {}: {}",
- new Object[]{NodeUtil.getPathIfPossible(media), e.getClass().getName(), e.getMessage() });
- }
+ createPdfPreview(media, stream, filename);
}
-
+ finally
+ {
+ IOUtils.closeQuietly(stream);
+ }
}
+ catch (Throwable e)
+ {
+ log.warn("Unable to generate a preview for "
+ + NodeUtil.getPathIfPossible(media)
+ + " due to a "
+ + e.getClass().getName()
+ + ": "
+ + e.getMessage());
+ }
}
- catch (RepositoryException e)
- {
- // do nothing
- }
return super.onPostSave(media);
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -84,7 +84,7 @@
{
try
{
- return media.hasProperty(PREVIEW_NODEDATA_NAME);
+ return media.hasNode(PREVIEW_NODEDATA_NAME);
}
catch (RepositoryException e)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-10-13 20:39:28 UTC (rev 4377)
@@ -118,7 +118,7 @@
<c:if test="${empty alt}">
<c:set var="alt" value="${mediaNode.title}" />
</c:if>
- <![CDATA[<img src="${pageContext.request.contextPath}${url}" alt="${alt}" title="${alt}"]]>
+ <![CDATA[<img src="${url}" alt="${alt}" title="${alt}"]]>
<c:if test="${not empty id}">
<![CDATA[ id="${id}"]]>
</c:if>
@@ -199,11 +199,11 @@
</c:choose>
<c:if test="${!empty preview}">
- <c:set var="preview" value="${pageContext.request.contextPath}${preview}" />
+ <c:set var="preview" value="${preview}" />
</c:if>
<media:swfobject
- player="${pageContext.request.contextPath}${media:url(mediaNode)}"
+ player="${media:url(mediaNode)}"
width="${width gt 0 ? width : ''}"
height="${height gt 0? height : ''}"
image="${preview}"
@@ -219,7 +219,7 @@
<![CDATA[<!-- missing media: ${item} -->]]>
</c:when>
<c:when test="${fn:startsWith(item, '/')}">
- <![CDATA[<img src="${pageContext.request.contextPath}${item}" alt="" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />]]>
+ <![CDATA[<img src="${item}" alt="" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" />]]>
</c:when>
<c:otherwise>
<![CDATA[<!-- missing media: ${item} -->]]>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2013-10-13 20:39:28 UTC (rev 4377)
@@ -41,7 +41,6 @@
<c:set var="baseUrl" scope="request">
<jsp:text>${pageContext.request.scheme}://${pageContext.request.serverName}</jsp:text>
<c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
- <jsp:text>${pageContext.request.contextPath}</jsp:text>
</c:set>
<c:if test="${empty width or width eq 0 }">
<c:set var="width" value="${media:width(mediaNode)}" />
@@ -68,10 +67,10 @@
<c:choose>
<c:when test="${previewwidth gt 0 and previewheight gt 0}">
<c:set var="previewres" value="${previewwidth}x${previewheight}" />
- <c:set var="preview" value="${pageContext.request.contextPath}${media:urlres(mediaNode, previewres)}" />
+ <c:set var="preview" value="${media:urlres(mediaNode, previewres)}" />
</c:when>
<c:otherwise>
- <c:set var="preview" value="${pageContext.request.contextPath}${media:thumbnail(mediaNode)}" />
+ <c:set var="preview" value="${media:thumbnail(mediaNode)}" />
</c:otherwise>
</c:choose>
</c:if>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.templates.pages.sampleSimpleMedia.xml 2013-10-13 20:39:28 UTC (rev 4377)
@@ -13,10 +13,10 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
+ <sv:value>freemarker</sv:value>
</sv:property>
<sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-media/template.jsp</sv:value>
+ <sv:value>/samples-media/template.ftl</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>SimpleMedia sample template</sv:value>
@@ -41,7 +41,7 @@
<sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2012-04-10T10:03:46.018+02:00</sv:value>
+ <sv:value>2013-10-13T21:16:25.602+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="areas">
@@ -90,9 +90,6 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/templates/samples-media/area.jsp</sv:value>
- </sv:property>
<sv:property sv:name="type" sv:type="String">
<sv:value>list</sv:value>
</sv:property>
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/area.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -1,9 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <c:forEach var="component" items="${components}">
- <cms:component content="${component}" />
- </c:forEach>
-</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -2,60 +2,65 @@
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8"
- session="false" />
- <div class="textImage"><c:set var="mediaNode"
- value="${media:node(content.media)}" />
- <div>
- <h3>Original image</h3>
- <div><pre>media:url(mediaNode)</pre> <img
- src="${pageContext.request.contextPath}${media:url(mediaNode)}" /></div>
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <div class="textImage">
+ <c:set var="mediaNode" value="${media:node(content.media)}" />
+ <div>
+ <h3>Original image</h3>
+ <div>
+ <pre>media:url(mediaNode)</pre>
+ <img src="${media:url(mediaNode)}" />
+ </div>
+ </div>
+ <div>
+ <h3>100x100: resize image in order to contain required resolution (100x100) and crop outfitting simmetric bands.
+ Resulting image has the required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, '100x100')</pre>
+ <img src="${media:urlres(mediaNode, '100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>L100x100: resize image in order to fit into required resolution. Resulting image should have one side smaller
+ than required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'l100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'l100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>o100x100: resize image in order to fit into required resolution and fills empty bands with background color
+ (default = White). Resulting image has the required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'o100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'o100x100')}" />
+ </div>
+ <div>
+ <p>With background color</p>
+ <pre>media:urlres(mediaNode, 'o100x100;background=FF0000')</pre>
+ <img src="${media:urlres(mediaNode, 'o100x100;background=FF0000')}" />
+ </div>
+ </div>
+ <div>
+ <h3>n100x100: resize image in order to contain the required resolution. Resulting image should have one side
+ bigger than required resolution.
+ </h3>
+ <div>
+ <pre>media:urlres(mediaNode, 'n100x100')</pre>
+ <img src="${media:urlres(mediaNode, 'n100x100')}" />
+ </div>
+ </div>
+ <div>
+ <h3>Passing parameters: resolution string supports optional parameters that may enable post processing.
+ </h3>
+ <div>
+ <p>Adding parameter bw will make the image in grayscale</p>
+ <pre>media:urlres(mediaNode, 'n100x100;bw')</pre>
+ <img src="${media:urlres(mediaNode, 'n100x100;bw')}" />
+ </div>
+ </div>
</div>
- <div>
- <h3>100x100: resize image in order to contain required resolution
- (100x100) and crop outfitting simmetric bands. Resulting image has the
- required resolution.</h3>
- <div><pre>media:urlres(mediaNode, '100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, '100x100')}" />
- </div>
- </div>
- <div>
- <h3>L100x100: resize image in order to fit into required
- resolution. Resulting image should have one side smaller than required
- resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'l100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'l100x100')}" />
- </div>
- </div>
- <div>
- <h3>o100x100: resize image in order to fit into required
- resolution and fills empty bands with background color (default =
- White). Resulting image has the required resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'o100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o100x100')}" />
- </div>
- <div>
- <p>With background color</p>
- <pre>media:urlres(mediaNode, 'o100x100;background=FF0000')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'o100x100;background=FF0000')}" />
- </div>
- </div>
- <div>
- <h3>n100x100: resize image in order to contain the required
- resolution. Resulting image should have one side bigger than required
- resolution.</h3>
- <div><pre>media:urlres(mediaNode, 'n100x100')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100')}" />
- </div>
- </div>
- <div>
- <h3>Passing parameters: resolution string supports optional
- parameters that may enable post processing.</h3>
- <div>
- <p>Adding parameter bw will make the image in grayscale</p>
- <pre>media:urlres(mediaNode, 'n100x100;bw')</pre> <img
- src="${pageContext.request.contextPath}${media:urlres(mediaNode, 'n100x100;bw')}" />
- </div>
- </div>
- </div>
</jsp:root>
\ No newline at end of file
Deleted: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/template.jsp 2013-10-13 20:39:28 UTC (rev 4377)
@@ -1,25 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:mu="mgnlutils">
- <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <jsp:text>
- <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
- </jsp:text>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>${content.title}</title>
- <cms:init />
- <link rel="stylesheet" type="text/css"
- href="${pageContext.request.contextPath}/.resources/media-samples/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/media-samples.css" />
- </head>
- <body>
- <div class="container">
- <h1>${content.title}</h1>
- <cms:area name="main" />
- </div>
- </body>
- </html>
-</jsp:root>
\ No newline at end of file
Added: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl 2013-10-13 20:39:28 UTC (rev 4377)
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>${content.title}</title>
+ [@cms.init /]
+ <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/media-samples/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/media-samples.css" />
+ </head>
+ <body>
+ <div class="container">
+ <h1>${content.title}</h1>
+ [@cms.area name="main" /]
+ </div>
+ </body>
+</html>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 19:12:57 UTC (rev 4376)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java 2013-10-13 20:39:28 UTC (rev 4377)
@@ -211,4 +211,13 @@
// TODO introduce configured wrapping
return node;
}
+
+ public static String getBinaryPath(Node node)
+ {
+ if (node == null)
+ {
+ return null;
+ }
+ return NodeUtil.getPathIfPossible(node) + "/" + PropertyUtil.getString(node, "fileName");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-19 12:13:19
|
Revision: 4385
http://openutils.svn.sourceforge.net/openutils/?rev=4385&view=rev
Author: fgiust
Date: 2013-10-19 12:13:16 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
ignores
Removed Paths:
-------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/dms/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-contextmenu/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-controls/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-expressions/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-lms/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-media/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-mobile/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-stripes/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-struts11/
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/templates/samples-tagcloud/
Property Changed:
----------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/
magnoliamodules/trunk/magnolia5-test-webapp/
Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp 2013-10-19 12:13:16 UTC (rev 4385)
Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+samples
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/config.modules.samples.templates.pages.samplesMagnoliaUtils.xml 2013-10-19 12:13:16 UTC (rev 4385)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samplesMagnoliaUtils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>da5823f7-dac4-4a6f-a769-a09e95601f44</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>info.magnolia.module.samples.templates.SampleTemplate</sv:value>
- </sv:property>
- <sv:property sv:name="i18nBasename" sv:type="String">
- <sv:value>info.magnolia.module.samples.messages</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="renderType" sv:type="String">
- <sv:value>jsp</sv:value>
- </sv:property>
- <sv:property sv:name="templateScript" sv:type="String">
- <sv:value>/template_magnoliautils/magnoliaUtils.jsp</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Sample Magnoliautils</sv:value>
- </sv:property>
- <sv:property sv:name="titleSize" sv:type="String">
- <sv:value>1</sv:value>
- </sv:property>
- <sv:property sv:name="visible" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2008-09-23T16:56:46.344+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:46:42.181+02:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="parameters">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>6dba0719-7b5c-4991-9eeb-4193a0b8b6db</sv:value>
- </sv:property>
- <sv:property sv:name="dummy" sv:type="String">
- <sv:value>This parameter has been set in the template definition</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-01-15T12:21:10.608+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:46:04.237+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Deleted: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-19 12:13:16 UTC (rev 4385)
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="Magnolia-Utils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>9854e9ac-0cde-4a3a-b019-e95a8634207c</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:47:38.973+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="Magnolia-Utils">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>ce2e0ee4-97bc-4a28-ab36-9283dd39af2e</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils Test page 1</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:47:41.964+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="Magnolia-Utils0">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>f064acbd-0eb1-44f8-b2a4-f561dd49c805</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils Test page 1b</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:48:00.030+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="newcontent">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7766ee9e-bcbe-4f8f-951f-07a57823f03c</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.602+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="0">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>ef4fe54e-a6f9-4ab6-980a-2395a4a6e194</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="text" sv:type="String">
- <sv:value><p><strong>Lorem Ipsum</strong> is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever si</p></sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Paragraph test</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samplesHowToJSP</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7c158483-8813-47b5-b176-643694dbc857</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
- <sv:node sv:name="Magnolia-Utils-page2">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>e1285f01-769e-4791-b9de-afcb8771fdc8</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="title" sv:type="String">
- <sv:value>Magnolia Utils Test page 2</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:10:07.718+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-05-19T19:47:48.730+02:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples:pages/samplesMagnoliaUtils</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Index: magnoliamodules/trunk/magnolia5-test-webapp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp 2013-10-19 12:11:24 UTC (rev 4384)
+++ magnoliamodules/trunk/magnolia5-test-webapp 2013-10-19 12:13:16 UTC (rev 4385)
Property changes on: magnoliamodules/trunk/magnolia5-test-webapp
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-20 08:31:46
|
Revision: 4392
http://openutils.svn.sourceforge.net/openutils/?rev=4392&view=rev
Author: fgiust
Date: 2013-10-20 08:31:41 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
working node wrapping, refactored list of references in media interface
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,10 +1,11 @@
package info.magnolia.module.development;
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
import info.magnolia.module.DefaultModuleVersionHandler;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.SetPropertyTask;
import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
import it.openutils.mgnltasks.NodeSortTask;
@@ -28,7 +29,8 @@
{
List<Task> tasks = new ArrayList<Task>();
- boolean develop = SystemProperty.getBooleanProperty("magnolia.develop");
+ boolean develop = Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+ "magnolia.develop");
if (develop)
{
@@ -37,12 +39,13 @@
"/server/activation/subscribers/magnoliaPublic8080",
"active",
"false"));
-
}
// I hate spending time in looking through the unsorted list of modules...
tasks.add(new NodeSortTask(RepositoryConstants.CONFIG, "/modules"));
+ // tasks.add(new SetPropertyTask("config", "/server/1i8n/content", "enabled", "true"));
+
return tasks;
}
}
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/website.sample-lms.xml
===================================================================
(Binary files differ)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -68,6 +68,8 @@
private Map<String, AdvancedResult> usedInNodes = new HashMap<String, AdvancedResult>();
+ private Integer numberOfReferences;
+
private boolean canPublish;
private boolean writable;
@@ -409,4 +411,15 @@
{
this.icon = icon;
}
+
+ public Integer getNumberOfReferences()
+ {
+ return numberOfReferences;
+ }
+
+ public void setNumberOfReferences(Integer numberOfReferences)
+ {
+ this.numberOfReferences = numberOfReferences;
+ }
+
}
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBeanBuilder.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -108,6 +108,13 @@
mb.setUsedInWebPages(workspacePaths.get(RepositoryConstants.WEBSITE));
mb.setUsedInNodes(workspacePaths);
+ int count = 0;
+ for (AdvancedResult wp : workspacePaths.values())
+ {
+ count += wp.getTotalSize();
+ }
+ mb.setNumberOfReferences(count);
+
}
catch (RepositoryException ex)
{
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-20 08:31:41 UTC (rev 4392)
@@ -33,6 +33,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.admininterface.commands.ActivationCommand;
import info.magnolia.objectfactory.Components;
+import info.magnolia.templating.functions.TemplatingFunctions;
import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
@@ -511,7 +512,9 @@
{
return null;
}
- MediaTypeConfiguration mtc = Components.getComponent(MediaConfigurationManager.class).getMediaTypeConfigurationFromMedia(media);
+ MediaTypeConfiguration mtc = Components
+ .getComponent(MediaConfigurationManager.class)
+ .getMediaTypeConfigurationFromMedia(media);
String url = mtc.getHandler().getUrl(media);
String filename = mtc.getHandler().getFullFilename(media);
@@ -896,4 +899,9 @@
{
return MediaEl.module().getVersion();
}
+
+ public String link(Node node)
+ {
+ return Components.getComponent(TemplatingFunctions.class).link(node);
+ }
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-media.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -6,10 +6,16 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>60c72833-f536-47e1-949e-9056d9df234b</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -45,6 +51,9 @@
<sv:property sv:name="controlType" sv:type="String">
<sv:value>tab</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -52,6 +61,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -82,8 +94,11 @@
<sv:value>f18a9c1e-3318-469b-ba2a-32304dee949b</sv:value>
</sv:property>
<sv:property sv:name="controlType" sv:type="String">
- <sv:value>mediaSelection</sv:value>
+ <sv:value>media</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -94,6 +109,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -113,7 +131,7 @@
<sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2009-12-30T16:10:29.544+01:00</sv:value>
+ <sv:value>2013-10-19T23:54:25.789+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/config.modules.media.dialogs.samples-mediatag.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -6,10 +6,16 @@
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>fc6446c7-1f4a-4256-9435-d0fb708abad8</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -45,6 +51,9 @@
<sv:property sv:name="controlType" sv:type="String">
<sv:value>tab</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -52,6 +61,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -82,8 +94,11 @@
<sv:value>5bdc5aea-5de8-4ef4-9a80-0aa7140241c0</sv:value>
</sv:property>
<sv:property sv:name="controlType" sv:type="String">
- <sv:value>mediaSelection</sv:value>
+ <sv:value>media</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Media</sv:value>
</sv:property>
@@ -97,6 +112,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:Data" sv:type="String">
<sv:value>MetaData</sv:value>
</sv:property>
@@ -116,7 +134,7 @@
<sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-18T16:41:03.781+01:00</sv:value>
+ <sv:value>2013-10-19T23:54:19.766+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2013-10-20 08:31:41 UTC (rev 4392)
@@ -5,7 +5,7 @@
<title>${this.path!?html!""}</title>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion}" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion!}" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/mooSelecta.css" />
<!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
@@ -537,18 +537,21 @@
[/#if]
</ul>
</div>
- [#if media.usedInWebPages?size = 0]
+ [#if media.numberOfReferences = 0]
<span>${this.msgs.get('media.nopages')}</span>
[#else]
- <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
+ <span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages.totalSize})</span>
<div class="pages menu" style="display: none;">
<ul class="mediamenu medialinks">
- [#list media.usedInUris as uri]
- <li>
- <a href="${this.request.contextPath}${uri}" target="_blank">
- ${uri}
- </a>
- </li>
+ [#list media.usedInNodes?keys as key]
+ [#list media.usedInNodes?values[key_index].items as node]
+ <li>
+ [#assign link = this.link(node)]
+ <a href="${this.request.contextPath}${link}" target="_blank">
+ ${link}
+ </a>
+ </li>
+ [/#list]
[/#list]
</ul>
</div>
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="tags" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>94da4810-7417-43eb-b39b-010e8e1dbe63</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/</sv:value>
+ </sv:property>
+ <sv:property sv:name="propertyName" sv:type="String">
+ <sv:value>tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>website</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-02T17:58:45.701+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-01T09:44:39.510+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.tags.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml 2013-10-19 21:38:17 UTC (rev 4391)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.clouds.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="clouds" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>4730afb7-3548-4026-997b-0f2df4ad8357</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-03-09T16:04:19.602+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-09T16:04:23.928+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="tags">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>94da4810-7417-43eb-b39b-010e8e1dbe63</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="path" sv:type="String">
- <sv:value>/</sv:value>
- </sv:property>
- <sv:property sv:name="propertyName" sv:type="String">
- <sv:value>tags</sv:value>
- </sv:property>
- <sv:property sv:name="repository" sv:type="String">
- <sv:value>website</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-02T17:58:45.701+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-01T09:44:39.510+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
-</sv:node>
Added: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/config.modules.tagcloud.dialogs.sample-tagcloud.xml 2013-10-20 08:31:41 UTC (rev 4392)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="sample-tagcloud" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>dfdabce9-2d1a-4606-90f8-e627bee271c2</sv:value>
+ </sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>800</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>General</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>800</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-03-19T09:55:33.575+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-09T16:37:52.622+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGeneral">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>ee025e3f-6ee0-45cb-9400-ee0391fb5ff2</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Properties</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2009-03-19T09:55:51.980+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-03-09T16:37:57.194+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="title">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d5003a4c-76fd-4b4d-8aba-e471ff7fee80</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18n" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Title</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2013-10-19T23:59:00.811+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-20T00:00:01.025+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="tags">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>0b3d54fb-17ee-469b-b731-834ea2ae8755</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tagcloud</sv:value>
+ </sv:property>
+ <sv:property sv:name="description" sv:type="String">
+ <sv:value>Start insert your tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="tagCloudName" sv:type="String">
+ <sv:value>tags</sv:value>
+ </sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>300</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:t...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-20 10:35:54
|
Revision: 4394
http://openutils.svn.sourceforge.net/openutils/?rev=4394&view=rev
Author: fgiust
Date: 2013-10-20 10:35:42 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
update page nodetypes in samples/test
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Criteria.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.contains.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.escape-sign.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.letters.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.myproject.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.pets.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediausedin.entries.website.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-bootstrap-samples/tagcloud/website.sample-tagcloud.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/website.letters.xml
magnoliamodules/trunk/openutils-mgnltests/src/test/resources/utils-bootstrap/website.pets.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml
magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-bootstrap/website.letters.xml
magnoliamodules/trunk/openutils-mgnlutils/src/test/resources/utils-bootstrap/website.pets.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="Criteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
</sv:node>
<sv:node sv:name="pets">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -73,7 +73,7 @@
</sv:node>
<sv:node sv:name="cats">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -109,7 +109,7 @@
</sv:node>
<sv:node sv:name="1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -152,7 +152,7 @@
</sv:node>
<sv:node sv:name="7">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -195,7 +195,7 @@
</sv:node>
<sv:node sv:name="8">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -238,7 +238,7 @@
</sv:node>
<sv:node sv:name="13">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -282,7 +282,7 @@
</sv:node>
<sv:node sv:name="dogs">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -318,7 +318,7 @@
</sv:node>
<sv:node sv:name="3">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -361,7 +361,7 @@
</sv:node>
<sv:node sv:name="4">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -404,7 +404,7 @@
</sv:node>
<sv:node sv:name="10">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -447,7 +447,7 @@
</sv:node>
<sv:node sv:name="12">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -491,7 +491,7 @@
</sv:node>
<sv:node sv:name="lizards">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -527,7 +527,7 @@
</sv:node>
<sv:node sv:name="5">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -571,7 +571,7 @@
</sv:node>
<sv:node sv:name="snakes">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -607,7 +607,7 @@
</sv:node>
<sv:node sv:name="6">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -651,7 +651,7 @@
</sv:node>
<sv:node sv:name="birds">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -687,7 +687,7 @@
</sv:node>
<sv:node sv:name="9">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -730,7 +730,7 @@
</sv:node>
<sv:node sv:name="11">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -774,7 +774,7 @@
</sv:node>
<sv:node sv:name="hamsters">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -810,7 +810,7 @@
</sv:node>
<sv:node sv:name="2">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="test-MEDIA-113" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Criteria.xml 2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="Criteria" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
</sv:node>
<sv:node sv:name="pets">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -73,7 +73,7 @@
</sv:node>
<sv:node sv:name="cats">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -109,7 +109,7 @@
</sv:node>
<sv:node sv:name="1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -152,7 +152,7 @@
</sv:node>
<sv:node sv:name="7">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -195,7 +195,7 @@
</sv:node>
<sv:node sv:name="8">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -238,7 +238,7 @@
</sv:node>
<sv:node sv:name="13">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -282,7 +282,7 @@
</sv:node>
<sv:node sv:name="dogs">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -318,7 +318,7 @@
</sv:node>
<sv:node sv:name="3">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -361,7 +361,7 @@
</sv:node>
<sv:node sv:name="4">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -404,7 +404,7 @@
</sv:node>
<sv:node sv:name="10">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -447,7 +447,7 @@
</sv:node>
<sv:node sv:name="12">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -491,7 +491,7 @@
</sv:node>
<sv:node sv:name="lizards">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -527,7 +527,7 @@
</sv:node>
<sv:node sv:name="5">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -571,7 +571,7 @@
</sv:node>
<sv:node sv:name="snakes">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -607,7 +607,7 @@
</sv:node>
<sv:node sv:name="6">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -651,7 +651,7 @@
</sv:node>
<sv:node sv:name="birds">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -687,7 +687,7 @@
</sv:node>
<sv:node sv:name="9">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -730,7 +730,7 @@
</sv:node>
<sv:node sv:name="11">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -774,7 +774,7 @@
</sv:node>
<sv:node sv:name="hamsters">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -810,7 +810,7 @@
</sv:node>
<sv:node sv:name="2">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="Magnolia-Utils" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -37,7 +37,7 @@
</sv:node>
<sv:node sv:name="Magnolia-Utils">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -76,7 +76,7 @@
</sv:node>
<sv:node sv:name="Magnolia-Utils0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -213,7 +213,7 @@
</sv:node>
<sv:node sv:name="Magnolia-Utils-page2">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="test-MEDIA-113" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="sample-contextmenu" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml 2013-10-20 10:33:54 UTC (rev 4393)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml 2013-10-20 10:35:42 UTC (rev 4394)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="00000" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -34,7 +34,7 @@
</sv:node>
<sv:node sv:name="900580">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -312,7 +312,7 @@
</sv:node>
<sv:node sv:name="900300">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -739,7 +739,7 @@
</sv:node>
<sv:node sv:name="900581">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -1017,7 +1017,7 @@
</sv:node>
<sv:node sv:name="900582">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -1295,7 +1295,7 @@
</sv:node>
<sv:node sv:name="900301">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -1651,7 +1651,7 @@
</sv:node>
<sv:node sv:name="900583">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -1929,7 +1929,7 @@
</sv:node>
<sv:node sv:name="900396">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -2164,7 +2164,7 @@
</sv:node>
<sv:node sv:name="900397">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -2399,7 +2399,7 @@
</sv:node>
<sv:node sv:name="9003810">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -2682,7 +2682,7 @@
</sv:node>
<sv:node sv:name="900386">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -2965,7 +2965,7 @@
</sv:node>
<sv:node sv:name="900387">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -3248,7 +3248,7 @@
</sv:node>
<sv:node sv:name="900388">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -3531,7 +3531,7 @@
</sv:node>
<sv:node sv:name="900389">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -3814,7 +3814,7 @@
</sv:node>
<sv:node sv:name="1025978">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -4088,7 +4088,7 @@
</sv:node>
<sv:node sv:name="900398">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -4323,7 +4323,7 @@
</sv:node>
<sv:node sv:name="900399">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ ...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-20 10:56:55
|
Revision: 4396
http://openutils.svn.sourceforge.net/openutils/?rev=4396&view=rev
Author: fgiust
Date: 2013-10-20 10:56:50 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
remove old configuration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-20 10:38:28 UTC (rev 4395)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2013-10-20 10:56:50 UTC (rev 4396)
@@ -117,7 +117,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-10-20 10:38:28 UTC (rev 4395)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2013-10-20 10:56:50 UTC (rev 4396)
@@ -243,12 +243,7 @@
"wildcards",
Boolean.TRUE));
- tasks.add(new ChangeExistingPropertyTask(
- RepositoryConstants.CONFIG,
- "/modules/media/mediausedin/website",
- "nodeType",
- "mgnl:content",
- "mgnl:page"));
+
// empty placeholder
tasks.add(new CreateMissingPropertyTask(RepositoryConstants.CONFIG, "/modules/media/config", "baseurl", ""));
@@ -269,9 +264,24 @@
"class",
DefaultMediaUsedInManager.class.getName()));
- // config moved to /modules/media/mediausedin/entries/website
- tasks.add(new DeleteNodeTask(RepositoryConstants.CONFIG, "/modules/media/mediausedin/website"));
+ tasks
+ .add(new DeleteNodeTask(
+ RepositoryConstants.CONFIG,
+ "/modules/media/mediausedin/website",
+ "Configuration from /modules/media/mediausedin has now been changed and moved to the subnode \"entries\". The configuration has been reverted to the default"));
+ tasks
+ .add(new DeleteNodeTask(
+ RepositoryConstants.CONFIG,
+ "/modules/media/processors/image-post",
+ "Configuration node image-post into /modules/media/processors has been renamed to \"postprocessors\". The configuration has been reverted to the default"));
+
+ tasks
+ .add(new DeleteNodeTask(
+ RepositoryConstants.CONFIG,
+ "/modules/media/processors/image-resolution",
+ "Configuration node image-resolution into /modules/media/processors has been renamed to \"resolutionprocessors\". The configuration has been reverted to the default"));
+
return tasks;
}
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-10-20 10:38:28 UTC (rev 4395)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-10-20 10:56:50 UTC (rev 4396)
@@ -27,7 +27,10 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Deletes a node (if existing).
* @author fgiust
@@ -36,31 +39,50 @@
public class DeleteNodeTask extends AbstractRepositoryTask
{
- private final String workspaceName;
+ private String workspaceName;
- private final String nodePath;
+ private String nodePath;
+ private String warning;
+
+ private Logger log = LoggerFactory.getLogger(DeleteNodeTask.class);
+
/**
* @param workspaceName workspace (for example "config")
* @param nodePath node path
+ * @param warning optional warning message which will be shown if the node to delete actually exists
*/
- public DeleteNodeTask(String workspaceName, String nodePath)
+ public DeleteNodeTask(String workspaceName, String nodePath, String warning)
{
super("Deleting the node " + nodePath, "Deleting the node " + nodePath);
this.workspaceName = workspaceName;
this.nodePath = nodePath;
+ this.warning = warning;
}
/**
- * {@inheritDoc}
+ * @param workspaceName workspace (for example "config")
+ * @param nodePath node path
*/
+ public DeleteNodeTask(String workspaceName, String nodePath)
+ {
+ this(workspaceName, nodePath, null);
+ }
+
@Override
protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
{
- Session hm = installContext.getJCRSession(workspaceName);
+ Session session = installContext.getJCRSession(workspaceName);
- NodeUtilsExt.deleteIfExisting(hm, nodePath);
+ if (NodeUtilsExt.exists(session, nodePath))
+ {
+ if (warning != null)
+ {
+ installContext.warn(warning);
+ }
+ NodeUtilsExt.deleteIfExisting(session, nodePath);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-20 11:08:40
|
Revision: 4397
http://openutils.svn.sourceforge.net/openutils/?rev=4397&view=rev
Author: fgiust
Date: 2013-10-20 11:08:35 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
cleanup bootstrap files
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.myproject.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-bootstrap-samples/struts11/website.sample-struts.xml
magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap-samples/mgnlutils/website.sample-magnoliautils.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 11:08:35 UTC (rev 4397)
@@ -41,34 +41,9 @@
<sv:value>media:pages/sampleSimpleMedia</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>c7024555-35bc-40e4-b1cb-081462176b3f</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-01-16T09:56:40.411+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
<sv:node sv:name="main">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:area</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -98,7 +73,7 @@
</sv:node>
<sv:node sv:name="01">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -170,7 +145,7 @@
</sv:node>
<sv:node sv:name="0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -242,7 +217,7 @@
</sv:node>
<sv:node sv:name="00">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.Magnolia-Utils.xml 2013-10-20 11:08:35 UTC (rev 4397)
@@ -116,7 +116,7 @@
</sv:node>
<sv:node sv:name="newcontent">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -146,7 +146,7 @@
</sv:node>
<sv:node sv:name="0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -183,31 +183,6 @@
<sv:value>samplesHowToJSP</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7c158483-8813-47b5-b176-643694dbc857</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-01-18T14:11:22.618+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/bootstrap/website.test-MEDIA-113.xml 2013-10-20 11:08:35 UTC (rev 4397)
@@ -41,34 +41,9 @@
<sv:value>media:pages/sampleSimpleMedia</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>c7024555-35bc-40e4-b1cb-081462176b3f</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2009-01-16T09:56:40.411+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
<sv:node sv:name="main">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:area</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -98,7 +73,7 @@
</sv:node>
<sv:node sv:name="01">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -170,7 +145,7 @@
</sv:node>
<sv:node sv:name="0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -242,7 +217,7 @@
</sv:node>
<sv:node sv:name="00">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-10-20 11:08:35 UTC (rev 4397)
@@ -37,7 +37,7 @@
</sv:node>
<sv:node sv:name="main">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:area</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -67,7 +67,7 @@
</sv:node>
<sv:node sv:name="0">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -104,7 +104,7 @@
</sv:node>
<sv:node sv:name="01">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -141,35 +141,10 @@
<sv:value>samples-contextmenu-textmedia</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>60f8214d-64b0-4a4b-b93e-04954864a94d</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-05-20T14:52:38.484+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="00">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -326,31 +301,6 @@
<sv:value>contextmenu:components/samples-contextmenu-textmedia</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>c0849975-45ec-49ec-8b03-3c9efaae4bfd</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2013-09-13T19:27:55.815+02:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="02">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-10-20 11:08:35 UTC (rev 4397)
@@ -112,7 +112,7 @@
</sv:node>
<sv:node sv:name="grid_files">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml 2013-10-20 10:56:50 UTC (rev 4396)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml 2013-10-20 11:08:35 UTC (rev 4397)
@@ -94,7 +94,7 @@
</sv:node>
<sv:node sv:name="mainframe">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -124,7 +124,7 @@
</sv:node>
<sv:node sv:name="i1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -172,35 +172,10 @@
<sv:value>p-text-image</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>a9a5bcb5-7027-4acc-ae46-538e00670f4a</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-05T13:01:41.001+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="999">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -239,7 +214,7 @@
</sv:node>
<sv:node sv:name="columnDx">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -269,7 +244,7 @@
</sv:node>
<sv:node sv:name="1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -373,7 +348,7 @@
</sv:node>
<sv:node sv:name="mainframe">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -403,7 +378,7 @@
</sv:node>
<sv:node sv:name="i1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -450,35 +425,10 @@
<sv:value>p-text-image</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>5effc461-e4cb-41fd-9a62-af2bc0782897</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="i2">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -524,35 +474,10 @@
<sv:value>p-text-image</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>48998939-d1c9-4607-afb7-3e77d3e3e329</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="i3">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -598,35 +523,10 @@
<sv:value>p-text-image</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>151215ed-6b3c-4cdb-9a06-76ad9186383a</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-05T13:01:31.001+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="999">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -666,7 +566,7 @@
</sv:node>
<sv:node sv:name="columnDx">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -696,7 +596,7 @@
</sv:node>
<sv:node sv:name="1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -799,7 +699,7 @@
</sv:node>
<sv:node sv:name="mainframe">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -829,7 +729,7 @@
</sv:node>
<sv:node sv:name="i1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -877,35 +777,10 @@
<sv:value>p-text-image</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>5ee3a345-29f5-4672-b769-9cbd13be2145</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-05T13:01:41.001+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="999">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -944,7 +819,7 @@
</sv:node>
<sv:node sv:name="columnDx">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -974,7 +849,7 @@
</sv:node>
<sv:node sv:name="1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -1077,7 +952,7 @@
</sv:node>
<sv:node sv:name="mainframe">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -1107,7 +982,7 @@
</sv:node>
<sv:node sv:name="i1">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:lockable</sv:value>
@@ -1155,35 +1030,10 @@
<sv:value>p-text-image</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="text_files">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>8bbe4b69-2402-4a4b-a8cc-3a12555cbe37</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-05T13:01:41.001+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
<sv:node sv:name="999">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:va...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-20 12:41:50
|
Revision: 4398
http://openutils.svn.sourceforge.net/openutils/?rev=4398&view=rev
Author: fgiust
Date: 2013-10-20 12:41:45 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
refactorin packages
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaConfigurationManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,8 +23,8 @@
import info.magnolia.cms.beans.config.URI2RepositoryMapping;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
import java.util.Collection;
import java.util.Iterator;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/DefaultMediaUsedInManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.util.ArrayList;
import java.util.HashMap;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -26,7 +26,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.File;
import java.io.FileOutputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -34,9 +34,9 @@
import info.magnolia.module.admininterface.commands.ActivationCommand;
import info.magnolia.objectfactory.Components;
import info.magnolia.templating.functions.TemplatingFunctions;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions;
import it.openutils.mgnlutils.el.MgnlPagingElFunctions.Page;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.IOException;
import java.util.ArrayList;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -27,7 +27,7 @@
import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.Point;
import java.util.ArrayList;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.admininterface.SaveHandlerImpl;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.image.BufferedImage;
import java.io.File;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.awt.image.BufferedImage;
import java.io.InputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.jcr.util.PropertyUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.InputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,7 +23,7 @@
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.link.Link;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.context.SystemContext;
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.File;
import java.io.FileOutputStream;
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.module.ModuleRegistry;
import info.magnolia.objectfactory.Components;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.IOException;
import java.io.PrintWriter;
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/configuration/MessagesConfigurationManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -26,8 +26,8 @@
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.objectfactory.Components;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
import java.util.ArrayList;
import java.util.Collections;
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/DefaultTagCloudManager.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,8 +23,8 @@
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.jcr.util.NodeUtil;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
-import it.openutils.mgnlutils.api.ObservedManagerAdapter;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+import it.openutils.mgnlutils.util.ObservedManagerAdapter;
import java.io.IOException;
import java.util.Arrays;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -23,7 +23,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.module.InstallContext;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.File;
import java.io.FileInputStream;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -22,7 +22,7 @@
import info.magnolia.jcr.RuntimeRepositoryException;
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.BootstrapResourcesTask;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -24,7 +24,7 @@
import info.magnolia.module.delta.BootstrapResourcesTask;
import info.magnolia.module.delta.TaskExecutionException;
import info.magnolia.repository.RepositoryConstants;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import java.io.IOException;
import java.util.ArrayList;
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java 2013-10-20 11:08:35 UTC (rev 4397)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -25,7 +25,7 @@
import info.magnolia.module.InstallContext;
import info.magnolia.module.delta.AbstractRepositoryTask;
import info.magnolia.module.delta.TaskExecutionException;
-import it.openutils.mgnlutils.api.NodeUtilsExt;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java (from rev 4392, magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/NodeUtilsExt.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/NodeUtilsExt.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -0,0 +1,258 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.openutils.mgnlutils.util;
+
+import info.magnolia.cms.core.AggregationState;
+import info.magnolia.cms.core.Path;
+import info.magnolia.content2bean.Content2BeanException;
+import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.RuntimeRepositoryException;
+import info.magnolia.jcr.decoration.ContentDecoratorUtil;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.jcr.wrapper.ChannelVisibilityContentDecorator;
+import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper;
+import info.magnolia.jcr.wrapper.I18nNodeWrapper;
+
+import java.util.regex.Pattern;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id: NodeUtilsExt.java 4292 2013-09-12 15:54:10Z fgiust $
+ */
+public class NodeUtilsExt
+{
+
+ private static Pattern UUID_PATTERN = Pattern
+ .compile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");
+
+ public static boolean exists(Session session, String absolutepath)
+ {
+ try
+ {
+ return session.getRootNode().hasNode(StringUtils.stripStart(absolutepath, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ public static Node getNodeIfExists(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ return session.getNode(absolutepath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ return null;
+ }
+
+ public static boolean deleteIfExisting(Session session, String absolutepath)
+ {
+ if (exists(session, absolutepath))
+ {
+ try
+ {
+ session.getNode(absolutepath).remove();
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean setPropertyIfDifferent(Node node, String propertyname, Object propertyvalue)
+ {
+ return setPropertyIfDifferentFromValue(node, propertyname, propertyvalue, propertyvalue);
+ }
+
+ public static boolean setPropertyIfDifferentFromValue(Node node, String propertyname, Object propertyvalue,
+ Object oldvalue)
+ {
+ try
+ {
+ if (!node.hasProperty(propertyname)
+ || oldvalue == null
+ || !StringUtils.equals(node.getProperty(propertyname).getString(), oldvalue.toString()))
+ {
+ PropertyUtil.setProperty(node, propertyname, propertyvalue);
+ return true;
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ return false;
+ }
+
+ public static void deletePropertyIfExist(Node node, String propertyname)
+ {
+ try
+ {
+ if (node != null && node.hasProperty(propertyname))
+ {
+ node.getProperty(propertyname).remove();
+ }
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ public static Node getNodeByIdOrPath(String workspace, String uuidOrPath)
+ {
+ if (uuidOrPath == null)
+ {
+ return null;
+ }
+
+ if (isUUID(uuidOrPath))
+ {
+ try
+ {
+ return NodeUtil.getNodeByIdentifier(workspace, uuidOrPath);
+ }
+ catch (ItemNotFoundException e)
+ {
+ // ignore
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+ else
+ {
+ try
+ {
+ return getNodeIfExists(MgnlContext.getJCRSession(workspace), uuidOrPath);
+ }
+ catch (RepositoryException e)
+ {
+ throw new RuntimeRepositoryException(e);
+ }
+ }
+
+ return null;
+ }
+
+ public static boolean isUUID(String string)
+ {
+ // 97ed692a-31a9-4670-9c36-4d8ee8f6128d
+ if (StringUtils.length(string) != 36)
+ {
+ return false;
+ }
+
+ return UUID_PATTERN.matcher(string).find();
+ }
+
+ public static Object toBean(Node node) throws Content2BeanException
+ {
+ return toBean(node, null);
+ }
+
+ public static Object toBean(Node node, Class outclass) throws Content2BeanException
+ {
+ return toBean(node, false, outclass);
+ }
+
+ @SuppressWarnings("deprecation")
+ public static Object toBean(Node node, boolean recursive, Class outclass) throws Content2BeanException
+ {
+ return Content2BeanUtil.toBean(info.magnolia.cms.util.ContentUtil.asContent(node), recursive, outclass);
+ }
+
+ @SuppressWarnings("deprecation")
+ public static String getUniqueLabel(Node parent, String label)
+ {
+ return Path.getUniqueLabel(info.magnolia.cms.util.ContentUtil.asContent(parent), label);
+ }
+
+ public static Node wrap(Node node)
+ {
+ if (node == null)
+ {
+ return null;
+ }
+ node = wrapWithChannelVisibilityWrapper(node);
+ if (!NodeUtil.isWrappedWith(node, I18nNodeWrapper.class))
+ {
+ node = new I18nNodeWrapper(node);
+ }
+ if (!NodeUtil.isWrappedWith(node, HTMLEscapingNodeWrapper.class))
+ {
+ node = new HTMLEscapingNodeWrapper(node, true);
+ }
+
+ return node;
+ }
+
+ private static Node wrapWithChannelVisibilityWrapper(Node content)
+ {
+ if (ContentDecoratorUtil.isDecoratedWith(content, ChannelVisibilityContentDecorator.class)
+ || !MgnlContext.isWebContext())
+ {
+ return content;
+ }
+
+ AggregationState aggregationState = MgnlContext.getAggregationState();
+ if (aggregationState == null)
+ {
+ return content;
+ }
+ String channel = aggregationState.getChannel().getName();
+ if (StringUtils.isEmpty(channel) || StringUtils.equalsIgnoreCase(channel, "all"))
+ {
+ return content;
+ }
+ return new ChannelVisibilityContentDecorator(channel).wrapNode(content);
+ }
+
+ public static String getBinaryPath(Node node)
+ {
+ if (node == null)
+ {
+ return null;
+ }
+ return NodeUtil.getPathIfPossible(node) + "/" + PropertyUtil.getString(node, "fileName");
+ }
+}
Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java (from rev 4371, magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/api/ObservedManagerAdapter.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/util/ObservedManagerAdapter.java 2013-10-20 12:41:45 UTC (rev 4398)
@@ -0,0 +1,59 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of t...
[truncated message content] |