commit a9fe9c68f4da944c9ae03062668250f7d9966dc8
Author: Salvatore La Manna <sl@mwg.it>
Date:   Mon Jan 9 16:00:17 2023 +0100

    Primo commit

diff --git a/.ant-targets-build.xml b/.ant-targets-build.xml
new file mode 100644
index 0000000..e6562d9
--- /dev/null
+++ b/.ant-targets-build.xml
@@ -0,0 +1,52 @@
+all
+build-common.format-javadoc
+build-common.setup-eclipse
+build-css
+build-db
+build-service
+build-summary
+build-upgrade-table
+build-wsdl
+build-xsd
+clean
+compile
+compile-jsp
+compile-test
+create
+deploy
+direct-deploy
+direct-deploy-ext-cmd
+direct-deploy-hook-cmd
+direct-deploy-layouttpl-cmd
+direct-deploy-portlet-cmd
+direct-deploy-theme-cmd
+direct-deploy-web-cmd
+ear
+extract-plugins-sdk
+format-javadoc
+format-source
+jar
+jar-javadoc
+jar-source
+javadoc
+prepare-upgrade-table
+print-current-time
+print-stale-snapshot
+publish
+publish-local-m2-release
+publish-local-m2-snapshot
+publish-remote-m2-release
+publish-remote-m2-snapshot
+release
+run-cpd
+run-pmd
+setup-arquillian
+setup-eclipse
+setup-jrebel
+sort-xml-attributes
+test
+test-integration
+test-unit
+war
+watch
+zip-portal
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..92856e1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*.class
+*.war
+sicilia-*.jar
+**/classes/
+**/.sass-cache/
+**/.ivy/cache/
+**/tmp/
+**/build/
+.DS_Store
+._*
diff --git a/.ivy/ivy-2.4.0.LIFERAY-PATCHED-1-SNAPSHOT.jar b/.ivy/ivy-2.4.0.LIFERAY-PATCHED-1-SNAPSHOT.jar
new file mode 100644
index 0000000..4d15fc7
Binary files /dev/null and b/.ivy/ivy-2.4.0.LIFERAY-PATCHED-1-SNAPSHOT.jar differ
diff --git a/.project b/.project
new file mode 100644
index 0000000..29a7055
--- /dev/null
+++ b/.project
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>login-hook</name>
+	<comment></comment>
+	<projects></projects>
+	<buildSpec></buildSpec>
+	<natures></natures>
+</projectDescription>
diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown
new file mode 100644
index 0000000..178bef2
--- /dev/null
+++ b/CONTRIBUTING.markdown
@@ -0,0 +1,28 @@
+# How to Contribute
+
+Liferay is developed by its community consisting of Liferay users, enthusiasts,
+employees, customers, partners, and others. We strongly encourage you to
+contribute to Liferay's open source projects by implementing new features,
+enhancing existing features, and fixing bugs. We also welcome your participation
+in our forums, writing documentation, and translating existing documentation.
+
+Liferay is known for its innovative top quality features. To maintain this
+reputation, all code changes are reviewed by a core set of Liferay project
+maintainers. We encourage you to introduce yourself to the [core
+maintainer(s)](https://issues.liferay.com/browse/LPS#selectedTab=com.atlassian.jira.plugin.system.project%3Acomponents-panel)
+and engage them as you contribute to the areas they maintain.
+
+As you have ideas for features you want to implement, follow the contribution
+steps outlined in the [CONTRIBUTING
+guide](https://github.com/liferay/liferay-portal/blob/master/CONTRIBUTING.markdown)
+found in the [liferay-portal](https://github.com/liferay/liferay-portal)
+repository. This guide contains details on how to contribute to Liferay and
+additional useful resource links. For more details on specific steps, and to get
+a deeper understanding of Liferay in general, make sure to read Liferay's
+official [User
+Guide](http://www.liferay.com/documentation/liferay-portal/6.1/user-guide) and
+[Development
+Guide](http://www.liferay.com/documentation/liferay-portal/6.1/development).
+These guides contain extensive explanations, examples, and reference material
+for you to consult time and time again.
+
diff --git a/README.markdown b/README.markdown
new file mode 100644
index 0000000..040a61a
--- /dev/null
+++ b/README.markdown
@@ -0,0 +1,139 @@
+# Liferay Plugins
+
+The liferay-plugins repository is part of the Liferay Portal project. [Liferay
+Portal](http://www.liferay.com/community/liferay-projects/liferay-portal) is an
+open source enterprise web platform for building business solutions that deliver
+immediate results and long-term value. Liferay Portal started out as a personal
+development project in 2000 and was open sourced in 2001.
+
+To get started, check out the project's community homepage at
+[http://liferay.org](http://liferay.org)!
+
+Most of the plugins found in the liferay-plugins repository can be easily
+installed on Liferay Portal via [Liferay
+Marketplace](http://liferay.com/marketplace). To build one or more of the
+plugins yourself, read below for details.
+
+## Source Code
+
+Liferay's main source code resides in two repositories:
+[liferay-portal](https://github.com/liferay/liferay-portal) and
+[liferay-plugins](https://github.com/liferay/liferay-plugins). Liferay has
+additional repositories for the following:
+
+* [AlloyUI](https://github.com/liferay/alloy-ui)
+* [Documentation](https://github.com/liferay/liferay-docs)
+* [Git Tools](https://github.com/liferay/git-tools)
+* [Liferay Faces](https://github.com/liferay/liferay-faces)
+* [Liferay IDE](https://github.com/liferay/liferay-ide)
+* [Maven Support](https://github.com/liferay/liferay-maven-support)
+
+Liferay Portal *releases* are built from the liferay-portal repository and
+include select plugins from the liferay-plugins repository. You can build
+Liferay Portal, its plugins, and/or any of the other supporting technologies
+from their respective repositories.
+
+For more information on building liferay-portal, see the [README
+file](https://github.com/liferay/liferay-portal/blob/master/README.markdown) in
+the liferay-portal repository.
+
+## Quick Start
+
+In the [liferay-plugins](https://github.com/liferay/liferay-plugins) repository,
+plugins are laid out in a software development kit (SDK) -- the Liferay Plugins
+SDK. All Liferay plugin types, including portlets, themes, layout templates,
+hooks, and EXT plugins, can be created and maintained in the SDK. [The Plugins
+SDK](http://www.liferay.com/documentation/liferay-portal/6.1/development/-/ai/the-plugins-s-3)
+chapter of Liferay's [Development
+Guide](http://www.liferay.com/documentation/liferay-portal/6.1/development)
+explains how to create, build, and deploy your plugins. Follow the instructions
+in this section to build and deploy any of the existing SDK plugins quickly.
+
+For demonstration purposes, let's pretend your user name is *joe* and you have a
+Liferay instance bundled with Apache Tomcat running in your `/home/joe/`
+directory.
+
+1. Fork the [liferay-plugins](https://github.com/liferay/liferay-plugins)
+repository.
+
+2. Clone your fork of the repository.
+3. Create a `build.${username}.properties` file in the root directory of your
+liferay-plugins repository clone. Be sure to replace `${username}` with your
+user name.
+
+		/home/joe/liferay-plugins/build.joe.properties
+
+	Note, to determine your user name, execute `echo %USERNAME%` on Windows or
+	`whoami` on Unix/Linux.
+
+4. In your `build.${username}.properties` file, specify the
+`app.server.parent.dir` property set to the parent path of your app server.
+
+    	app.server.parent.dir=/home/joe/liferay-portal-6.1.1-ga2
+
+	Use your `build.${username}.properties` file to specify any additional
+	properties you wish to override from the base `build.properties` file; do
+	not modify the base file.
+
+5. Navigate to the directory of a plugin (e.g. *Sample JSP Portlet*) and deploy
+it using Ant.
+
+		cd /home/joe/liferay-plugins/portlets/sample-jsp-portlet
+		ant deploy
+
+	The plugin compiles, its WAR file is built to the plugin's `dist` directory,
+	the WAR file is copied to your Liferay *Hot Deploy* directory, and the
+	plugin is deployed immediately. It's just that easy!
+
+There are many other options for developing new Liferay plugins using the
+Plugins SDK. Consult the [Liferay Development
+Guide](http://www.liferay.com/documentation/liferay-portal/6.1/development) for
+indispensable explanations, examples, and reference material on the Liferay
+Plugins SDK and surrounding technologies.
+
+Also, check out Liferay IDE. The [Liferay IDE
+project](http://www.liferay.com/community/liferay-projects/liferay-ide) provides
+an Eclipse-based Liferay development environment to help you build and maintain
+Liferay projects easily.
+
+Finally, consider using Maven to build Liferay Plugins. For excellent overviews
+of Maven support for Liferay, check out [Mika Koivisto's
+presentation](http://www.slideshare.net/koivimik/developing-liferay-plugins-with-maven)
+and [Getting Started with Liferay Maven
+SDK](http://www.liferay.com/web/mika.koivisto/blog/-/blogs/12322618).
+
+## Contributing
+
+Liferay welcomes any and all contributions! If you have an idea for a new plugin
+or a new feature in an existing plugin, and wish to implement it, follow the
+contribution steps outlined in the [CONTRIBUTING
+guide](https://github.com/liferay/liferay-portal/blob/master/CONTRIBUTING.markdown).
+It explains how to contribute to Liferay and contains links to additional useful
+resources.
+
+## More Information
+
+For more information about filing bugs, staying updated with Liferay on social
+media, and other ways to participate, check out the [Liferay Community
+Homepage](http://liferay.org) and consult the [README
+file](https://github.com/liferay/liferay-portal/blob/master/README.markdown) in
+the liferay-portal repository.
+
+## Liferay Portal Community Edition License
+
+This library, *Liferay Portal Community Edition*, is free software ("Licensed
+Software"); you can redistribute it and/or modify it under the terms of the [GNU
+Lesser General Public License](http://www.gnu.org/licenses/lgpl-2.1.html) as
+published by the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; including but not limited to, the implied warranty of MERCHANTABILITY,
+NONINFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+Public License for more details.
+
+You should have received a copy of the [GNU Lesser General Public
+License](http://www.gnu.org/licenses/lgpl-2.1.html) along with this library; if
+not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+Floor, Boston, MA 02110-1301 USA
+
diff --git a/apps/build.xml b/apps/build.xml
new file mode 100644
index 0000000..9b6f6e4
--- /dev/null
+++ b/apps/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project>
+	<import file="../build-common-plugins.xml" />
+</project>
\ No newline at end of file
diff --git a/apps/plugins-inspector.log.test-broken b/apps/plugins-inspector.log.test-broken
new file mode 100644
index 0000000..72c649e
--- /dev/null
+++ b/apps/plugins-inspector.log.test-broken
@@ -0,0 +1,14 @@
+build.xml is nonstandard.
+Unable to clean all plugins.
+Unable to compile all plugins.
+Module /Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-broken-portlet must not have both a "docroot" and a "src" directory.
+/Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-broken-portlet/docroot/WEB-INF/liferay-hook.xml has an nonstandard language-properties element.
+/Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-broken-portlet/docroot/WEB-INF/liferay-hook.xml has a nonstandard custom-jsp-dir element.
+/Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-broken-portlet/docroot/WEB-INF/web.xml contains generated code.
+/Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-broken-portlet/docroot/WEB-INF/lib must not be checked into source control.
+/Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-broken-portlet/docroot/WEB-INF/tld must not be checked into source control.
+/Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-broken-portlet/lib must not be checked into source control.
+Module /Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-empty-portlet must have a "docroot" or a "src" directory.
+/Users/brian/dev/projects/github/liferay-plugins-ee-6.2.x/apps/test-broken/test-empty-portlet/ivy.xml.MD5 must not be checked into source control.
+Plugins must not have custom .gitignore files.
+Plugins must not generate modified files.
diff --git a/apps/test-broken/build.xml b/apps/test-broken/build.xml
new file mode 100644
index 0000000..f3d2ac5
--- /dev/null
+++ b/apps/test-broken/build.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<!--
+Add comment for nonstandard MD5.
+-->
+
+<project>
+	<import file="../../build-common-plugins.xml" />
+</project>
\ No newline at end of file
diff --git a/apps/test-broken/test-broken-portlet/build.xml b/apps/test-broken/test-broken-portlet/build.xml
new file mode 100644
index 0000000..a6a060d
--- /dev/null
+++ b/apps/test-broken/test-broken-portlet/build.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project>
+	<import file="../../portlets/build-common-portlet.xml" />
+
+	<target name="compile">
+		<echo file="modified_file.txt">Hello world.</echo>
+		<echo file="new_file.txt">Hello world.</echo>
+
+		<ant target="compile" />
+	</target>
+</project>
\ No newline at end of file
diff --git a/apps/test-broken/test-broken-portlet/docroot/WEB-INF/lib/commons-logging.jar b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/lib/commons-logging.jar
new file mode 100644
index 0000000..8758a96
Binary files /dev/null and b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/lib/commons-logging.jar differ
diff --git a/apps/test-broken/test-broken-portlet/docroot/WEB-INF/liferay-hook.xml b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/liferay-hook.xml
new file mode 100644
index 0000000..06d3b73
--- /dev/null
+++ b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/liferay-hook.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.1.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_1_0.dtd">
+
+<hook>
+	<language-properties>resources/Language*.properties</language-properties>
+	<custom-jsp-dir>/META-INF/custom-jsps</custom-jsp-dir>
+</hook>
\ No newline at end of file
diff --git a/apps/test-broken/test-broken-portlet/docroot/WEB-INF/tld/c.tld b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/tld/c.tld
new file mode 100644
index 0000000..98efa6a
--- /dev/null
+++ b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/tld/c.tld
@@ -0,0 +1,572 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+    version="2.1">
+    
+  <description>JSTL 1.2 core library</description>
+  <display-name>JSTL core</display-name>
+  <tlib-version>1.2</tlib-version>
+  <short-name>c</short-name>
+  <uri>http://java.sun.com/jsp/jstl/core</uri>
+
+  <validator>
+    <description>
+        Provides core validation features for JSTL tags.
+    </description>
+    <validator-class>
+        org.apache.taglibs.standard.tlv.JstlCoreTLV
+    </validator-class>
+  </validator>
+
+  <tag>
+    <description>
+        Catches any Throwable that occurs in its body and optionally
+        exposes it.
+    </description>
+    <name>catch</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+exception thrown from a nested action. The type of the
+scoped variable is the type of the exception thrown.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Simple conditional tag that establishes a context for
+	mutually exclusive conditional operations, marked by
+	&lt;when&gt; and &lt;otherwise&gt;
+    </description>
+    <name>choose</name>
+    <tag-class>com.liferay.taglib.core.ChooseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+	Simple conditional tag, which evalutes its body if the
+	supplied condition is true and optionally exposes a Boolean
+	scripting variable representing the evaluation of this condition
+    </description>
+    <name>if</name>
+    <tag-class>com.liferay.taglib.core.IfTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that determines whether or
+not the body content should be processed.
+        </description>
+        <name>test</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+	<type>boolean</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.        
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Retrieves an absolute or relative URL and exposes its contents
+        to either the page, a String in 'var', or a Reader in 'varReader'.
+    </description>
+    <name>import</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ImportTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.ImportTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The URL of the resource to import.
+        </description>
+        <name>url</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resource's content. The type of the scoped
+variable is String.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resource's content. The type of the scoped
+variable is Reader.
+        </description>
+        <name>varReader</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the context when accessing a relative
+URL resource that belongs to a foreign
+context.
+        </description>
+        <name>context</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Character encoding of the content at the input
+resource.
+        </description>
+        <name>charEncoding</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	The basic iteration tag, accepting many different
+        collection types and supporting subsetting and other
+        functionality
+    </description>
+    <name>forEach</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Collection of items to iterate over.
+        </description>
+	<name>items</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.Object</type>
+        <deferred-value>
+	    <type>java.lang.Object</type>
+        </deferred-value>
+    </attribute>
+    <attribute>
+        <description>
+If items specified:
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+If items not specified:
+Iteration begins with index set at the value
+specified.
+        </description>
+	<name>begin</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+If items specified:
+Iteration ends at the item located at the
+specified index (inclusive).
+If items not specified:
+Iteration ends when index reaches the value
+specified.
+        </description>
+	<name>end</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration will only process every step items of
+the collection, starting with the first one.
+        </description>
+	<name>step</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped
+variable has nested visibility. Its type depends
+on the object of the underlying collection.
+        </description>
+	<name>var</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+visibility.
+        </description>
+	<name>varStatus</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Iterates over tokens, separated by the supplied delimeters
+    </description>
+    <name>forTokens</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForTokensTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+String of tokens to iterate over.
+        </description>
+	<name>items</name>
+	<required>true</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.String</type>
+        <deferred-value>
+	    <type>java.lang.String</type>
+        </deferred-value>
+    </attribute>
+    <attribute>
+        <description>
+The set of delimiters (the characters that
+separate the tokens in the string).
+        </description>
+	<name>delims</name>
+	<required>true</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.String</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration begins at the token located at the
+specified index. First token has index 0.
+        </description>
+	<name>begin</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration ends at the token located at the
+specified index (inclusive).
+        </description>
+	<name>end</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration will only process every step tokens
+of the string, starting with the first one.
+        </description>
+	<name>step</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped
+variable has nested visibility.
+        </description>
+	<name>var</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of
+type
+javax.servlet.jsp.jstl.core.LoopTag
+Status. This scoped variable has nested
+visibility.
+        </description>
+	<name>varStatus</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Like &lt;%= ... &gt;, but for expressions.
+    </description> 
+    <name>out</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Expression to be evaluated.
+        </description>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Default value if the resulting value is null.
+        </description>
+        <name>default</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Determines whether characters &lt;,&gt;,&amp;,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default value is
+true.
+        </description>
+        <name>escapeXml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+
+  <tag>
+    <description>
+        Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
+        and runs only if all of the prior conditions evaluated to
+        'false'
+    </description>
+    <name>otherwise</name>
+    <tag-class>com.liferay.taglib.core.OtherwiseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+        Adds a parameter to a containing 'import' tag's URL.
+    </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the query string parameter.
+        </description>
+        <name>name</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Value of the parameter.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Redirects to a new URL.
+    </description>
+    <name>redirect</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.RedirectTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The URL of the resource to redirect to.
+        </description>
+        <name>url</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the context when redirecting to a relative URL
+resource that belongs to a foreign context.
+        </description>
+        <name>context</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Removes a scoped variable (from a particular scope, if specified).
+    </description>
+    <name>remove</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.RemoveTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+Name of the scoped variable to be removed.
+        </description>
+        <name>var</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+ <tag>
+    <description>
+        Sets the result of an expression evaluation in a 'scope'
+    </description>
+    <name>set</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.SetTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable to hold the value
+specified in the action. The type of the scoped variable is
+whatever type the value expression evaluates to.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Expression to be evaluated.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+        <deferred-value>
+	    <type>java.lang.Object</type>
+        </deferred-value>
+    </attribute>
+    <attribute>
+        <description>
+Target object whose property will be set. Must evaluate to
+a JavaBeans object with setter property property, or to a
+java.util.Map object.
+        </description>
+        <name>target</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the property to be set in the target object.
+        </description>
+        <name>property</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Creates a URL with optional query parameters.
+    </description>
+    <name>url</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+processed url. The type of the scoped variable is
+String.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+URL to be processed.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the context when specifying a relative URL
+resource that belongs to a foreign context.
+        </description>
+        <name>context</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Subtag of &lt;choose&gt; that includes its body if its
+	condition evalutes to 'true'
+    </description>
+    <name>when</name>
+    <tag-class>com.liferay.taglib.core.WhenTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that determines whether or not the
+body content should be processed.
+        </description>
+        <name>test</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+	<type>boolean</type>
+    </attribute>
+  </tag>
+
+</taglib>
diff --git a/apps/test-broken/test-broken-portlet/docroot/WEB-INF/web.xml b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..23cef3a
--- /dev/null
+++ b/apps/test-broken/test-broken-portlet/docroot/WEB-INF/web.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	<display-name>test-partially-broken-portlet</display-name>
+	<filter>
+		<filter-name>Invoker Filter - ERROR</filter-name>
+		<filter-class>com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilter</filter-class>
+		<init-param>
+			<param-name>dispatcher</param-name>
+			<param-value>ERROR</param-value>
+		</init-param>
+	</filter>
+	<filter>
+		<filter-name>Invoker Filter - FORWARD</filter-name>
+		<filter-class>com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilter</filter-class>
+		<init-param>
+			<param-name>dispatcher</param-name>
+			<param-value>FORWARD</param-value>
+		</init-param>
+	</filter>
+	<filter>
+		<filter-name>Invoker Filter - INCLUDE</filter-name>
+		<filter-class>com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilter</filter-class>
+		<init-param>
+			<param-name>dispatcher</param-name>
+			<param-value>INCLUDE</param-value>
+		</init-param>
+	</filter>
+	<filter>
+		<filter-name>Invoker Filter - REQUEST</filter-name>
+		<filter-class>com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilter</filter-class>
+		<init-param>
+			<param-name>dispatcher</param-name>
+			<param-value>REQUEST</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>Invoker Filter - ERROR</filter-name>
+		<url-pattern>/*</url-pattern>
+		<dispatcher>ERROR</dispatcher>
+	</filter-mapping>
+	<filter-mapping>
+		<filter-name>Invoker Filter - FORWARD</filter-name>
+		<url-pattern>/*</url-pattern>
+		<dispatcher>FORWARD</dispatcher>
+	</filter-mapping>
+	<filter-mapping>
+		<filter-name>Invoker Filter - INCLUDE</filter-name>
+		<url-pattern>/*</url-pattern>
+		<dispatcher>INCLUDE</dispatcher>
+	</filter-mapping>
+	<filter-mapping>
+		<filter-name>Invoker Filter - REQUEST</filter-name>
+		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+	</filter-mapping>
+	<listener>
+		<listener-class>com.liferay.portal.kernel.servlet.PluginContextListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>com.liferay.portal.kernel.servlet.SerializableSessionAttributeListener</listener-class>
+	</listener>
+</web-app>
\ No newline at end of file
diff --git a/apps/test-broken/test-broken-portlet/lib/commons-logging.jar b/apps/test-broken/test-broken-portlet/lib/commons-logging.jar
new file mode 100644
index 0000000..8758a96
Binary files /dev/null and b/apps/test-broken/test-broken-portlet/lib/commons-logging.jar differ
diff --git a/apps/test-broken/test-broken-portlet/modified_file.txt b/apps/test-broken/test-broken-portlet/modified_file.txt
new file mode 100644
index 0000000..e69de29
diff --git a/apps/test-broken/test-broken-portlet/src/com/liferay/test/Test.java b/apps/test-broken/test-broken-portlet/src/com/liferay/test/Test.java
new file mode 100644
index 0000000..e69de29
diff --git a/apps/test-broken/test-empty-portlet/ivy.xml.MD5 b/apps/test-broken/test-empty-portlet/ivy.xml.MD5
new file mode 100644
index 0000000..db102c2
--- /dev/null
+++ b/apps/test-broken/test-empty-portlet/ivy.xml.MD5
@@ -0,0 +1 @@
+3a1587eeafa8dc5f13f833811cdda85a
\ No newline at end of file
diff --git a/apps/test-working/build.xml b/apps/test-working/build.xml
new file mode 100644
index 0000000..03bbb21
--- /dev/null
+++ b/apps/test-working/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project>
+	<import file="../../build-common-plugins.xml" />
+</project>
\ No newline at end of file
diff --git a/build-common-ivy.xml b/build-common-ivy.xml
new file mode 100644
index 0000000..bf7418f
--- /dev/null
+++ b/build-common-ivy.xml
@@ -0,0 +1,794 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-ivy" xmlns:antelope="antlib:ise.antelope.tasks" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant">
+	<basename property="basedir.name" file="${basedir}" />
+
+	<propertyregex
+		input="${basedir.name}"
+		property="ivy.module.name"
+		regexp="(.*)\-(.*)$"
+		select="com.liferay.\1"
+	/>
+
+	<propertyregex
+		input="${ivy.module.name}"
+		override="true"
+		property="ivy.module.name"
+		regexp="\-"
+		replace="\."
+	/>
+
+	<path id="classpath.com.liferay.ant.mirrors.get">
+		<fileset dir="${sdk.dir}/dependencies/com.liferay.ant.mirrors.get/lib" erroronmissingdir="false" includes="*.jar" />
+	</path>
+
+	<taskdef classname="com.liferay.ant.mirrors.get.MirrorsGetTask" classpathref="classpath.com.liferay.ant.mirrors.get" name="mirrors-get" onerror="ignore" />
+
+	<if>
+		<not>
+			<available file="${ivy.home}/ivy-${ivy.version}.jar" />
+		</not>
+		<then>
+			<mkdir dir="${ivy.home}" />
+
+			<if>
+				<typefound name="mirrors-get" />
+				<then>
+					<mirrors-get
+						dest="${ivy.home}/ivy-${ivy.version}.jar"
+						src="${ivy.jar.url}"
+					/>
+				</then>
+				<else>
+					<get
+						dest="${ivy.home}/ivy-${ivy.version}.jar"
+						src="${ivy.jar.url}"
+					/>
+				</else>
+			</if>
+		</then>
+	</if>
+
+	<path id="ivy.lib.path">
+		<fileset
+			dir="${ivy.home}"
+			includes="ivy-${ivy.version}.jar"
+		/>
+		<fileset
+			dir="${sdk.dir}/lib"
+			includes="bcpg-jdk16.jar,bcprov-jdk16.jar"
+		/>
+	</path>
+
+	<taskdef classpathref="ivy.lib.path" resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" />
+
+	<pathconvert property="sdk.dependencies.dir" targetos="unix">
+		<path location="${sdk.dir}/dependencies" />
+	</pathconvert>
+
+	<path id="sdk.dependencies.path">
+		<dirset dir="${sdk.dir}" includes="dependencies/*" />
+	</path>
+
+	<pathconvert pathsep="," property="sdk.dependencies.path" refid="sdk.dependencies.path" targetos="unix" />
+
+	<macrodef name="process-ivy">
+		<attribute default="${basedir}" name="module.dir" />
+
+		<sequential>
+			<for list="@{module.dir},${sdk.dir},${sdk.dependencies.path}" param="ivy.xml.dir">
+				<sequential>
+					<if>
+						<available file="@{ivy.xml.dir}/ivy.xml" />
+						<then>
+							<fixcrlf eol="lf" file="@{ivy.xml.dir}/ivy.xml" fixlast="false" />
+
+							<checksum file="@{ivy.xml.dir}/ivy.xml" verifyproperty="ivy.xml.unmodified" />
+
+							<if>
+								<isfalse value="${ivy.xml.unmodified}" />
+								<then>
+									<var name="plugin.ivy.resolve.transitive.dependencies" unset="true" />
+
+									<if>
+										<and>
+											<available file="@{ivy.xml.dir}/bnd.bnd" />
+											<available file="@{ivy.xml.dir}/build.xml" />
+										</and>
+										<then>
+											<set-module-properties
+												module.dir="@{ivy.xml.dir}"
+											/>
+										</then>
+										<else>
+											<var name="plugin.ivy.resolve.transitive.dependencies" value="${ivy.resolve.transitive.dependencies}" />
+										</else>
+									</if>
+
+									<ivy:settings file="${ivy.custom.settings.file}" />
+
+									<if>
+										<antelope:endswith string="@{module.dir}" with="solr4-shared" />
+										<then>
+											<var name="ivy.checksums" value="" />
+										</then>
+									</if>
+
+									<ivy:resolve
+										conf="default,internal,provided"
+										file="@{ivy.xml.dir}/ivy.xml"
+										log="${ivy.log.level}"
+										transitive="${plugin.ivy.resolve.transitive.dependencies}"
+									/>
+
+									<var name="ivy.checksums" unset="true" />
+
+									<if>
+										<not>
+											<available file="@{ivy.xml.dir}/docroot" />
+										</not>
+										<then>
+											<ivy:retrieve
+												log="${ivy.log.level}"
+												overwriteMode="always"
+												pattern="@{ivy.xml.dir}/lib/[artifact].[ext]"
+												type="bundle,eclipse-plugin,jar,maven-plugin,orbit"
+											/>
+
+											<ivy:retrieve
+												log="${ivy.log.level}"
+												overwriteMode="always"
+												pattern="@{ivy.xml.dir}/lib/[artifact]-[type]s.[ext]"
+												type="source"
+											/>
+										</then>
+										<else>
+											<ivy:retrieve
+												log="${ivy.log.level}"
+												overwriteMode="always"
+												pattern="@{ivy.xml.dir}/docroot/WEB-INF/lib/[artifact].[ext]"
+												type="bundle,eclipse-plugin,jar,maven-plugin,orbit"
+											/>
+
+											<ivy:retrieve
+												log="${ivy.log.level}"
+												overwriteMode="always"
+												pattern="@{ivy.xml.dir}/docroot/WEB-INF/lib/[artifact]-[type]s.[ext]"
+												type="source"
+											/>
+										</else>
+									</if>
+
+									<checksum file="@{ivy.xml.dir}/ivy.xml" forceoverwrite="true" />
+								</then>
+							</if>
+
+							<var name="ivy.xml.unmodified" unset="true" />
+						</then>
+					</if>
+				</sequential>
+			</for>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="record-git-commit-snapshot">
+		<sequential>
+			<loadfile srcfile="maven.deploy.log" property="maven.deploy.log.content" />
+
+			<propertyregex
+				input="${maven.deploy.log.content}"
+				override="true"
+				property="snapshot.tstamp"
+				regexp="${plugin.name}-${plugin.full.version}-([\d.-]+)\.jar"
+				select="\1"
+			/>
+
+			<property file="bnd.bnd" prefix="bnd." />
+
+			<exec executable="git" outputproperty="git.commit.module.log">
+				<arg value="log" />
+				<arg value="-1" />
+				<arg value="--pretty=format:%H" />
+				<arg value="--" />
+				<arg value="." />
+				<arg value=":!snapshot.properties" />
+			</exec>
+
+			<propertyregex
+				input="${sonatype.url}"
+				property="cdn.sonatype.url"
+				regexp="https://"
+				replace="http://cdn."
+			/>
+
+			<echo file="snapshot.properties">
+module.snapshot.git.id=${git.commit.module.log}
+module.snapshot.url=${cdn.sonatype.url}/com/liferay/${bnd.Bundle-SymbolicName}/${bnd.Bundle-Version}-SNAPSHOT/${bnd.Bundle-SymbolicName}-${bnd.Bundle-Version}-${snapshot.tstamp}.jar
+			</echo>
+
+			<var name="git.commit.module.log" unset="true" />
+			<var name="maven.deploy.log.content" unset="true" />
+			<var name="snapshot.tstamp" unset="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="set-build-xml-var">
+		<attribute name="bnd.property.key" default="" />
+		<attribute name="build.xml.var.name" />
+		<attribute name="module.dir" />
+
+		<sequential>
+			<if>
+				<and>
+					<available file="@{module.dir}/bnd.bnd" />
+					<not>
+						<equals arg1="@{bnd.property.key}" arg2="" />
+					</not>
+				</and>
+				<then>
+					<var name="module.bnd.@{bnd.property.key}" unset="true" />
+
+					<loadproperties prefix="module.bnd.">
+						<file file="@{module.dir}/bnd.bnd" />
+					</loadproperties>
+
+					<propertycopy
+						from="module.bnd.@{bnd.property.key}"
+						name="module.bnd.property.value"
+						override="true"
+						silent="true"
+					/>
+
+					<if>
+						<isset property="module.bnd.property.value" />
+						<then>
+							<var name="set-build-xml-var.return" value="${module.bnd.property.value}" />
+						</then>
+						<else>
+							<set-build-xml-var-from-build-xml
+								build.xml.var.name="@{build.xml.var.name}"
+								module.dir="@{module.dir}"
+							/>
+						</else>
+					</if>
+				</then>
+				<else>
+					<set-build-xml-var-from-build-xml
+						build.xml.var.name="@{build.xml.var.name}"
+						module.dir="@{module.dir}"
+					/>
+				</else>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="set-build-xml-var-from-build-xml">
+		<attribute name="build.xml.var.name" />
+		<attribute name="module.dir" />
+
+		<sequential>
+			<loadfile property="set-build-xml-var.build.xml.content" srcFile="@{module.dir}/build.xml" />
+
+			<antelope:stringutil string="${set-build-xml-var.build.xml.content}" property="set-build-xml-var.value.beginindex">
+				<antelope:indexof string="property name=&quot;@{build.xml.var.name}&quot; value=&quot;" fromindex="0" />
+			</antelope:stringutil>
+
+			<if>
+				<equals arg1="${set-build-xml-var.value.beginindex}" arg2="-1" />
+				<then>
+					<var name="set-build-xml-var.return" unset="true" />
+				</then>
+				<else>
+					<antelope:stringutil string="${set-build-xml-var.build.xml.content}" property="set-build-xml-var.value.beginindex">
+						<antelope:indexof string="value=&quot;" fromindex="${set-build-xml-var.value.beginindex}" />
+					</antelope:stringutil>
+
+					<antelope:math
+						datatype="int"
+						operand1="${set-build-xml-var.value.beginindex}"
+						operand2="7"
+						operation="+"
+						result="set-build-xml-var.value.beginindex"
+					/>
+
+					<antelope:stringutil string="${set-build-xml-var.build.xml.content}" property="set-build-xml-var.value.endindex">
+						<antelope:indexof string="&quot;" fromindex="${set-build-xml-var.value.beginindex}" />
+					</antelope:stringutil>
+
+					<antelope:stringutil string="${set-build-xml-var.build.xml.content}" property="set-build-xml-var.return">
+						<antelope:substring beginindex="${set-build-xml-var.value.beginindex}" endindex="${set-build-xml-var.value.endindex}" />
+					</antelope:stringutil>
+				</else>
+			</if>
+
+			<var name="set-build-xml-var.build.xml.content" unset="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="set-module-properties">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<var name="module.dir.unix" unset="true" />
+
+			<pathconvert property="module.dir.unix" targetos="unix">
+				<path location="@{module.dir}" />
+			</pathconvert>
+
+			<var name="module.auto.deploy.dir" unset="true" />
+			<var name="original.lib.name" unset="true" />
+			<var name="original.lib.version" unset="true" />
+			<var name="original.lib.url" unset="true" />
+			<var name="plugin.full.version" unset="true" />
+			<var name="plugin.jars" unset="true" />
+			<var name="plugin.required.contexts" unset="true" />
+			<var name="plugin.tlds" unset="true" />
+			<var name="plugin.version" unset="true" />
+
+			<set-build-xml-var
+				build.xml.var.name="auto.deploy.dir"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="module.auto.deploy.dir" value="${set-build-xml-var.return}" />
+				</then>
+				<else>
+					<var name="module.auto.deploy.dir" value="${auto.deploy.dir}" />
+				</else>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="original.lib.name"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="original.lib.name" value="${set-build-xml-var.return}" />
+				</then>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="original.lib.version"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="original.lib.version" value="${set-build-xml-var.return}" />
+				</then>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="original.lib.url"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="original.lib.url" value="${set-build-xml-var.return}" />
+				</then>
+			</if>
+
+			<if>
+				<available file="@{module.dir}/docroot/WEB-INF/liferay-plugin-package.properties" />
+				<then>
+					<var name="plugin-package.module-incremental-version" unset="true" />
+					<var name="plugin-package.portal-dependency-jars" unset="true" />
+					<var name="plugin-package.portal-dependency-tlds" unset="true" />
+					<var name="plugin-package.required-deployment-contexts" unset="true" />
+
+					<property file="@{module.dir}/docroot/WEB-INF/liferay-plugin-package.properties" prefix="plugin-package" />
+
+					<if>
+						<isset property="plugin-package.module-full-version" />
+						<then>
+							<var name="plugin.full.version" value="${plugin-package.module-full-version}" />
+						</then>
+					</if>
+
+					<var name="plugin.jars" value="${plugin-package.portal-dependency-jars}" />
+					<var name="plugin.required.contexts" value="${plugin-package.required-deployment-contexts}" />
+					<var name="plugin.tlds" value="${plugin-package.portal-dependency-tlds}" />
+					<var name="plugin.version" value="${plugin-package.module-incremental-version}" />
+				</then>
+				<else>
+					<set-build-xml-var
+						build.xml.var.name="plugin.version"
+						module.dir="@{module.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="plugin.version" value="${set-build-xml-var.return}" />
+						</then>
+						<else>
+							<var name="plugin.version" value="1" />
+						</else>
+					</if>
+
+					<set-build-xml-var
+						bnd.property.key="Bundle-Version"
+						build.xml.var.name="plugin.full.version"
+						module.dir="@{module.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="plugin.full.version" value="${set-build-xml-var.return}" />
+						</then>
+					</if>
+				</else>
+			</if>
+
+			<if>
+				<not>
+					<isset property="plugin.full.version" />
+				</not>
+				<then>
+					<var name="plugin.full.version" value="${lp.version}.${plugin.version}${lp.version.file.suffix}" />
+				</then>
+			</if>
+
+			<set-build-xml-var
+				bnd.property.key="Bundle-SymbolicName"
+				build.xml.var.name="plugin.name"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="plugin.name" value="${set-build-xml-var.return}" />
+				</then>
+				<else>
+					<if>
+						<equals arg1="@{module.dir}" arg2="." />
+						<then>
+							<var name="plugin.name" value="${ant.project.name}" />
+						</then>
+						<else>
+							<antelope:grep
+								group="1"
+								in="@{module.dir}"
+								property="plugin.name"
+								regex="(?:.*[/\\])(.*)"
+							/>
+						</else>
+					</if>
+				</else>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="theme.parent"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="theme.parent" value="${set-build-xml-var.return}" />
+				</then>
+				<else>
+					<var name="theme.parent" unset="true" />
+				</else>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="theme.type"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="theme.type" value="${set-build-xml-var.return}" />
+				</then>
+				<else>
+					<var name="theme.type" unset="true" />
+				</else>
+			</if>
+
+			<if>
+				<and>
+					<or>
+						<antelope:endswith string="${plugin.name}" with="-ext" />
+						<antelope:endswith string="${plugin.name}" with="-hook" />
+						<antelope:endswith string="${plugin.name}" with="-layouttpl" />
+						<antelope:endswith string="${plugin.name}" with="-portlet" />
+						<antelope:endswith string="${plugin.name}" with="-theme" />
+						<antelope:endswith string="${plugin.name}" with="-web" />
+					</or>
+					<not>
+						<resourcecontains
+							resource="${module.dir.unix}/build.xml"
+							substring="/build-common-osgi-plugin.xml&quot;"
+						/>
+					</not>
+				</and>
+				<then>
+					<var name="plugin.packaging" value="war" />
+				</then>
+				<else>
+					<var name="plugin.packaging" value="jar" />
+				</else>
+			</if>
+
+			<var name="plugin.file" value="${sdk.dir}/dist/${plugin.name}-${plugin.full.version}.${plugin.packaging}" />
+			<var name="plugin.javadoc.file" value="${sdk.dir}/dist/${plugin.name}-${plugin.full.version}-javadoc.zip" />
+			<var name="plugin.pom.file" value="${sdk.dir}/dist/${plugin.name}-${plugin.full.version}.pom" />
+			<var name="plugin.sources.file" value="${sdk.dir}/dist/${plugin.name}-${plugin.full.version}-sources.${plugin.packaging}" />
+			<var name="plugin.src.file" value="${sdk.dir}/dist/${plugin.name}-src-${plugin.full.version}.zip" />
+			<var name="plugin.wsdd.file" value="${sdk.dir}/dist/${plugin.name}-wsdd-${plugin.full.version}.jar" />
+
+			<if>
+				<available file="@{module.dir}/src" />
+				<then>
+					<var name="plugin.classes.dir" value="@{module.dir}/classes" />
+					<var name="plugin.lib.dir" value="@{module.dir}/lib" />
+					<var name="plugin.source.dir" value="@{module.dir}/src" />
+
+					<if>
+						<available file="@{module.dir}/lib" />
+						<then>
+							<path id="plugin-lib.classpath">
+								<fileset dir="@{module.dir}/lib" includes="*.jar" />
+								<pathelement location="@{module.dir}/classes" />
+							</path>
+						</then>
+						<else>
+							<path id="plugin-lib.classpath">
+								<pathelement location="@{module.dir}/classes" />
+							</path>
+						</else>
+					</if>
+				</then>
+				<else>
+					<var name="plugin.classes.dir" value="@{module.dir}/docroot/WEB-INF/classes" />
+					<var name="plugin.lib.dir" value="@{module.dir}/docroot/WEB-INF/lib" />
+					<var name="plugin.source.dir" value="@{module.dir}/docroot/WEB-INF/src" />
+
+					<if>
+						<available file="@{module.dir}/tmp" />
+						<then>
+							<path id="plugin-lib.classpath">
+								<fileset dir="@{module.dir}/docroot/WEB-INF/lib" erroronmissingdir="false" includes="*.jar" />
+								<fileset dir="@{module.dir}/tmp/WEB-INF/lib" erroronmissingdir="false" includes="*.jar" />
+								<pathelement location="@{module.dir}/docroot/WEB-INF/classes" />
+								<pathelement location="@{module.dir}/tmp/WEB-INF/classes" />
+							</path>
+						</then>
+						<else>
+							<path id="plugin-lib.classpath">
+								<fileset dir="@{module.dir}/docroot/WEB-INF/lib" erroronmissingdir="false" includes="*.jar" />
+								<pathelement location="@{module.dir}/docroot/WEB-INF/classes" />
+							</path>
+						</else>
+					</if>
+				</else>
+			</if>
+
+			<if>
+				<resourcecontains
+					resource="${module.dir.unix}/build.xml"
+					substring="/build-common-osgi-plugin.xml&quot;"
+				/>
+				<then>
+					<property name="plugin-lib.classpath.path" refid="plugin-lib.classpath" />
+
+					<set-build-xml-var
+						build.xml.var.name="ignore.osgi.portal.classpath"
+						module.dir="@{module.dir}"
+					/>
+
+					<path id="plugin-lib.classpath">
+						<fileset dir="@{module.dir}/lib" erroronmissingdir="false" includes="*.jar" />
+						<pathelement path="${plugin-lib.classpath.path}" />
+						<path refid="portal.classpath" />
+					</path>
+
+					<var name="plugin-lib.classpath.path" unset="true" />
+				</then>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="plugin-lib.additional.dir"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<property name="plugin-lib.classpath.path" refid="plugin-lib.classpath" />
+
+					<path id="plugin-lib.classpath">
+						<fileset dir="@{module.dir}/${set-build-xml-var.return}" includes="*.jar" />
+						<pathelement path="${plugin-lib.classpath.path}" />
+					</path>
+
+					<var name="plugin-lib.classpath.path" unset="true" />
+				</then>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="ivy.resolve.transitive.dependencies"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="plugin.ivy.resolve.transitive.dependencies" value="${set-build-xml-var.return}" />
+				</then>
+				<else>
+					<var name="plugin.ivy.resolve.transitive.dependencies" value="${ivy.resolve.transitive.dependencies}" />
+				</else>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<process-ivy />
+
+	<target name="publish">
+		<ivy:settings file="${sdk.dir}/ivy-settings-publisher.xml" />
+
+		<ivy:resolve
+			conf="default,provided"
+			log="${ivy.log.level}"
+			transitive="${ivy.resolve.transitive.dependencies}"
+		/>
+
+		<property name="ivy.pom.description" value="${plugin.name}" />
+		<property name="ivy.pom.name" value="${plugin.name}" />
+
+		<property name="plugin.release.qualifier" value="" />
+
+		<if>
+			<equals arg1="${plugin.release.qualifier}" arg2="-SNAPSHOT" />
+			<then>
+				<property name="sonatype.password" value="${sonatype.snapshot.password}" />
+				<property name="sonatype.url" value="${sonatype.snapshot.url}" />
+				<property name="sonatype.username" value="${sonatype.snapshot.username}" />
+			</then>
+			<else>
+				<property name="sonatype.password" value="${sonatype.release.password}" />
+				<property name="sonatype.url" value="${sonatype.release.url}" />
+				<property name="sonatype.username" value="${sonatype.release.username}" />
+			</else>
+		</if>
+
+		<property name="ivy.pom.version" value="${plugin.full.version}${plugin.release.qualifier}" />
+
+		<ivy:makepom
+			description="${ivy.pom.description}"
+			ivyfile="ivy.xml"
+			pomfile="${plugin.pom.file}"
+			templatefile="${sdk.dir}/tools/templates/pom_tmpl/template.pom"
+		>
+			<mapping conf="default" scope="compile" />
+			<mapping conf="provided" scope="provided" />
+			<mapping conf="runtime" scope="runtime" />
+		</ivy:makepom>
+
+		<artifact:pom file="${plugin.pom.file}" id="${plugin.name}" />
+
+		<if>
+			<equals arg1="${publish.target}" arg2="local" />
+			<then>
+				<if>
+					<and>
+						<available file="${plugin.javadoc.file}" />
+						<available file="${plugin.source.file}" />
+					</and>
+					<then>
+						<artifact:install file="${plugin.file}">
+							<attach classifier="javadoc" file="${plugin.javadoc.file}" />
+							<attach classifier="sources" file="${plugin.source.file}" />
+							<pom refid="${plugin.name}" />
+						</artifact:install>
+					</then>
+					<elseif>
+						<available file="${plugin.javadoc.file}" />
+						<then>
+							<artifact:install file="${plugin.file}">
+								<attach classifier="javadoc" file="${plugin.javadoc.file}" />
+								<pom refid="${plugin.name}" />
+							</artifact:install>
+						</then>
+					</elseif>
+					<elseif>
+						<available file="${plugin.source.file}" />
+						<then>
+							<artifact:install file="${plugin.file}">
+								<attach classifier="sources" file="${plugin.source.file}" />
+								<pom refid="${plugin.name}" />
+							</artifact:install>
+						</then>
+					</elseif>
+					<else>
+						<artifact:install file="${plugin.file}">
+							<pom refid="${plugin.name}" />
+						</artifact:install>
+					</else>
+				</if>
+			</then>
+			<else>
+				<if>
+					<equals arg1="${plugin.release.qualifier}" arg2="-SNAPSHOT" />
+					<then>
+						<record action="start" name="${basedir}/maven.deploy.log" />
+					</then>
+				</if>
+
+				<if>
+					<and>
+						<available file="${plugin.javadoc.file}" />
+						<available file="${plugin.source.file}" />
+					</and>
+					<then>
+						<artifact:deploy file="${plugin.file}">
+							<attach classifier="javadoc" file="${plugin.javadoc.file}" />
+							<attach classifier="sources" file="${plugin.source.file}" />
+							<pom refid="${plugin.name}" />
+							<remoteRepository url="${sonatype.url}">
+								<authentication password="${sonatype.password}" username="${sonatype.username}" />
+							</remoteRepository>
+						</artifact:deploy>
+					</then>
+					<elseif>
+						<available file="${plugin.javadoc.file}" />
+						<then>
+							<artifact:deploy file="${plugin.file}">
+								<attach classifier="javadoc" file="${plugin.javadoc.file}" />
+								<pom refid="${plugin.name}" />
+								<remoteRepository url="${sonatype.url}">
+									<authentication password="${sonatype.password}" username="${sonatype.username}" />
+								</remoteRepository>
+							</artifact:deploy>
+						</then>
+					</elseif>
+					<elseif>
+						<available file="${plugin.source.file}" />
+						<then>
+							<artifact:deploy file="${plugin.file}">
+								<attach classifier="sources" file="${plugin.source.file}" />
+								<pom refid="${plugin.name}" />
+								<remoteRepository url="${sonatype.url}">
+									<authentication password="${sonatype.password}" username="${sonatype.username}" />
+								</remoteRepository>
+							</artifact:deploy>
+						</then>
+					</elseif>
+					<else>
+						<artifact:deploy file="${plugin.file}">
+							<pom refid="${plugin.name}" />
+							<remoteRepository url="${sonatype.url}">
+								<authentication password="${sonatype.password}" username="${sonatype.username}" />
+							</remoteRepository>
+						</artifact:deploy>
+					</else>
+				</if>
+
+				<if>
+					<equals arg1="${plugin.release.qualifier}" arg2="-SNAPSHOT" />
+					<then>
+						<record action="stop" name="${basedir}/maven.deploy.log" />
+
+						<record-git-commit-snapshot />
+
+						<delete file="maven.deploy.log" />
+					</then>
+				</if>
+			</else>
+		</if>
+	</target>
+</project>
\ No newline at end of file
diff --git a/build-common-osgi-plugin.xml b/build-common-osgi-plugin.xml
new file mode 100644
index 0000000..dae9b0d
--- /dev/null
+++ b/build-common-osgi-plugin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-osgi-plugin">
+	<import file="build-common-plugin.xml" />
+
+	<target name="jar">
+		<jar-macro
+			module.dir="${basedir}"
+		/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/build-common-plugin.xml b/build-common-plugin.xml
new file mode 100644
index 0000000..5e167da
--- /dev/null
+++ b/build-common-plugin.xml
@@ -0,0 +1,950 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-plugin" xmlns:antelope="antlib:ise.antelope.tasks">
+	<import file="build-common.xml" />
+
+	<property name="plugins.includes.path" value="${basedir}" />
+
+	<set-module-properties
+		module.dir="${basedir}"
+	/>
+
+	<macrodef name="build-service">
+		<attribute name="service.api.dir" />
+		<attribute name="service.auto.namespace.tables" default="true" />
+		<attribute name="service.hbm.file.name" default="portlet-hbm.xml" />
+		<attribute name="service.model.hints.file.name" default="portlet-model-hints.xml" />
+		<attribute name="service.props.util" default="com.liferay.util.service.ServiceProps" />
+		<attribute name="service.spring.file.name" default="portlet-spring.xml" />
+		<attribute name="service.sql.dir" />
+		<attribute name="service.test.dir" />
+
+		<sequential>
+			<if>
+				<available file="docroot" />
+				<then>
+					<var name="service.base.dir" value="docroot/WEB-INF" />
+				</then>
+				<else>
+					<var name="service.base.dir" value="." />
+				</else>
+			</if>
+
+			<if>
+				<available file="bnd.bnd" />
+				<then>
+					<var name="service.osgi.module" value="true" />
+					<var name="service.plugin.name" value="${plugin.name}" />
+					<var name="service.spring.namespaces" value="beans,osgi" />
+				</then>
+				<else>
+					<var name="service.osgi.module" value="false" />
+					<var name="service.plugin.name" value="${plugin.name}" />
+					<var name="service.spring.namespaces" value="beans" />
+				</else>
+			</if>
+
+			<mkdir dir="@{service.api.dir}" />
+			<mkdir dir="@{service.sql.dir}" />
+
+			<mkdir dir="${service.base.dir}/classes" />
+			<mkdir dir="${service.base.dir}/lib" />
+			<mkdir dir="${service.base.dir}/src" />
+
+			<copy todir="${service.base.dir}/classes">
+				<fileset dir="${service.base.dir}/src" excludes="**/*.java" />
+			</copy>
+
+			<path id="service.builder.classpath">
+				<path refid="lib.classpath" />
+				<path refid="portal.classpath" />
+				<fileset dir="${app.server.lib.portal.dir}" includes="commons-digester.jar,commons-lang.jar,easyconf.jar" />
+				<fileset dir="${sdk.dir}/dependencies/org.freemarker/lib" includes="*.jar" />
+				<fileset dir="${service.base.dir}/lib" includes="*.jar" />
+				<pathelement location="${sdk.dir}/misc" />
+				<pathelement location="${service.base.dir}/classes" />
+			</path>
+
+			<if>
+				<os family="windows" />
+				<then>
+					<classpath-to-jar
+						classpathref="service.builder.classpath"
+						jarfile="service-builder-classpath.jar"
+					/>
+				</then>
+			</if>
+
+			<if>
+				<not>
+					<isset property="service.input.file" />
+				</not>
+				<then>
+					<property name="service.input.file" value="${basedir}/${service.base.dir}/service.xml" />
+				</then>
+			</if>
+
+			<java
+				classname="com.liferay.portal.tools.servicebuilder.ServiceBuilder"
+				classpathref="service.builder.classpath"
+				fork="true"
+				newenvironment="true"
+				outputproperty="build-service.output"
+			>
+				<jvmarg value="-Dfile.encoding=UTF-8" />
+				<jvmarg value="-Xms512m" />
+				<jvmarg value="-Xmx1024m" />
+				<jvmarg value="-Xss2048k" />
+				<jvmarg value="-XX:MaxPermSize=512m" />
+				<arg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<arg value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger" />
+				<arg value="service.api.dir=@{service.api.dir}" />
+				<arg value="service.auto.namespace.tables=@{service.auto.namespace.tables}" />
+				<arg value="service.bean.locator.util=com.liferay.util.bean.PortletBeanLocatorUtil" />
+				<arg value="service.build.number=1" />
+				<arg value="service.build.number.increment=true" />
+				<arg value="service.hbm.file=${basedir}/${service.base.dir}/src/META-INF/@{service.hbm.file.name}" />
+				<arg value="service.impl.dir=${basedir}/${service.base.dir}/src" />
+				<arg value="service.input.file=${service.input.file}" />
+				<arg value="service.model.hints.file=${basedir}/${service.base.dir}/src/META-INF/@{service.model.hints.file.name}" />
+				<arg value="service.orm.file=${basedir}/${service.base.dir}/src/META-INF/portlet-orm.xml" />
+				<arg value="service.osgi.module=${service.osgi.module}" />
+				<arg value="service.plugin.name=${service.plugin.name}" />
+				<arg value="service.props.util=@{service.props.util}" />
+				<arg value="service.remoting.file=" />
+				<arg value="service.resources.dir=${basedir}/${service.base.dir}/src" />
+				<arg value="service.spring.base.file=${basedir}/${service.base.dir}/src/META-INF/base-spring.xml" />
+				<arg value="service.spring.cluster.file=${basedir}/${service.base.dir}/src/META-INF/cluster-spring.xml" />
+				<arg value="service.spring.dynamic.data.source.file=${basedir}/${service.base.dir}/src/META-INF/dynamic-data-source-spring.xml" />
+				<arg value="service.spring.file=${basedir}/${service.base.dir}/src/META-INF/@{service.spring.file.name}" />
+				<arg value="service.spring.hibernate.file=${basedir}/${service.base.dir}/src/META-INF/hibernate-spring.xml" />
+				<arg value="service.spring.infrastructure.file=${basedir}/${service.base.dir}/src/META-INF/infrastructure-spring.xml" />
+				<arg value="service.spring.shard.data.source.file=${basedir}/${service.base.dir}/src/META-INF/shard-data-source-spring.xml" />
+				<arg value="service.spring.namespaces=${service.spring.namespaces}" />
+				<arg value="service.sql.dir=@{service.sql.dir}" />
+				<arg value="service.sql.file=tables.sql" />
+				<arg value="service.sql.indexes.file=indexes.sql" />
+				<arg value="service.sql.indexes.properties.file=indexes.properties" />
+				<arg value="service.sql.sequences.file=sequences.sql" />
+				<arg value="service.target.entity.name=${service.target.entity.name}" />
+				<arg value="service.test.dir=@{service.test.dir}" />
+			</java>
+
+			<if>
+				<os family="windows" />
+				<then>
+					<delete file="service-builder-classpath.jar" />
+				</then>
+			</if>
+
+			<delete file="ServiceBuilder.temp" />
+
+			<echo>${build-service.output}</echo>
+
+			<if>
+				<contains string="${build-service.output}" substring="Error" />
+				<then>
+					<fail>Service Builder generated exceptions.</fail>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="classpath-to-jar">
+		<attribute name="classpathref" />
+		<attribute name="jarfile" />
+
+		<sequential>
+
+			<!--
+			Windows chokes if the classpath is longer than 32 kb. But the
+			workaround only works for Ant 1.8 and above. See LPS-29085.
+			-->
+
+			<if>
+				<and>
+					<not>
+						<contains string="${ant.version}" substring="1.6" />
+					</not>
+					<not>
+						<contains string="${ant.version}" substring="1.7" />
+					</not>
+				</and>
+				<then>
+					<manifestclasspath
+						jarfile="@{jarfile}"
+						maxParentLevels="99"
+						property="manifest.classpath"
+					>
+						<classpath refid="@{classpathref}" />
+					</manifestclasspath>
+
+					<manifest file="@{jarfile}.manifest">
+						<attribute name="Class-Path" value="${manifest.classpath}" />
+					</manifest>
+
+					<jar
+						destfile="@{jarfile}"
+						manifest="@{jarfile}.manifest"
+					/>
+
+					<delete file="@{jarfile}.manifest" />
+
+					<var name="manifest.classpath" unset="true" />
+
+					<path id="@{classpathref}">
+						<fileset file="@{jarfile}" />
+					</path>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-jsp">
+		<attribute name="compile.jsp.delete.generated.files" default="true" />
+		<attribute name="compile.jsp.docroot.dir" />
+		<attribute name="compile.jsp.temp.dir" default="" />
+
+		<sequential>
+			<if>
+				<not>
+					<equals arg1="${app.server.type}" arg2="tomcat" />
+				</not>
+				<then>
+					<fail>Compiling JSPs with ${app.server.type} is not supported.</fail>
+				</then>
+			</if>
+
+			<if>
+				<available file="@{compile.jsp.docroot.dir}" />
+				<then>
+					<path id="jspc.classpath.common">
+						<pathelement location="${env.JAVA_HOME}/jre/lib/rt.jar" />
+						<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
+						<fileset dir="${sdk.dir}/dependencies/com.liferay.jasper.jspc/lib" includes="*.jar" />
+						<pathelement location="${app.server.lib.portal.dir}/ant.jar" />
+						<fileset dir="${basedir}" includes="lib/*.jar" />
+						<fileset dir="${basedir}" includes="docroot/WEB-INF/lib/*.jar" />
+						<fileset dir="@{compile.jsp.docroot.dir}" includes="WEB-INF/lib/*.jar" />
+					</path>
+
+					<local name="jspc.module.web" />
+
+					<if>
+						<equals arg1="@{compile.jsp.temp.dir}" arg2="" />
+						<then>
+							<path id="jspc.classpath">
+								<path refid="jspc.classpath.common" />
+								<pathelement location="@{compile.jsp.docroot.dir}/WEB-INF/classes" />
+							</path>
+
+							<property name="jspc.module.web" value="false" />
+						</then>
+						<else>
+							<path id="jspc.classpath.module.common">
+								<path refid="jspc.classpath.common" />
+								<fileset dir="${app.server.lib.portal.dir}" includes="*.jar" />
+								<fileset dir="${module.framework.base.dir}/modules" includes="*.jar" />
+								<pathelement location="@{compile.jsp.temp.dir}" />
+							</path>
+
+							<if>
+								<available file="@{compile.jsp.docroot.dir}/WEB-INF" type="dir" />
+								<then>
+									<path id="jspc.classpath">
+										<path refid="jspc.classpath.module.common" />
+										<pathelement location="@{compile.jsp.docroot.dir}/WEB-INF/classes" />
+									</path>
+								</then>
+								<else>
+									<path id="jspc.classpath">
+										<path refid="jspc.classpath.module.common" />
+									</path>
+								</else>
+							</if>
+
+							<property name="jspc.module.web" value="true" />
+						</else>
+					</if>
+
+					<tstamp>
+						<format property="tstamp.value" pattern="yyyyMMddkkmmssSSS" />
+					</tstamp>
+
+					<var name="compile.jsp.jspc.dir" value="${tstamp.value}" />
+
+					<mkdir dir="${compile.jsp.jspc.dir}" />
+
+					<java
+						classname="com.liferay.jasper.jspc.JspC"
+						classpathref="jspc.classpath"
+						fork="true"
+						jvm="${env.JAVA_HOME}/bin/java"
+						newenvironment="true"
+						outputproperty="jspc.output"
+					>
+						<sysproperty key="jspc.module.web" value="${jspc.module.web}" />
+						<sysproperty key="jspc.portal.dir" value="${app.server.portal.dir}" />
+						<arg line="-d ${compile.jsp.jspc.dir}/src -webapp @{compile.jsp.docroot.dir}" />
+					</java>
+
+					<echo>${jspc.output}</echo>
+
+					<if>
+						<contains string="${jspc.output}" substring="JasperException" />
+						<then>
+							<delete dir="${compile.jsp.jspc.dir}/src" quiet="true" />
+
+							<fail>JSPs failed to compile.</fail>
+						</then>
+					</if>
+
+					<if>
+						<available file="${compile.jsp.jspc.dir}/src" type="dir" />
+						<then>
+							<mkdir dir="${compile.jsp.jspc.dir}/classes" />
+
+							<javac
+								classpathref="jspc.classpath"
+								compiler="${javac.compiler}"
+								deprecation="${javac.deprecation}"
+								destdir="${compile.jsp.jspc.dir}/classes"
+								encoding="${javac.encoding}"
+								errorProperty="jspc.javac.fail"
+								failonerror="false"
+								includeAntRuntime="false"
+								nowarn="on"
+								srcdir="${compile.jsp.jspc.dir}/src"
+							/>
+
+							<if>
+								<istrue value="@{compile.jsp.delete.generated.files}" />
+								<then>
+									<delete dir="${compile.jsp.jspc.dir}" quiet="true" />
+								</then>
+							</if>
+						</then>
+					</if>
+
+					<if>
+						<istrue value="${jspc.javac.fail}" />
+						<then>
+							<fail>JSPs failed to compile.</fail>
+						</then>
+					</if>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<target name="all">
+		<antcall target="clean" />
+		<antcall target="deploy" />
+	</target>
+
+	<target name="build-client">
+		<property name="client.url" value="http://localhost:8080/${plugin.name}/api/axis" />
+
+		<echo message="Make sure the server is listening on ${client.url}." />
+		<echo message="" />
+
+		<mkdir dir="docroot/WEB-INF/client/src" />
+
+		<java
+			classname="com.liferay.portal.tools.PortalClientBuilder"
+			classpathref="portal.classpath"
+			failonerror="true"
+			fork="true"
+			newenvironment="true"
+		>
+			<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+			<arg value="docroot/WEB-INF/server-config.wsdd" />
+			<arg value="docroot/WEB-INF/client/src" />
+			<arg value="docroot/WEB-INF/client/namespace-mapping.properties" />
+			<arg value="${client.url}" />
+		</java>
+
+		<mkdir dir="docroot/WEB-INF/client/classes" />
+
+		<compile-java
+			javac.classpathref="portal.classpath"
+			javac.destdir="docroot/WEB-INF/client/classes"
+			javac.srcdir="docroot/WEB-INF/client/src"
+		/>
+
+		<zip destfile="docroot/WEB-INF/client/${plugin.name}-client.jar">
+			<fileset dir="docroot/WEB-INF/client/classes" />
+			<fileset dir="docroot/WEB-INF/client/src" />
+		</zip>
+
+		<delete dir="docroot/WEB-INF/client/classes" />
+		<delete dir="docroot/WEB-INF/client/src" />
+	</target>
+
+	<target name="build-lang">
+		<if>
+			<available file="docroot/WEB-INF/src/content" />
+			<then>
+				<antcall target="build-lang-cmd">
+					<param name="lang.dir" value="docroot/WEB-INF/src/content" />
+					<param name="lang.file" value="Language" />
+					<param name="lang.translate" value="true" />
+				</antcall>
+			</then>
+		</if>
+
+		<if>
+			<available file="src/content" />
+			<then>
+				<antcall target="build-lang-cmd">
+					<param name="lang.dir" value="src/content" />
+					<param name="lang.file" value="Language" />
+					<param name="lang.translate" value="true" />
+				</antcall>
+			</then>
+		</if>
+	</target>
+
+	<target name="build-lang-cmd">
+		<java
+			classname="com.liferay.portal.tools.LangBuilder"
+			classpathref="portal.classpath"
+			fork="true"
+			newenvironment="true"
+		>
+			<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+			<jvmarg value="-Dfile.encoding=UTF-8" />
+			<jvmarg value="-Duser.country=US" />
+			<jvmarg value="-Duser.language=en" />
+			<arg value="lang.dir=${lang.dir}" />
+			<arg value="lang.file=${lang.file}" />
+			<arg value="lang.plugin=true" />
+			<arg value="lang.translate=${lang.translate}" />
+		</java>
+
+		<copy file="${lang.dir}/${lang.file}.properties" tofile="${lang.dir}/${lang.file}_en.properties" />
+	</target>
+
+	<target name="build-service">
+		<if>
+			<available file="docroot" />
+			<then>
+				<var name="service.base.dir" value="docroot/WEB-INF" />
+			</then>
+			<else>
+				<var name="service.base.dir" value="." />
+			</else>
+		</if>
+
+		<build-service
+			service.api.dir="${basedir}/${service.base.dir}/service"
+			service.sql.dir="${basedir}/${service.base.dir}/sql"
+			service.test.dir=""
+		/>
+
+		<mkdir dir="${service.base.dir}/service-classes" />
+
+		<path id="service.classpath">
+			<path refid="lib.classpath" />
+			<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
+			<fileset dir="${sdk.dir}/dependencies/aQute.bnd/lib" includes="*.jar" />
+			<fileset dir="${service.base.dir}/lib" excludes="${plugin.name}-service.jar" includes="*.jar" />
+		</path>
+
+		<compile-java
+			javac.classpathref="service.classpath"
+			javac.destdir="${service.base.dir}/service-classes"
+			javac.srcdir="${service.base.dir}/service"
+		/>
+
+		<jar
+			basedir="${service.base.dir}/service-classes"
+			destfile="${service.base.dir}/lib/${plugin.name}-service.jar"
+		/>
+
+		<delete dir="${service.base.dir}/service-classes" />
+	</target>
+
+	<target name="build-wsdd">
+		<loop-macrodef-or-target
+			module.dirs="${basedir}"
+			target.name="compile"
+		/>
+
+		<path id="wsdd.builder.classpath">
+			<path refid="lib.classpath" />
+			<path refid="portal.classpath" />
+			<fileset dir="${plugin.lib.dir}" includes="*.jar" />
+			<pathelement location="${plugin.classes.dir}" />
+		</path>
+
+		<if>
+			<os family="windows" />
+			<then>
+				<classpath-to-jar
+					classpathref="wsdd.builder.classpath"
+					jarfile="wsdd-builder-classpath.jar"
+				/>
+			</then>
+		</if>
+
+		<java
+			classname="com.liferay.portal.tools.WSDDBuilder"
+			classpathref="wsdd.builder.classpath"
+			fork="true"
+			maxmemory="256m"
+			newenvironment="true"
+			outputproperty="build-wsdd.output"
+		>
+			<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+			<jvmarg value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger" />
+			<arg value="wsdd.input.file=${plugin.source.dir}/../service.xml" />
+			<arg value="wsdd.server.config.file=${plugin.source.dir}/../server-config.wsdd" />
+			<arg value="wsdd.service.namespace=Plugin" />
+			<arg value="wsdd.output.path=${plugin.source.dir}/" />
+		</java>
+
+		<if>
+			<os family="windows" />
+			<then>
+				<delete file="wsdd-builder-classpath.jar" />
+			</then>
+		</if>
+
+		<echo>${build-wsdd.output}</echo>
+
+		<if>
+			<contains string="${build-wsdd.output}" substring="IOException" />
+			<then>
+				<fail>WSDD Builder generated exceptions.</fail>
+			</then>
+		</if>
+
+		<if>
+			<available file="bnd.bnd" />
+			<then>
+				<property file="bnd.bnd" prefix="bnd." />
+
+				<echo file="${plugin.name}-wsdd.bnd">Bundle-SymbolicName: ${bnd.Bundle-SymbolicName}.wsdd
+Bundle-Name: ${bnd.Bundle-Name} WSDD descriptors
+Bundle-Version: ${bnd.Bundle-Version}
+Fragment-Host: ${bnd.Bundle-SymbolicName}
+Import-Package: javax.servlet,javax.servlet.http
+Include-Resource: WEB-INF/=server-config.wsdd,classes;filter:=*.wsdd
+				</echo>
+
+				<manifest-helper />
+
+				<bndexpand propertyfile="${sdk.dir}/common.bnd" />
+
+				<bnd eclipse="false" exceptions="true" failok="false" inherit="true" output="${plugin.wsdd.file}">
+					<bndfiles>
+						<fileset dir="${basedir}">
+							<include name="${plugin.name}-wsdd.bnd" />
+						</fileset>
+					</bndfiles>
+					<classpath>
+						<pathelement location="${plugin.classes.dir}" />
+					</classpath>
+					<property name="-sourcepath" value="${basedir}" />
+				</bnd>
+
+				<delete file="${basedir}/${plugin.name}-wsdd.bnd" failonerror="false" />
+			</then>
+		</if>
+	</target>
+
+	<target name="compile-import-shared">
+		<compile-import-shared
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="compile-jsp">
+		<if>
+			<resourcecount count="0" when="gt">
+				<fileset
+					dir="${basedir}"
+					excludes="**/custom_jsps/**/*,**/dependencies/**/*"
+					includes="docroot/**/*.jsp,src/META-INF/resources/**/*.jsp,tmp/**/*.jsp"
+				/>
+			</resourcecount>
+			<then>
+				<set-module-properties
+					module.dir="${basedir}"
+				/>
+
+				<if>
+					<isset property="compile.jsp.docroot.dir" />
+					<then>
+						<compile
+							module.dir="${basedir}"
+						/>
+
+						<compile-jsp
+							compile.jsp.docroot.dir="${compile.jsp.docroot.dir}"
+						/>
+					</then>
+					<elseif>
+						<available file="bnd.bnd" type="file" />
+						<then>
+							<antcall target="jar">
+								<param name="plugins.includes.path" value="${basedir}" />
+							</antcall>
+
+							<tstamp>
+								<format property="tstamp.value" pattern="yyyyMMddkkmmssSSS" />
+							</tstamp>
+
+							<unzip dest="${tstamp.value}" src="${plugin.file}" />
+
+							<if>
+								<available file="${tstamp.value}/META-INF/resources" type="dir" />
+								<then>
+									<compile-jsp
+										compile.jsp.docroot.dir="${tstamp.value}/META-INF/resources"
+										compile.jsp.temp.dir="${tstamp.value}"
+									/>
+								</then>
+								<else>
+									<compile-jsp
+										compile.jsp.docroot.dir="${tstamp.value}"
+										compile.jsp.temp.dir="${tstamp.value}"
+									/>
+								</else>
+							</if>
+
+							<delete dir="${tstamp.value}" />
+						</then>
+					</elseif>
+					<else>
+						<loop-macrodef-or-target
+							module.dirs="${basedir}"
+							target.name="compile"
+						/>
+
+						<compile-jsp
+							compile.jsp.docroot.dir="docroot"
+						/>
+					</else>
+				</if>
+			</then>
+		</if>
+	</target>
+
+	<target name="compile-test">
+		<compile-test
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="compile-test-integration">
+		<compile-test-integration
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="compile-test-unit">
+		<compile-test-unit
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="format-wsdl">
+		<for param="wsdl.full.path">
+			<path>
+				<fileset
+					dir="."
+					includes="docroot/WEB-INF/wsdl/*.wsdl,docroot/WEB-INF/wsdl/**/*.wsdl"
+				/>
+			</path>
+			<sequential>
+				<java
+					classname="com.liferay.portal.tools.XMLFormatter"
+					classpathref="portal.classpath"
+					fork="true"
+					newenvironment="true"
+				>
+					<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+					<jvmarg value="-Dxml.formatter.file=@{wsdl.full.path}" />
+					<jvmarg value="-Dxml.formatter.strip.comments=true" />
+				</java>
+			</sequential>
+		</for>
+	</target>
+
+	<target name="format-xsd">
+		<for param="xsd.full.path">
+			<path>
+				<fileset
+					dir="."
+					includes="docroot/WEB-INF/xsd/*.xsd,docroot/WEB-INF/xsd/**/*.xsd"
+				/>
+			</path>
+			<sequential>
+				<java
+					classname="com.liferay.portal.tools.XMLFormatter"
+					classpathref="portal.classpath"
+					fork="true"
+					newenvironment="true"
+				>
+					<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+					<jvmarg value="-Dxml.formatter.file=@{xsd.full.path}" />
+					<jvmarg value="-Dxml.formatter.strip.comments=true" />
+				</java>
+			</sequential>
+		</for>
+	</target>
+
+	<target name="install" depends="publish-local-m2-release" />
+
+	<target name="jar-javadoc" depends="javadoc">
+		<jar-javadoc
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="jar-source">
+		<jar-source
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="javadoc">
+		<javadoc-macro
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="merge">
+		<merge
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="merge-unzip">
+		<merge-unzip
+			module.dir="${basedir}"
+		/>
+	</target>
+
+	<target name="patch">
+		<var name="patched.file.available" value="false" />
+
+		<for param="patched.file">
+			<path>
+				<fileset
+					dir="${plugin.source.dir}"
+					includes="${patch.destination}"
+				/>
+			</path>
+			<sequential>
+				<var name="patched.file.available" value="true" />
+			</sequential>
+		</for>
+
+		<if>
+			<equals arg1="${patched.file.available}" arg2="false" />
+			<then>
+				<mirrors-get
+					dest="${patch.original.lib.name}-sources.jar"
+					src="${patch.original.lib.url}/${patch.original.lib.name}/${patch.original.lib.version}/${patch.original.lib.name}-${patch.original.lib.version}-sources.jar"
+				/>
+
+				<unjar
+					dest="${plugin.source.dir}"
+					src="${patch.original.lib.name}-sources.jar"
+				>
+					<mapper
+						type="glob"
+						from="${patch.original.lib.source.dir}/*"
+						to="*"
+					/>
+					<patternset includes="${patch.destination}" />
+				</unjar>
+
+				<delete file="${patch.original.lib.name}-sources.jar" />
+
+				<if>
+					<available file="${patch.source}" type="dir" />
+					<then>
+						<pathconvert property="patch.files">
+							<path>
+								<fileset dir="${patch.source}" />
+							</path>
+						</pathconvert>
+					</then>
+					<else>
+						<pathconvert property="patch.files">
+							<path>
+								<fileset file="${patch.source}" />
+							</path>
+						</pathconvert>
+					</else>
+				</if>
+
+				<for delimiter="${path.separator}" list="${patch.files}" param="patch.file">
+					<sequential>
+						<echo>Applying patch @{patch.file}.</echo>
+
+						<patch dir="${plugin.source.dir}" patchfile="@{patch.file}" strip="1" />
+					</sequential>
+				</for>
+			</then>
+		</if>
+
+		<var name="patched.file.available" unset="true" />
+	</target>
+
+	<target name="shrink-zip-cmd">
+		<tstamp>
+			<format property="tstamp.value" pattern="yyyyMMddkkmmssSSS" />
+		</tstamp>
+
+		<unzip
+			dest="${tstamp.value}"
+			src="${zip.file.name}"
+		>
+			<patternset
+				excludes="${zip.excludes}"
+				includes="${zip.includes}"
+			/>
+		</unzip>
+
+		<zip
+			basedir="${tstamp.value}"
+			destfile="${zip.file.name}"
+		/>
+
+		<delete dir="${tstamp.value}" />
+	</target>
+
+	<target name="test-class">
+		<test-class
+			module.dir="${basedir}"
+			test.class="${test.class}"
+		/>
+
+		<stop-test-app-server />
+	</target>
+
+	<target name="test-class-group">
+		<if>
+			<not>
+				<isset property="test.class.group.index" />
+			</not>
+			<then>
+				<fail>Use "ant test-class-group -Dtest.class.group.index=0".</fail>
+			</then>
+		</if>
+
+		<if>
+			<available file="${basedir}/test" type="dir" />
+			<then>
+				<property file="${lp.portal.project.dir}/test.class.file.names.properties" />
+
+				<propertycopy from="TEST_CLASS_GROUP_${test.class.group.index}" name="test.classes" />
+
+				<propertyregex property="test.java.classes"
+					global="true"
+					input="${test.classes}"
+					regexp="\.class"
+					replace=".java"
+				/>
+
+				<if>
+					<and>
+						<or>
+							<not>
+								<isset property="test.type" />
+							</not>
+							<equals arg1="${test.type}" arg2="unit" />
+						</or>
+						<resourcecount count="0" when="gt">
+							<fileset dir="${basedir}/test/unit" erroronmissingdir="false" includes="${test.java.classes}" />
+						</resourcecount>
+					</and>
+					<then>
+						<test-cmd
+							module.dir="${basedir}"
+							junit.forkmode="perTest"
+							test.class="${test.classes}"
+							test.type="unit"
+						/>
+					</then>
+				</if>
+
+				<if>
+					<and>
+						<or>
+							<not>
+								<isset property="test.type" />
+							</not>
+							<equals arg1="${test.type}" arg2="integration" />
+						</or>
+						<resourcecount count="0" when="gt">
+							<fileset dir="${basedir}/test/integration" erroronmissingdir="false" includes="${test.java.classes}" />
+						</resourcecount>
+					</and>
+					<then>
+						<test-cmd
+							module.dir="${basedir}"
+							junit.forkmode="once"
+							test.class="${test.classes}"
+							test.type="integration"
+						/>
+					</then>
+				</if>
+			</then>
+		</if>
+
+		<if>
+			<and>
+				<or>
+					<not>
+						<isset property="test.type" />
+					</not>
+					<equals arg1="${test.type}" arg2="unit" />
+				</or>
+				<equals arg1="${test.class.group.index}" arg2="0" />
+			</and>
+			<then>
+				<antcall target="compile-jsp" />
+			</then>
+		</if>
+	</target>
+
+	<target name="test-package">
+		<if>
+			<not>
+				<isset property="test.package" />
+			</not>
+			<then>
+				<fail>Use "ant test-package -Dtest.package=com.liferay.portal.kernel.util".</fail>
+			</then>
+		</if>
+
+		<propertyregex
+			global="true"
+			input="${test.package}"
+			property="test.package.dir"
+			regexp="\."
+			replace="/"
+		/>
+
+		<test-cmd
+			module.dir="${basedir}"
+			junit.forkmode="once"
+			test.class="**/${test.package.dir}/*Test.class"
+			test.type="integration"
+		/>
+
+		<test-cmd
+			module.dir="${basedir}"
+			junit.forkmode="perTest"
+			test.class="**/${test.package.dir}/*Test.class"
+			test.type="unit"
+		/>
+	</target>
+</project>
diff --git a/build-common-plugins-inspector.xml b/build-common-plugins-inspector.xml
new file mode 100644
index 0000000..2f5f907
--- /dev/null
+++ b/build-common-plugins-inspector.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-plugins-inspector.xml">
+	<macrodef name="record-fail">
+		<attribute name="message" />
+
+		<sequential>
+			<echo append="true" file="../plugins-inspector.log">@{message}${line.separator}</echo>
+		</sequential>
+	</macrodef>
+
+	<target name="inspect-plugins">
+		<delete file="../plugins-inspector.log" />
+
+		<checksum file="build.xml" property="build.xml.checksum" />
+
+		<if>
+			<not>
+				<equals arg1="${build.xml.checksum}" arg2="aa45183ecb2cda43d255c7070a6225de" />
+			</not>
+			<then>
+				<record-fail message="build.xml is nonstandard." />
+			</then>
+		</if>
+
+		<exec dir="." executable="git">
+			<arg line="clean -d -f -x ." />
+		</exec>
+
+		<trycatch>
+			<try>
+				<antcall target="clean" />
+			</try>
+			<catch>
+				<record-fail message="Unable to clean all plugins." />
+			</catch>
+		</trycatch>
+
+		<trycatch>
+			<try>
+				<antcall target="compile" />
+			</try>
+			<catch>
+				<record-fail message="Unable to compile all plugins." />
+			</catch>
+		</trycatch>
+
+		<for param="module.name">
+			<path>
+				<dirset dir="." includes="*" />
+			</path>
+			<sequential>
+				<if>
+					<and>
+						<available file="@{module.name}/docroot" />
+						<available file="@{module.name}/src" />
+					</and>
+					<then>
+						<record-fail message="Module @{module.name} must not have both a &quot;docroot&quot; and a &quot;src&quot; directory." />
+					</then>
+				</if>
+
+				<if>
+					<and>
+						<not>
+							<available file="@{module.name}/docroot" />
+						</not>
+						<not>
+							<available file="@{module.name}/src" />
+						</not>
+					</and>
+					<then>
+						<record-fail message="Module @{module.name} must have a &quot;docroot&quot; or a &quot;src&quot; directory." />
+					</then>
+				</if>
+
+				<if>
+					<available file="@{module.name}/docroot/WEB-INF/liferay-hook.xml" />
+					<then>
+						<if>
+							<and>
+								<resourcecontains resource="@{module.name}/docroot/WEB-INF/liferay-hook.xml" substring="&lt;language-properties&gt;" />
+								<not>
+									<resourcecontains resource="@{module.name}/docroot/WEB-INF/liferay-hook.xml" substring="&lt;language-properties&gt;content/Language*.properties&lt;/language-properties&gt;" />
+								</not>
+							</and>
+							<then>
+								<record-fail message="@{module.name}/docroot/WEB-INF/liferay-hook.xml has an nonstandard language-properties element." />
+							</then>
+						</if>
+
+						<if>
+							<and>
+								<resourcecontains resource="@{module.name}/docroot/WEB-INF/liferay-hook.xml" substring="&lt;custom-jsp-dir&gt;" />
+								<not>
+									<resourcecontains resource="@{module.name}/docroot/WEB-INF/liferay-hook.xml" substring="&lt;custom-jsp-dir&gt;/META-INF/custom_jsps&lt;/custom-jsp-dir&gt;" />
+								</not>
+							</and>
+							<then>
+								<record-fail message="@{module.name}/docroot/WEB-INF/liferay-hook.xml has a nonstandard custom-jsp-dir element." />
+							</then>
+						</if>
+					</then>
+				</if>
+
+				<if>
+					<resourcecontains resource="@{module.name}/docroot/WEB-INF/web.xml" substring="Invoker Filter" />
+					<then>
+						<record-fail message="@{module.name}/docroot/WEB-INF/web.xml contains generated code." />
+					</then>
+				</if>
+
+				<if>
+					<available file="@{module.name}/ivy.xml.MD5" />
+					<then>
+						<record-fail message="@{module.name}/ivy.xml.MD5 must not be checked into source control." />
+					</then>
+				</if>
+
+				<if>
+					<available file="@{module.name}/docroot/WEB-INF/lib" />
+					<then>
+						<record-fail message="@{module.name}/docroot/WEB-INF/lib must not be checked into source control." />
+					</then>
+				</if>
+
+				<if>
+					<available file="@{module.name}/docroot/WEB-INF/tld" />
+					<then>
+						<record-fail message="@{module.name}/docroot/WEB-INF/tld must not be checked into source control." />
+					</then>
+				</if>
+
+				<if>
+					<available file="@{module.name}/lib" />
+					<then>
+						<record-fail message="@{module.name}/lib must not be checked into source control." />
+					</then>
+				</if>
+			</sequential>
+		</for>
+
+		<exec dir="." executable="git" outputproperty="git.command.output">
+			<arg line="status ." />
+		</exec>
+
+		<if>
+			<available file=".gitignore" />
+			<then>
+				<echo file=".gitignore">/*/bin
+/*/classes
+/*/ivy.xml.MD5
+/*/javadoc
+/*/lib
+/*/test-classes
+/*/test-results</echo>
+			</then>
+		</if>
+
+		<if>
+			<resourcecount count="0" when="gt">
+				<fileset defaultexcludes="false" dir="." includes="**/.gitignore" />
+			</resourcecount>
+			<then>
+				<record-fail message="Plugins must not have custom .gitignore files." />
+			</then>
+		</if>
+
+		<if>
+			<or>
+				<contains string="${git.command.output}" substring="Changes not staged for commit" />
+				<contains string="${git.command.output}" substring="Untracked files" />
+			</or>
+			<then>
+				<record-fail message="Plugins must not generate modified files." />
+			</then>
+		</if>
+
+		<trycatch>
+			<try>
+				<loadfile property="plugins-inspector.log.content" srcFile="../plugins-inspector.log" />
+
+				<if>
+					<equals arg1="${basedir.name}" arg2="test-broken" />
+					<then>
+						<checksum file="../plugins-inspector.log" property="plugins-inspector.log.actual.checksum" />
+						<property name="plugins-inspector.log.expected.checksum" value="20988e2ed40f504cbc58c773e24b7fe5" />
+
+						<if>
+							<not>
+								<equals arg1="${plugins-inspector.log.actual.checksum}" arg2="${plugins-inspector.log.expected.checksum}" />
+							</not>
+							<then>
+								<copy file="../plugins-inspector.log" tofile="../plugins-inspector.log.test-broken" />
+
+								<echo>${plugins-inspector.log.content}</echo>
+
+								<fail>Plugins inspector is not detecting all errors. Expected &quot;${plugins-inspector.log.expected.checksum}&quot; but found &quot;${plugins-inspector.log.actual.checksum}&quot;.</fail>
+							</then>
+						</if>
+					</then>
+					<elseif>
+						<equals arg1="${basedir.name}" arg2="test-working" />
+						<then>
+							<if>
+								<available file="../plugins-inspector.log" />
+								<then>
+									<echo>${plugins-inspector.log.content}</echo>
+
+									<fail>Plugins inspector is not detecting false errors.</fail>
+								</then>
+							</if>
+						</then>
+					</elseif>
+					<else>
+						<if>
+							<available file="../plugins-inspector.log" />
+							<then>
+								<echo>${plugins-inspector.log.content}</echo>
+
+								<fail>Plugins inspector detected errors.</fail>
+							</then>
+						</if>
+					</else>
+				</if>
+			</try>
+			<finally>
+				<delete file="../plugins-inspector.log" />
+			</finally>
+		</trycatch>
+	</target>
+</project>
\ No newline at end of file
diff --git a/build-common-plugins.xml b/build-common-plugins.xml
new file mode 100644
index 0000000..1adf5f1
--- /dev/null
+++ b/build-common-plugins.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-plugins" xmlns:antelope="antlib:ise.antelope.tasks">
+	<import file="build-common.xml" />
+	<import file="build-common-plugins-inspector.xml" />
+
+	<path id="plugins.includes.path">
+		<dirset dir="." excludes="${plugins.excludes}" includes="${plugins.includes}" />
+	</path>
+
+	<pathconvert pathsep="," property="plugins.includes.path" refid="plugins.includes.path" targetos="unix" />
+
+	<if>
+		<equals arg1="${basedir}" arg2="${user.dir}" />
+		<then>
+			<property name="plugin.type.dir" value=".." />
+		</then>
+		<else>
+			<property name="plugin.type.dir" value="${basedir}" />
+		</else>
+	</if>
+
+	<target name="build-service">
+		<for param="service.file">
+			<path>
+				<fileset
+					dir="."
+					includes="**/service.xml"
+				/>
+			</path>
+			<sequential>
+				<antelope:stringutil string="@{service.file}" property="service.file.index">
+					<antelope:indexof string="docroot" fromindex="0" />
+				</antelope:stringutil>
+
+				<if>
+					<equals arg1="${service.file.index}" arg2="-1" />
+					<then>
+						<antelope:stringutil string="@{service.file}" property="service.file.index">
+							<antelope:indexof string="service.xml" fromindex="0" />
+						</antelope:stringutil>
+					</then>
+				</if>
+
+				<antelope:stringutil string="@{service.file}" property="portlet.dir">
+					<antelope:substring beginindex="0" endindex="${service.file.index}" />
+				</antelope:stringutil>
+
+				<if>
+					<available file="${portlet.dir}/build.xml" />
+					<then>
+						<ant dir="${portlet.dir}" target="build-service" inheritAll="false" />
+					</then>
+				</if>
+			</sequential>
+		</for>
+	</target>
+
+	<target name="install">
+		<multiroot-subant
+			build.file="build.xml"
+			excludes="${plugins.excludes}"
+			includes="${plugins.includes}"
+			root.dir="${basedir}"
+			target="install"
+		/>
+	</target>
+
+	<target name="setup-eclipse">
+		<multiroot-subant
+			build.file="build.xml"
+			excludes="${plugins.excludes}"
+			includes="${plugins.includes}"
+			root.dir="${basedir}"
+			target="setup-eclipse"
+		/>
+	</target>
+
+	<target name="test-class-group">
+		<multiroot-subant
+			build.file="build.xml"
+			excludes="${plugins.excludes}"
+			includes="${plugins.includes}"
+			root.dir="${basedir}"
+			target="test-class-group"
+		>
+			<properties>
+				<propertyset>
+					<propertyref name="test.type" />
+				</propertyset>
+			</properties>
+		</multiroot-subant>
+	</target>
+
+	<target name="test-package">
+		<multiroot-subant
+			build.file="build.xml"
+			excludes="${plugins.excludes}"
+			includes="${plugins.includes}"
+			root.dir="${basedir}"
+			target="test-package"
+		/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/build-common.xml b/build-common.xml
new file mode 100644
index 0000000..53b5fb7
--- /dev/null
+++ b/build-common.xml
@@ -0,0 +1,3535 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common" xmlns:antelope="antlib:ise.antelope.tasks" xmlns:ivy="antlib:org.apache.ivy.ant">
+	<dirname file="${ant.file.build-common}" property="sdk.dir.native" />
+
+	<pathconvert property="sdk.dir" targetos="unix">
+		<path location="${sdk.dir.native}" />
+	</pathconvert>
+
+	<property environment="env" />
+
+	<path id="lib.classpath">
+		<fileset dir="${sdk.dir}/lib" includes="*.jar" />
+	</path>
+
+	<taskdef classpathref="lib.classpath" resource="ise/antelope/tasks/antlib.xml" uri="antlib:ise.antelope.tasks" />
+	<taskdef classpathref="lib.classpath" resource="net/sf/antcontrib/antlib.xml" />
+
+	<property file="${sdk.dir}/build.${user.name}.properties" />
+	<property file="${sdk.dir}/build.${env.COMPUTERNAME}.properties" />
+	<property file="${sdk.dir}/build.${env.HOST}.properties" />
+	<property file="${sdk.dir}/build.${env.HOSTNAME}.properties" />
+
+	<if>
+		<isset property="app.server.dir" />
+		<then>
+			<if>
+				<isset property="app.server.type" />
+				<then>
+					<propertycopy from="app.server.dir" name="app.server.${app.server.type}.dir" />
+				</then>
+				<else>
+					<propertycopy from="app.server.dir" name="app.server.tomcat.dir" />
+				</else>
+			</if>
+		</then>
+	</if>
+
+	<property file="${sdk.dir}/build.properties" />
+
+	<propertycopy from="app.server.${app.server.type}.dir" name="app.server.dir" />
+	<propertycopy from="app.server.${app.server.type}.deploy.dir" name="app.server.deploy.dir" />
+	<propertycopy from="app.server.${app.server.type}.lib.global.dir" name="app.server.lib.global.dir" />
+	<propertycopy from="app.server.${app.server.type}.portal.dir" name="app.server.portal.dir" />
+	<propertycopy from="app.server.${app.server.type}.zip.name" name="app.server.zip.name" silent="true" />
+
+	<property name="app.server.classes.portal.dir" value="${app.server.portal.dir}/WEB-INF/classes" />
+	<property location="${app.server.portal.dir}/WEB-INF/lib" name="app.server.lib.portal.dir" />
+
+	<if>
+		<not>
+			<equals arg1="${junit.debug}" arg2="true" />
+		</not>
+		<then>
+			<var name="junit.debug.jpda" value="" />
+		</then>
+	</if>
+
+	<import file="build-common-ivy.xml" />
+
+	<path id="plugin.classpath">
+		<path refid="plugin-lib.classpath" />
+		<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
+		<fileset dir="${app.server.lib.portal.dir}" includes="annotations.jar,commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar" />
+		<fileset dir="${sdk.dir}/dependencies/aQute.bnd/lib" includes="*.jar" />
+		<fileset dir="${sdk.dir}/lib" includes="activation.jar,javax.servlet-api.jar,jsp-api.jar,mail.jar" />
+	</path>
+
+	<path id="portal.classpath">
+		<pathelement location="${app.server.classes.portal.dir}" />
+		<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
+		<fileset dir="${app.server.lib.portal.dir}" includes="*.jar" />
+		<fileset dir="${sdk.dir}/lib" includes="activation.jar,javax.servlet-api.jar,jsp-api.jar,net.sf.jargs.jar,qdox.jar" />
+	</path>
+
+	<path id="test.classpath">
+		<path refid="plugin.classpath" />
+		<path refid="plugin-test-type.classpath" />
+		<fileset dir="${ant.home}/lib" includes="ecj.jar" />
+		<fileset dir="${app.server.lib.portal.dir}" excludes="ant.jar" includes="*.jar" />
+	</path>
+
+	<path id="classpath.com.liferay.ant.bnd">
+		<fileset dir="${sdk.dir}/dependencies/com.liferay.ant.bnd/lib" includes="*.jar" />
+	</path>
+
+	<taskdef classname="com.liferay.ant.bnd.BaselineJarTask" classpathref="classpath.com.liferay.ant.bnd" name="baseline-jar" />
+	<taskdef classname="com.liferay.ant.bnd.ReleaseToRepoTask" classpathref="classpath.com.liferay.ant.bnd" name="release-to-repo" />
+	<taskdef classpathref="classpath.com.liferay.ant.bnd" resource="aQute/bnd/ant/taskdef.properties" />
+
+	<path id="classpath.net.sourceforge.pmd">
+		<fileset dir="${sdk.dir}/dependencies/net.sourceforge.pmd/lib" includes="*.jar" />
+	</path>
+
+	<path id="classpath.org.apache.maven.maven.ant.tasks">
+		<fileset dir="${sdk.dir}/dependencies/org.apache.maven.maven.ant.tasks/lib" includes="*.jar" />
+	</path>
+
+	<taskdef classpathref="classpath.org.apache.maven.maven.ant.tasks" resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" />
+
+	<path id="classpath.org.codehaus.groovy">
+		<fileset dir="${sdk.dir}/dependencies/org.codehaus.groovy/lib" includes="*.jar" />
+	</path>
+
+	<taskdef classpathref="classpath.org.codehaus.groovy" resource="org/codehaus/groovy/antlib.xml" />
+
+	<condition property="correct.ant.version">
+		<antversion atleast="1.8.0" />
+	</condition>
+
+	<if>
+		<not>
+			<equals arg1="${correct.ant.version}" arg2="true" />
+		</not>
+		<then>
+			<fail>Please use Ant 1.8.0 or above.</fail>
+		</then>
+	</if>
+
+	<whichresource resource="/org/eclipse/jdt/core/JDTCompilerAdapter.class" property="ecj.compiler" />
+	<whichresource resource="/com/google/errorprone/ErrorProneAntCompilerAdapter.class" property="google.errorprone.compiler" />
+
+	<if>
+		<and>
+			<equals arg1="${javac.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter" />
+			<not>
+				<isset property="ecj.compiler" />
+			</not>
+		</and>
+		<then>
+			<copy file="${sdk.dir}/lib/ecj.jar" todir="${ant.home}/lib" />
+
+			<fail>
+.
+
+Task cannot continue because ECJ is not installed.
+
+ECJ was automatically installed. Please rerun your task.
+			</fail>
+		</then>
+		<else>
+			<if>
+				<and>
+					<equals arg1="${javac.compiler}" arg2="com.google.errorprone.ErrorProneAntCompilerAdapter" />
+					<not>
+						<isset property="google.errorprone.compiler" />
+					</not>
+				</and>
+				<then>
+					<copy file="${sdk.dir}/lib/error_prone_ant.jar" todir="${ant.home}/lib" />
+
+					<fail>
+.
+
+Task cannot continue because Error-Prone is not installed.
+
+Error-Prone was automatically installed. Please rerun your task.
+					</fail>
+				</then>
+			</if>
+		</else>
+	</if>
+
+	<macrodef name="build-css">
+		<attribute name="module.dir" />
+		<attribute default="${module.dir.unix}/docroot" name="sass.docroot.dir" />
+
+		<sequential>
+			<local name="build-css.output" />
+
+			<java
+				classname="com.liferay.portal.tools.SassToCssBuilder"
+				classpathref="portal.classpath"
+				fork="true"
+				newenvironment="true"
+				outputproperty="build-css.output"
+			>
+				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
+				<arg value="sass.dir=/" />
+				<arg value="sass.docroot.dir=@{sass.docroot.dir}" />
+				<arg value="sass.portal.common.dir=${app.server.portal.dir}/html/css/common" />
+			</java>
+
+			<echo>${build-css.output}</echo>
+
+			<if>
+				<contains string="${build-css.output}" substring="Error" />
+				<then>
+					<fail>Sass to CSS Builder generated exceptions.</fail>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="build-db">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<java
+				classname="com.liferay.portal.tools.DBBuilder"
+				classpathref="portal.classpath"
+				fork="true"
+				maxmemory="384m"
+				newenvironment="true"
+			>
+				<arg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<arg value="db.database.name=${database.name}" />
+				<arg value="db.database.types=${database.types}" />
+				<arg value="db.sql.dir=@{module.dir}/docroot/WEB-INF/sql" />
+			</java>
+
+			<delete file="velocity.log" quiet="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="build-upgrade-table">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-build-xml-var
+				build.xml.var.name="module.name"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<java
+						classname="com.liferay.portal.tools.UpgradeTableBuilder"
+						classpathref="portal.classpath"
+						fork="true"
+						newenvironment="true"
+					>
+						<arg value="${upgrade.table.dir}" />
+						<arg value="${set-build-xml-var.return}" />
+					</java>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="build-wsdl">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<for param="wsdl.full.path">
+				<path>
+					<fileset dir="@{module.dir}" includes="docroot/WEB-INF/wsdl/*.wsdl,wsdl/*.wsdl" />
+				</path>
+				<sequential>
+					<tstamp>
+						<format property="tstamp.value" pattern="yyyyMMddkkmmssSSS" />
+					</tstamp>
+
+					<mkdir dir="${tstamp.value}" />
+
+					<taskdef classpathref="portal.classpath" resource="axis-tasks.properties" />
+
+					<axis-wsdl2java
+						output="${tstamp.value}"
+						url="@{wsdl.full.path}"
+					/>
+
+					<compile-java
+						javac.classpathref="plugin.classpath"
+						javac.destdir="${tstamp.value}"
+						javac.srcdir="${tstamp.value}"
+						module.dir="@{module.dir}"
+					/>
+
+					<antelope:stringutil string="@{wsdl.full.path}" property="wsdl.name.beginindex">
+						<antelope:lastindexof string="${file.separator}" />
+					</antelope:stringutil>
+
+					<antelope:math
+						datatype="int"
+						operand1="${wsdl.name.beginindex}"
+						operand2="1"
+						operation="+"
+						result="wsdl.name.beginindex"
+					/>
+
+					<antelope:stringutil string="@{wsdl.full.path}" property="wsdl.name.endindex">
+						<antelope:lastindexof string="." />
+					</antelope:stringutil>
+
+					<antelope:stringutil string="@{wsdl.full.path}" property="wsdl.name">
+						<antelope:substring beginindex="${wsdl.name.beginindex}" endindex="${wsdl.name.endindex}" />
+					</antelope:stringutil>
+
+					<if>
+						<available file="@{module.dir}/docroot/WEB-INF/lib" />
+						<then>
+							<jar
+								basedir="${tstamp.value}"
+								jarfile="@{module.dir}/docroot/WEB-INF/lib/${wsdl.name}-ws.jar"
+							/>
+						</then>
+						<else>
+							<jar
+								basedir="${tstamp.value}"
+								jarfile="@{module.dir}/lib/${wsdl.name}-ws.jar"
+							/>
+						</else>
+					</if>
+
+					<delete dir="${tstamp.value}" />
+				</sequential>
+			</for>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="build-xsd">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<if>
+				<available file="@{module.dir}/docroot/WEB-INF/xsd" />
+				<then>
+					<var name="xsd.base.dir" value="docroot/WEB-INF/xsd" />
+				</then>
+				<elseif>
+					<available file="@{module.dir}/xsd" />
+					<then>
+						<var name="xsd.base.dir" value="xsd" />
+					</then>
+				</elseif>
+				<else>
+					<var name="xsd.base.dir" value="" />
+				</else>
+			</if>
+
+			<if>
+				<not>
+					<equals arg1="${xsd.base.dir}" arg2="" />
+				</not>
+				<then>
+					<tstamp>
+						<format property="tstamp.value" pattern="yyyyMMddkkmmssSSS" />
+					</tstamp>
+
+					<mkdir dir="${tstamp.value}" />
+
+					<path id="plugin-lib.classpath">
+						<fileset dir="${app.server.lib.portal.dir}" includes="xbean.jar" />
+						<fileset dir="${plugin.lib.dir}" includes="*.jar" />
+						<pathelement location="${plugin.classes.dir}" />
+					</path>
+
+					<taskdef classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="portal.classpath" name="xmlbean" />
+
+					<xmlbean
+						classgendir="${tstamp.value}"
+						classpathref="plugin-lib.classpath"
+						srcgendir="${tstamp.value}"
+					>
+						<fileset dir="@{module.dir}" includes="${xsd.base.dir}/**/*.*" />
+					</xmlbean>
+
+					<zip
+						basedir="${tstamp.value}"
+						destfile="${plugin.lib.dir}/${plugin.name}-xbean.jar"
+					/>
+
+					<delete dir="${tstamp.value}" />
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="check-snapshot">
+		<attribute name="module.dir" />
+		<attribute default="true" name="snapshot.download.enabled" />
+
+		<sequential>
+			<mkdir dir="${sdk.dir}/dist" />
+
+			<var name="snapshot.uptodate" value="false" />
+
+			<if>
+				<and>
+					<equals arg1="${snapshot.check.enabled}" arg2="true" />
+					<available file="@{module.dir}/snapshot.properties" />
+				</and>
+				<then>
+					<property file="@{module.dir}/snapshot.properties" />
+
+					<exec dir="@{module.dir}" executable="git" outputproperty="module.git.log">
+						<arg value="log" />
+						<arg value="-1" />
+						<arg value="--pretty=format:%H" />
+						<arg value="--" />
+						<arg value="." />
+						<arg value=":!snapshot.properties" />
+					</exec>
+
+					<exec dir="@{module.dir}" executable="git" outputproperty="module.git.status">
+						<arg value="status" />
+						<arg value="--short" />
+						<arg value="--" />
+						<arg value="." />
+					</exec>
+
+					<if>
+						<and>
+							<equals arg1="${module.git.log}" arg2="${module.snapshot.git.id}" />
+							<equals arg1="${module.git.status}" arg2="" />
+						</and>
+						<then>
+							<var name="snapshot.uptodate" value="true" />
+						</then>
+					</if>
+
+					<if>
+						<equals arg1="@{snapshot.download.enabled}" arg2="true" />
+						<then>
+							<if>
+								<equals arg1="${snapshot.uptodate}" arg2="true" />
+								<then>
+									<trycatch>
+										<try>
+											<mirrors-get
+												dest="${plugin.file}"
+												trylocalnetwork="false"
+												src="${module.snapshot.url}"
+											/>
+										</try>
+										<catch>
+											<var name="snapshot.uptodate" value="false" />
+										</catch>
+									</trycatch>
+								</then>
+							</if>
+						</then>
+					</if>
+
+					<var name="module.git.log" unset="true" />
+					<var name="module.git.status" unset="true" />
+					<var name="module.snapshot.git.id" unset="true" />
+					<var name="module.snapshot.url" unset="true" />
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="clean">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<delete dir="@{module.dir}/classes" />
+			<delete dir="@{module.dir}/docroot/WEB-INF/classes" />
+
+			<if>
+				<available file="@{module.dir}/docroot/WEB-INF/.gitignore" />
+				<then>
+					<if>
+						<resourcecontains
+							resource="${module.dir.unix}/docroot/WEB-INF/.gitignore"
+							substring="/lib"
+						/>
+						<then>
+							<delete dir="@{module.dir}/docroot/WEB-INF/lib" />
+						</then>
+					</if>
+				</then>
+			</if>
+
+			<if>
+				<and>
+					<available file="@{module.dir}/docroot/WEB-INF/.svn" />
+					<not>
+						<available file="@{module.dir}/docroot/WEB-INF/lib/.svn" />
+					</not>
+					<length length="0" when="equal">
+						<fileset dir="@{module.dir}/docroot/WEB-INF/lib" erroronmissingdir="false" />
+					</length>
+				</and>
+				<then>
+					<delete dir="@{module.dir}/docroot/WEB-INF/lib" />
+				</then>
+			</if>
+
+			<delete dir="@{module.dir}/javadoc" />
+			<delete dir="@{module.dir}/pmd-reports" />
+			<delete dir="@{module.dir}/test-classes" />
+			<delete dir="@{module.dir}/test-results" />
+			<delete dir="@{module.dir}/tmp" />
+
+			<delete failonerror="false" includeemptydirs="true">
+				<fileset dir="@{module.dir}/docroot" includes="**/*.processed" />
+				<fileset dir="@{module.dir}/docroot" includes="**/.sass-cache/**" />
+				<fileset dir="@{module.dir}/docroot" includes="**/.sprite.png" />
+				<fileset dir="@{module.dir}/docroot" includes="**/.sprite.properties" />
+				<fileset dir="@{module.dir}/docroot" includes="**/Thumbs.db" />
+				<fileset dir="@{module.dir}/src" includes="**/.sass-cache/**" />
+				<fileset dir="@{module.dir}/src" includes="**/Thumbs.db" />
+			</delete>
+
+			<delete file="${plugin.file}" />
+			<delete file="${plugin.javadoc.file}" />
+			<delete file="${plugin.pom.file}" />
+			<delete file="${plugin.sources.file}" />
+			<delete file="${plugin.src.file}" />
+			<delete file="${plugin.wsdd.file}" />
+
+			<if>
+				<equals arg1="${clean.delete.ivy.md5}" arg2="true" />
+				<then>
+					<delete file="@{module.dir}/ivy.xml.MD5" />
+				</then>
+			</if>
+
+			<if>
+				<equals arg1="${clean.delete.lib}" arg2="true" />
+				<then>
+					<delete dir="@{module.dir}/docroot/WEB-INF/lib" />
+					<delete dir="@{module.dir}/lib" />
+				</then>
+			</if>
+
+			<loop-macrodef-or-target
+				module.dirs="@{module.dir}"
+				target.name="clean-portal-dependencies"
+			/>
+
+			<if>
+				<matches pattern=".*-theme" string="@{module.dir}" />
+				<then>
+					<if>
+						<available file="@{module.dir}/docroot/_diffs" />
+						<then>
+							<delete includeemptydirs="true" quiet="true" failonerror="false">
+								<fileset
+									dir="@{module.dir}/docroot"
+									excludes=".gitignore,_diffs.*,_diffs/**,WEB-INF/**"
+								/>
+							</delete>
+						</then>
+					</if>
+				</then>
+			</if>
+
+			<if>
+				<resourcecontains
+					resource="${module.dir.unix}/build.xml"
+					substring="/build-common-osgi-plugin.xml&quot;"
+				/>
+				<then>
+					<set-build-xml-var
+						build.xml.var.name="auto.deploy.dir"
+						module.dir="@{module.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="module.auto.deploy.dir" value="${set-build-xml-var.return}" />
+						</then>
+						<else>
+							<var name="module.auto.deploy.dir" value="${auto.deploy.dir}" />
+						</else>
+					</if>
+
+					<delete file="${module.auto.deploy.dir}/${plugin.name}.${plugin.packaging}" />
+					<delete file="${module.auto.deploy.dir}/${plugin.name}-wsdd.jar" />
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="clean-portal-dependencies">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<equals arg1="${plugins.war.clean.portal.dependencies}" arg2="true" />
+				<then>
+					<if>
+						<available file="@{module.dir}/docroot/WEB-INF/lib" />
+						<then>
+							<retry retrycount="1" retrydelay="5000">
+								<delete>
+									<fileset dir="@{module.dir}/docroot/WEB-INF/lib" includes="${required.portal.jars}" />
+									<fileset dir="@{module.dir}/docroot/WEB-INF/lib" includes="${plugin.jars}" />
+								</delete>
+							</retry>
+						</then>
+					</if>
+
+					<if>
+						<available file="@{module.dir}/docroot/WEB-INF/tld" />
+						<then>
+							<delete>
+								<fileset dir="@{module.dir}/docroot/WEB-INF/tld" includes="${plugin.tlds}" />
+							</delete>
+						</then>
+					</if>
+
+					<if>
+						<available file="@{module.dir}/tmp/WEB-INF/lib" />
+						<then>
+							<delete>
+								<fileset dir="@{module.dir}/tmp/WEB-INF/lib" includes="${required.portal.jars}" />
+								<fileset dir="@{module.dir}/tmp/WEB-INF/lib" includes="${plugin.jars}" />
+							</delete>
+						</then>
+					</if>
+
+					<if>
+						<available file="@{module.dir}/tmp/WEB-INF/tld" />
+						<then>
+							<delete>
+								<fileset dir="@{module.dir}/tmp/WEB-INF/tld" includes="${plugin.tlds}" />
+							</delete>
+						</then>
+					</if>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<or>
+					<antelope:endswith string="${plugin.name}" with="-hook" />
+					<antelope:endswith string="${plugin.name}" with="-portlet" />
+					<antelope:endswith string="${plugin.name}" with="-web" />
+				</or>
+				<then>
+					<compile-portlet
+						module.dir="@{module.dir}"
+					/>
+				</then>
+				<elseif>
+					<antelope:endswith string="${plugin.name}" with="-layouttpl" />
+					<then>
+						<loop-macrodef-or-target
+							module.dirs="@{module.dir}"
+							target.name="merge"
+						/>
+					</then>
+				</elseif>
+				<elseif>
+					<antelope:endswith string="${plugin.name}" with="-theme" />
+					<then>
+						<compile-theme
+							module.dir="@{module.dir}"
+						/>
+					</then>
+				</elseif>
+				<else>
+					<process-ivy
+						module.dir="@{module.dir}"
+					/>
+
+					<if>
+						<available file="@{module.dir}/docroot" />
+						<then>
+							<compile-portlet
+								module.dir="@{module.dir}"
+							/>
+						</then>
+						<else>
+							<loop-macrodef-or-target
+								module.dirs="@{module.dir}"
+								target.name="compile-import-shared"
+							/>
+
+							<mkdir dir="@{module.dir}/classes" />
+
+							<compile-java
+								javac.classpathref="plugin.classpath"
+								javac.destdir="@{module.dir}/classes"
+								javac.srcdir="@{module.dir}/src"
+								module.dir="@{module.dir}"
+							/>
+						</else>
+					</if>
+				</else>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-import-shared">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<set-build-xml-var
+				build.xml.var.name="import.compat.shared"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="compile-import-shared.import.compat.shared" value="${set-build-xml-var.return}" />
+				</then>
+			</if>
+
+			<set-build-xml-var
+				build.xml.var.name="import.shared"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="compile-import-shared.import.shared" value="${set-build-xml-var.return}" />
+				</then>
+			</if>
+
+			<if>
+				<not>
+					<equals arg1="${plugin.name}" arg2="portal-compat-shared" />
+				</not>
+				<then>
+					<if>
+						<or>
+							<not>
+								<isset property="compile-import-shared.import.compat.shared" />
+							</not>
+							<equals arg1="${compile-import-shared.import.compat.shared}" arg2="true" />
+						</or>
+						<then>
+							<if>
+								<isset property="compile-import-shared.import.shared" />
+								<then>
+									<var name="compile-import-shared.import.shared" value="portal-compat-shared,${compile-import-shared.import.shared}" />
+								</then>
+								<else>
+									<var name="compile-import-shared.import.shared" value="portal-compat-shared" />
+								</else>
+							</if>
+						</then>
+					</if>
+				</then>
+			</if>
+
+			<if>
+				<isset property="compile-import-shared.import.shared" />
+				<then>
+					<var name="import.shared.list" value="${compile-import-shared.import.shared}" />
+
+					<var name="compile-import-shared.import.shared" unset="true" />
+
+					<for list="${import.shared.list}" param="import.shared.current">
+						<sequential>
+							<if>
+								<available file="${sdk.dir}/shared/@{import.shared.current}/src" />
+								<then>
+									<compile-import-shared-jar
+										import.shared.current="@{import.shared.current}"
+										import.shared.current.dir="${sdk.dir}/shared/@{import.shared.current}"
+										module.dir="@{module.dir}"
+									/>
+								</then>
+								<elseif>
+									<available file="${module.dir.unix}/../@{import.shared.current}/src" />
+									<then>
+										<compile-import-shared-jar
+											import.shared.current="@{import.shared.current}"
+											import.shared.current.dir="${module.dir.unix}/../@{import.shared.current}"
+											module.dir="@{module.dir}"
+										/>
+									</then>
+								</elseif>
+							</if>
+						</sequential>
+					</for>
+				</then>
+			</if>
+
+			<var name="compile-import-shared.import.compat.shared" unset="true" />
+			<var name="compile-import-shared.import.shared" unset="true" />
+
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-import-shared-jar">
+		<attribute name="import.shared.current" />
+		<attribute name="import.shared.current.dir" />
+		<attribute name="module.dir" />
+
+		<sequential>
+			<if>
+				<available file="@{import.shared.current.dir}/src" />
+				<then>
+					<loop-macrodef-or-target
+						module.dirs="@{import.shared.current.dir}"
+						target.name="jar"
+					/>
+
+					<set-build-xml-var
+						bnd.property.key="Bundle-Version"
+						build.xml.var.name="plugin.full.version"
+						module.dir="@{import.shared.current.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="import.shared.current.plugin.full.version" value="${set-build-xml-var.return}" />
+						</then>
+						<else>
+							<var name="import.shared.current.plugin.full.version" value="${lp.version}" />
+						</else>
+					</if>
+
+					<set-build-xml-var
+						bnd.property.key="Bundle-SymbolicName"
+						build.xml.var.name="plugin.name"
+						module.dir="@{import.shared.current.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="import.shared.current.plugin.name" value="${set-build-xml-var.return}" />
+						</then>
+						<else>
+							<var name="import.shared.current.plugin.name" value="@{import.shared.current}" />
+						</else>
+					</if>
+
+					<set-module-properties
+						module.dir="@{module.dir}"
+					/>
+
+					<for param="import.shared.full.path">
+						<path>
+							<fileset dir="${sdk.dir}/dist" excludes="**-sources.jar" includes="${import.shared.current.plugin.name}-${import.shared.current.plugin.full.version}*.jar" />
+						</path>
+						<sequential>
+							<copy
+								file="@{import.shared.full.path}"
+								tofile="${plugin.lib.dir}/${import.shared.current.plugin.name}.jar"
+							/>
+						</sequential>
+					</for>
+
+					<if>
+						<available file="@{import.shared.current.dir}/lib" />
+						<then>
+							<copy todir="${plugin.lib.dir}">
+								<fileset dir="@{import.shared.current.dir}/lib" includes="*.jar" />
+							</copy>
+						</then>
+					</if>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-java">
+		<attribute name="javac.classpathref" />
+		<attribute name="javac.destdir" />
+		<attribute name="javac.srcdir" />
+		<attribute default="" name="module.dir" />
+
+		<sequential>
+			<copy todir="@{javac.destdir}">
+				<fileset dir="@{javac.srcdir}" excludes="**/*.java,**/.sass-cache/*" />
+			</copy>
+
+			<if>
+				<and>
+					<not>
+						<equals arg1="@{module.dir}" arg2="" />
+					</not>
+					<available file="@{module.dir}" />
+				</and>
+				<then>
+					<set-build-xml-var
+						build.xml.var.name="javac.source"
+						module.dir="@{module.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="javac.source" value="${set-build-xml-var.return}" />
+
+							<echo>Custom javac source ${javac.source}</echo>
+						</then>
+					</if>
+
+					<set-build-xml-var
+						build.xml.var.name="javac.target"
+						module.dir="@{module.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="javac.target" value="${set-build-xml-var.return}" />
+
+							<echo>Custom javac target ${javac.target}</echo>
+						</then>
+					</if>
+				</then>
+			</if>
+
+			<if>
+				<not>
+					<isset property="javac.source" />
+				</not>
+				<then>
+					<var name="javac.source" value="${ant.build.javac.source}" />
+				</then>
+			</if>
+
+			<if>
+				<not>
+					<isset property="javac.target" />
+				</not>
+				<then>
+					<var name="javac.target" value="${ant.build.javac.target}" />
+				</then>
+			</if>
+
+			<javac
+				classpathref="@{javac.classpathref}"
+				compiler="${javac.compiler}"
+				debug="${javac.debug}"
+				deprecation="${javac.deprecation}"
+				destdir="@{javac.destdir}"
+				encoding="${javac.encoding}"
+				includeAntRuntime="false"
+				nowarn="${javac.nowarn}"
+				source="${javac.source}"
+				srcdir="@{javac.srcdir}"
+				target="${javac.target}"
+			/>
+
+			<var name="javac.source" unset="true" />
+			<var name="javac.target" unset="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-portlet">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<loop-macrodef-or-target
+				module.dirs="@{module.dir}"
+				target.name="merge"
+			/>
+
+			<loop-macrodef-or-target
+				module.dirs="@{module.dir}"
+				target.name="compile-import-shared"
+			/>
+
+			<mkdir dir="@{module.dir}/docroot/WEB-INF/classes" />
+			<mkdir dir="@{module.dir}/docroot/WEB-INF/lib" />
+
+			<copy todir="@{module.dir}/docroot/WEB-INF/lib">
+				<fileset dir="${app.server.lib.portal.dir}" includes="${plugin.jars}" />
+			</copy>
+
+			<if>
+				<available file="@{module.dir}/overwrite" />
+				<then>
+					<copy overwrite="true" preservelastmodified="true" todir="@{module.dir}/docroot">
+						<fileset dir="@{module.dir}/overwrite" />
+					</copy>
+				</then>
+			</if>
+
+			<if>
+				<isset property="plugin.required.contexts" />
+				<then>
+					<for list="${plugin.required.contexts}" param="plugin.required.context">
+						<sequential>
+							<if>
+								<available file="${sdk.dir}/hooks/@{plugin.required.context}/docroot/WEB-INF/lib/@{plugin.required.context}-service.jar" />
+								<then>
+									<copy
+										file="${sdk.dir}/hooks/@{plugin.required.context}/docroot/WEB-INF/lib/@{plugin.required.context}-service.jar"
+										todir="@{module.dir}/docroot/WEB-INF/lib"
+										overwrite="true"
+									/>
+								</then>
+								<elseif>
+									<available file="${sdk.dir}/portlets/@{plugin.required.context}/docroot/WEB-INF/lib/@{plugin.required.context}-service.jar" />
+									<then>
+										<copy
+											file="${sdk.dir}/portlets/@{plugin.required.context}/docroot/WEB-INF/lib/@{plugin.required.context}-service.jar"
+											todir="@{module.dir}/docroot/WEB-INF/lib"
+											overwrite="true"
+										/>
+									</then>
+								</elseif>
+								<elseif>
+									<available file="${sdk.dir}/webs/@{plugin.required.context}/docroot/WEB-INF/lib/@{plugin.required.context}-service.jar" />
+									<then>
+										<copy
+											file="${sdk.dir}/webs/@{plugin.required.context}/docroot/WEB-INF/lib/@{plugin.required.context}-service.jar"
+											todir="@{module.dir}/docroot/WEB-INF/lib"
+											overwrite="true"
+										/>
+									</then>
+								</elseif>
+							</if>
+						</sequential>
+					</for>
+				</then>
+			</if>
+
+			<copy todir="@{module.dir}/docroot/WEB-INF/tld">
+				<fileset dir="${app.server.portal.dir}/WEB-INF/tld" erroronmissingdir="false" includes="${plugin.tlds}" />
+			</copy>
+
+			<if>
+				<or>
+					<resourcecount count="0" when="gt">
+						<fileset dir="." includes="**/*.jsp" excludes="@{module.dir}/docroot/META-INF/custom.jsps/" />
+					</resourcecount>
+					<available file="@{module.dir}/docroot/WEB-INF/src" />
+				</or>
+				<then>
+					<copy todir="@{module.dir}/docroot/WEB-INF/lib">
+						<fileset dir="${app.server.lib.portal.dir}" includes="${required.portal.jars}" />
+					</copy>
+				</then>
+			</if>
+
+			<if>
+				<available file="@{module.dir}/docroot/WEB-INF/src" />
+				<then>
+					<if>
+						<available file="@{module.dir}/docroot/WEB-INF/lib/portal-impl.jar" />
+						<then>
+							<fail>
+.
+
+Detected inclusion of portal-impl.jar in WEB-INF/lib.
+
+portal-impl.jar is designed with a large number of singleton classes which are
+instantiated on the basis that they will exist alone in the application server.
+
+While compile time issues may be resolved, portlets cannot be made to work by
+simply adding portal-impl.jar, because doing so violates the above assumption,
+and the resulting problems will be extremely difficult to debug.
+
+Please find a solution that does not require portal-impl.jar.
+							</fail>
+						</then>
+					</if>
+
+					<compile-java
+						javac.classpathref="plugin.classpath"
+						javac.destdir="@{module.dir}/docroot/WEB-INF/classes"
+						javac.srcdir="@{module.dir}/docroot/WEB-INF/src"
+						module.dir="@{module.dir}"
+					/>
+				</then>
+			</if>
+
+			<if>
+				<and>
+					<available file="@{module.dir}/docroot/WEB-INF/liferay-hook.xml" />
+					<available file="@{module.dir}/docroot/WEB-INF/src/content" />
+				</and>
+				<then>
+					<if>
+						<resourcecontains
+							resource="${module.dir.unix}/docroot/WEB-INF/liferay-hook.xml"
+							substring="&lt;language-properties&gt;content/Language*.properties&lt;/language-properties&gt;"
+						/>
+						<then>
+							<pathconvert pathsep="${line.separator}&#x9;" property="language.properties.elements">
+								<fileset dir="@{module.dir}/docroot/WEB-INF/src/content">
+									<include name="Language*.properties" />
+								</fileset>
+								<mapper>
+									<chainedmapper>
+										<flattenmapper />
+										<globmapper
+											from="Language*.properties"
+											to="&lt;language-properties&gt;content/Language*.properties&lt;/language-properties&gt;"
+										/>
+									</chainedmapper>
+								</mapper>
+							</pathconvert>
+
+							<copy file="@{module.dir}/docroot/WEB-INF/liferay-hook.xml" overwrite="true" tofile="@{module.dir}/docroot/WEB-INF/liferay-hook.xml.processed">
+								<filterchain>
+									<tokenfilter>
+										<replacestring from="&lt;language-properties&gt;content/Language*.properties&lt;/language-properties&gt;" to="${language.properties.elements}" />
+									</tokenfilter>
+								</filterchain>
+							</copy>
+
+							<var name="language.properties.elements" unset="true" />
+						</then>
+					</if>
+				</then>
+			</if>
+
+			<loop-macrodef-or-target
+				module.dirs="@{module.dir}"
+				target.name="merge"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-test">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<compile
+				module.dir="@{module.dir}"
+			/>
+
+			<compile-test-cmd
+				module.dir="@{module.dir}"
+				test.type="integration"
+			/>
+
+			<compile-test-cmd
+				module.dir="@{module.dir}"
+				test.type="unit"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-test-cmd">
+		<attribute name="module.dir" />
+		<attribute name="test.classpathref" default="test.classpath" />
+		<attribute name="test.type" />
+
+		<sequential>
+			<if>
+				<available file="@{module.dir}/test/@{test.type}" type="dir" />
+				<then>
+					<mkdir dir="@{module.dir}/test-classes/@{test.type}" />
+					<mkdir dir="@{module.dir}/test-results/@{test.type}" />
+
+					<copy todir="@{module.dir}/test-classes/@{test.type}">
+						<fileset dir="@{module.dir}/test" includes="*.properties" />
+						<fileset dir="@{module.dir}/test/@{test.type}" includes="**/*.bnd,**/*.png,**/*.policy,**/*.properties,**/*.xml,**/dependencies/**" />
+					</copy>
+
+					<ivy:settings file="${ivy.custom.settings.file}" />
+
+					<ivy:resolve
+						conf="test"
+						file="${sdk.dir}/ivy.xml"
+						log="${ivy.log.level}"
+						transitive="${ivy.resolve.transitive.dependencies.test}"
+					/>
+
+					<if>
+						<available file="@{module.dir}/ivy.xml" />
+						<then>
+							<ivy:resolve
+								conf="test"
+								file="@{module.dir}/ivy.xml"
+								log="${ivy.log.level}"
+								transitive="${ivy.resolve.transitive.dependencies.test}"
+							/>
+						</then>
+					</if>
+
+					<path id="plugin-test-type.classpath">
+						<pathelement location="@{module.dir}/test-classes/@{test.type}" />
+
+						<!-- SDK dependencies -->
+
+						<ivy:resources module="com.liferay.sdk" type="bundle,jar,orbit" />
+
+						<!-- Module dependencies -->
+
+						<ivy:resources type="bundle,jar,orbit" />
+					</path>
+
+					<compile-java
+						javac.classpathref="@{test.classpathref}"
+						javac.destdir="@{module.dir}/test-classes/@{test.type}"
+						javac.srcdir="@{module.dir}/test/@{test.type}"
+						module.dir="@{module.dir}"
+					/>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="compile-theme">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<available file="@{module.dir}/docroot/_diffs/images" />
+				<then>
+					<for param="file">
+						<path>
+							<fileset
+								dir="@{module.dir}/docroot/_diffs/images"
+								includes="**/screenshot.png"
+							/>
+						</path>
+						<sequential>
+							<propertyregex input="@{file}" override="yes" property="thumbnail.file" regexp="screenshot\.png" replace="thumbnail\.png" />
+
+							<java
+								classname="com.liferay.portal.tools.ThumbnailBuilder"
+								classpathref="portal.classpath"
+							>
+								<arg value="thumbnail.original.file=@{file}" />
+								<arg value="thumbnail.thumbnail.file=${thumbnail.file}" />
+								<arg value="thumbnail.height=120" />
+								<arg value="thumbnail.width=160" />
+								<arg value="thumbnail.overwrite=false" />
+							</java>
+						</sequential>
+					</for>
+				</then>
+			</if>
+
+			<if>
+				<not>
+					<isset property="theme.type" />
+				</not>
+				<then>
+					<var name="theme.type" value="vm" />
+				</then>
+			</if>
+
+			<if>
+				<equals arg1="${theme.parent}" arg2="_unstyled" />
+				<then>
+					<copy todir="@{module.dir}/docroot" overwrite="true" preservelastmodified="true">
+						<fileset
+							dir="${app.server.portal.dir}/html/themes/_unstyled"
+							excludes="templates/**"
+						/>
+					</copy>
+
+					<copy todir="@{module.dir}/docroot/templates" overwrite="true" preservelastmodified="true">
+						<fileset
+							dir="${app.server.portal.dir}/html/themes/_unstyled/templates"
+							excludes="init.${theme.type}"
+							includes="*.${theme.type}"
+						/>
+					</copy>
+				</then>
+				<elseif>
+					<equals arg1="${theme.parent}" arg2="_styled" />
+					<then>
+						<copy todir="@{module.dir}/docroot" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${app.server.portal.dir}/html/themes/_unstyled"
+								excludes="templates/**"
+							/>
+						</copy>
+
+						<copy todir="@{module.dir}/docroot/templates" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${app.server.portal.dir}/html/themes/_unstyled/templates"
+								excludes="init.${theme.type}"
+								includes="*.${theme.type}"
+							/>
+						</copy>
+
+						<copy todir="@{module.dir}/docroot" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${app.server.portal.dir}/html/themes/_styled"
+							/>
+						</copy>
+					</then>
+				</elseif>
+				<elseif>
+					<equals arg1="${theme.parent}" arg2="classic" />
+					<then>
+						<copy todir="@{module.dir}/docroot" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${app.server.portal.dir}/html/themes/classic"
+								excludes="**/.sass-cache/**,_diffs/**,templates/**"
+							/>
+						</copy>
+
+						<copy todir="@{module.dir}/docroot/templates" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${app.server.portal.dir}/html/themes/classic/templates"
+								includes="*.${theme.type}"
+							/>
+						</copy>
+					</then>
+				</elseif>
+				<elseif>
+					<equals arg1="${theme.parent}" arg2="control_panel" />
+					<then>
+						<copy todir="@{module.dir}/docroot" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${app.server.portal.dir}/html/themes/control_panel"
+								excludes="**/.sass-cache/**,_diffs/**,templates/**"
+							/>
+						</copy>
+
+						<copy todir="@{module.dir}/docroot/templates" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${app.server.portal.dir}/html/themes/control_panel/templates"
+								includes="*.${theme.type}"
+							/>
+						</copy>
+					</then>
+				</elseif>
+				<elseif>
+					<isset property="theme.parent" />
+					<then>
+						<compile-theme
+							module.dir="${theme.parent}"
+						/>
+
+						<set-module-properties
+							module.dir="@{module.dir}"
+						/>
+
+						<copy todir="@{module.dir}/docroot" overwrite="true" preservelastmodified="true">
+							<fileset
+								dir="${theme.parent}/docroot"
+								excludes="**/.sass-cache/**,_diffs/**,WEB-INF/*.properties,WEB-INF/*.xml"
+							/>
+						</copy>
+					</then>
+				</elseif>
+			</if>
+
+			<if>
+				<available file="@{module.dir}/docroot/_diffs" />
+				<then>
+					<copy todir="@{module.dir}/docroot" overwrite="true" preservelastmodified="true">
+						<fileset
+							dir="@{module.dir}/docroot/_diffs"
+						/>
+					</copy>
+				</then>
+			</if>
+
+			<if>
+				<available file="@{module.dir}/docroot/WEB-INF/src" />
+				<then>
+					<compile-portlet
+						module.dir="@{module.dir}"
+					/>
+				</then>
+				<else>
+					<if>
+						<available file="@{module.dir}/overwrite" />
+						<then>
+							<copy overwrite="true" preservelastmodified="true" todir="@{module.dir}/docroot">
+								<fileset dir="@{module.dir}/overwrite" />
+							</copy>
+						</then>
+					</if>
+				</else>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="deploy">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<and>
+					<or>
+						<antelope:endswith string="${plugin.name}" with="-hook" />
+						<antelope:endswith string="${plugin.name}" with="-layouttpl" />
+						<antelope:endswith string="${plugin.name}" with="-portlet" />
+						<antelope:endswith string="${plugin.name}" with="-theme" />
+						<antelope:endswith string="${plugin.name}" with="-web" />
+					</or>
+					<not>
+						<resourcecontains
+							resource="${module.dir.unix}/build.xml"
+							substring="/build-common-osgi-plugin.xml&quot;"
+						/>
+					</not>
+				</and>
+				<then>
+					<loop-macrodef-or-target
+						module.dirs="@{module.dir}"
+						target.name="war"
+					/>
+
+					<copy file="${plugin.file}" todir="${auto.deploy.dir}" />
+				</then>
+				<else>
+					<loop-macrodef-or-target
+						module.dirs="@{module.dir}"
+						target.name="jar"
+					/>
+
+					<if>
+						<resourcecontains
+							resource="${module.dir.unix}/build.xml"
+							substring="/build-common-osgi-plugin.xml&quot;"
+						/>
+						<then>
+							<mkdir dir="${module.auto.deploy.dir}" />
+
+							<set-build-xml-var
+								build.xml.var.name="osgi.runtime.dependencies"
+								module.dir="@{module.dir}"
+							/>
+
+							<if>
+								<isset property="set-build-xml-var.return" />
+								<then>
+									<if>
+										<available file="@{module.dir}/docroot/WEB-INF/lib" />
+										<then>
+											<copy failonerror="false" todir="${module.auto.deploy.dir}">
+												<fileset dir="@{module.dir}/docroot/WEB-INF/lib" includes="${set-build-xml-var.return}" />
+											</copy>
+										</then>
+									</if>
+
+									<if>
+										<available file="@{module.dir}/lib" />
+										<then>
+											<copy failonerror="false" todir="${module.auto.deploy.dir}">
+												<fileset dir="@{module.dir}/lib" includes="${set-build-xml-var.return}" />
+											</copy>
+										</then>
+									</if>
+								</then>
+							</if>
+
+							<copy
+								file="${plugin.file}"
+								tofile="${module.auto.deploy.dir}/${plugin.name}.${plugin.packaging}"
+							/>
+
+							<if>
+								<available file="${plugin.wsdd.file}" />
+								<then>
+									<copy
+										file="${plugin.wsdd.file}"
+										tofile="${module.auto.deploy.dir}/${plugin.name}-wsdd.jar"
+									/>
+								</then>
+							</if>
+						</then>
+					</if>
+				</else>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="direct-deploy">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<loop-macrodef-or-target
+				module.dirs="@{module.dir}"
+				target.name="war"
+			/>
+
+			<if>
+				<antelope:endswith string="${plugin.name}" with="-ext" />
+				<then>
+					<direct-deploy-ext-cmd />
+				</then>
+				<elseif>
+					<antelope:endswith string="${plugin.name}" with="-hook" />
+					<then>
+						<direct-deploy-hook-cmd />
+					</then>
+				</elseif>
+				<elseif>
+					<antelope:endswith string="${plugin.name}" with="-layouttpl" />
+					<then>
+						<direct-deploy-layouttpl-cmd />
+					</then>
+				</elseif>
+				<elseif>
+					<antelope:endswith string="${plugin.name}" with="-portlet" />
+					<then>
+						<direct-deploy-portlet-cmd />
+					</then>
+				</elseif>
+				<elseif>
+					<antelope:endswith string="${plugin.name}" with="-theme" />
+					<then>
+						<direct-deploy-theme-cmd />
+					</then>
+				</elseif>
+				<elseif>
+					<antelope:endswith string="${plugin.name}" with="-web" />
+					<then>
+						<direct-deploy-web-cmd />
+					</then>
+				</elseif>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="direct-deploy-ext-cmd">
+		<attribute name="direct.deploy.dir" default="${app.server.deploy.dir}" />
+
+		<sequential>
+			<java
+				classname="com.liferay.portal.tools.deploy.ExtDeployer"
+				classpathref="portal.classpath"
+				fork="true"
+				newenvironment="true"
+			>
+
+				<!-- Required Arguments -->
+
+				<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
+				<jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
+				<jvmarg value="-Ddeployer.dest.dir=@{direct.deploy.dir}" />
+				<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
+				<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
+				<jvmarg value="-Ddeployer.file.pattern=${plugin.name}-*.war" />
+
+				<!-- Optional Arguments -->
+
+				<jvmarg value="-Ddeployer.tomcat.lib.dir=${app.server.tomcat.lib.global.dir}" />
+
+				<!-- Dependent Libraries -->
+
+				<arg value="${app.server.lib.portal.dir}/util-bridges.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-java.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-taglib.jar" />
+			</java>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="direct-deploy-hook-cmd">
+		<attribute name="direct.deploy.dir" default="${app.server.deploy.dir}" />
+
+		<sequential>
+			<java
+				classname="com.liferay.portal.tools.deploy.HookDeployer"
+				classpathref="portal.classpath"
+				fork="true"
+				newenvironment="true"
+			>
+
+				<!-- Required Arguments -->
+
+				<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
+				<jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
+				<jvmarg value="-Ddeployer.dest.dir=@{direct.deploy.dir}" />
+				<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
+				<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
+				<jvmarg value="-Ddeployer.file.pattern=${plugin.name}-*.war" />
+
+				<!-- Optional Arguments -->
+
+				<jvmarg value="-Ddeployer.tomcat.lib.dir=${app.server.tomcat.lib.global.dir}" />
+
+				<!-- Dependent Libraries -->
+
+				<arg value="${app.server.lib.portal.dir}/util-bridges.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-java.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-taglib.jar" />
+			</java>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="direct-deploy-layouttpl-cmd">
+		<attribute name="direct.deploy.dir" default="${app.server.deploy.dir}" />
+
+		<sequential>
+			<java
+				classname="com.liferay.portal.tools.deploy.LayoutTemplateDeployer"
+				classpathref="portal.classpath"
+				fork="true"
+				newenvironment="true"
+			>
+
+				<!-- Required Arguments -->
+
+				<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
+				<jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
+				<jvmarg value="-Ddeployer.dest.dir=@{direct.deploy.dir}" />
+				<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
+				<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
+				<jvmarg value="-Ddeployer.file.pattern=${plugin.name}-*.war" />
+
+				<!-- Dependent Libraries -->
+
+				<arg value="${app.server.lib.portal.dir}/util-bridges.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-java.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-taglib.jar" />
+			</java>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="direct-deploy-portlet-cmd">
+		<attribute name="direct.deploy.dir" default="${app.server.deploy.dir}" />
+
+		<sequential>
+			<java
+				classname="com.liferay.portal.tools.deploy.PortletDeployer"
+				classpathref="portal.classpath"
+				fork="true"
+				newenvironment="true"
+			>
+
+				<!-- Required Arguments -->
+
+				<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
+				<jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
+				<jvmarg value="-Ddeployer.dest.dir=@{direct.deploy.dir}" />
+				<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
+				<jvmarg value="-Ddeployer.aui.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/aui.tld" />
+				<jvmarg value="-Ddeployer.portlet.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-portlet.tld" />
+				<jvmarg value="-Ddeployer.portlet-ext.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-portlet-ext.tld" />
+				<jvmarg value="-Ddeployer.security.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-security.tld" />
+				<jvmarg value="-Ddeployer.theme.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-theme.tld" />
+				<jvmarg value="-Ddeployer.ui.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-ui.tld" />
+				<jvmarg value="-Ddeployer.util.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-util.tld" />
+				<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
+				<jvmarg value="-Ddeployer.custom.portlet.xml=${auto.deploy.custom.portlet.xml}" />
+				<jvmarg value="-Ddeployer.file.pattern=${plugin.name}-*.war" />
+
+				<!-- Optional Arguments -->
+
+				<jvmarg value="-Ddeployer.tomcat.lib.dir=${app.server.tomcat.lib.global.dir}" />
+
+				<!-- Dependent Libraries -->
+
+				<arg value="${app.server.lib.portal.dir}/util-bridges.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-java.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-taglib.jar" />
+			</java>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="direct-deploy-theme-cmd">
+		<attribute name="direct.deploy.dir" default="${app.server.deploy.dir}" />
+
+		<sequential>
+			<java
+				classname="com.liferay.portal.tools.deploy.ThemeDeployer"
+				classpathref="portal.classpath"
+				fork="true"
+				newenvironment="true"
+			>
+
+				<!-- Required Arguments -->
+
+				<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
+				<jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
+				<jvmarg value="-Ddeployer.dest.dir=@{direct.deploy.dir}" />
+				<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
+				<jvmarg value="-Ddeployer.theme.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-theme.tld" />
+				<jvmarg value="-Ddeployer.util.taglib.dtd=${app.server.portal.dir}/WEB-INF/tld/liferay-util.tld" />
+				<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
+				<jvmarg value="-Ddeployer.file.pattern=${plugin.name}-*.war" />
+
+				<!-- Optional Arguments -->
+
+				<jvmarg value="-Ddeployer.tomcat.lib.dir=${app.server.tomcat.lib.global.dir}" />
+
+				<!-- Dependent Libraries -->
+
+				<arg value="${app.server.lib.portal.dir}/util-bridges.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-java.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-taglib.jar" />
+			</java>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="direct-deploy-web-cmd">
+		<attribute name="direct.deploy.dir" default="${app.server.deploy.dir}" />
+
+		<sequential>
+			<java
+				classname="com.liferay.portal.tools.deploy.WebDeployer"
+				classpathref="portal.classpath"
+				fork="true"
+				newenvironment="true"
+			>
+
+				<!-- Required Arguments -->
+
+				<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+				<jvmarg value="-Dliferay.lib.portal.dir=${app.server.lib.portal.dir}" />
+				<jvmarg value="-Ddeployer.base.dir=${sdk.dir}/dist" />
+				<jvmarg value="-Ddeployer.dest.dir=@{direct.deploy.dir}" />
+				<jvmarg value="-Ddeployer.app.server.type=${app.server.type}" />
+				<jvmarg value="-Ddeployer.unpack.war=${auto.deploy.unpack.war}" />
+				<jvmarg value="-Ddeployer.file.pattern=${plugin.name}-*.war" />
+
+				<!-- Optional Arguments -->
+
+				<jvmarg value="-Ddeployer.tomcat.lib.dir=${app.server.tomcat.lib.global.dir}" />
+
+				<!-- Dependent Libraries -->
+
+				<arg value="${app.server.lib.portal.dir}/util-bridges.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-java.jar" />
+				<arg value="${app.server.lib.portal.dir}/util-taglib.jar" />
+			</java>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="jar-javadoc">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<available file="@{module.dir}/javadoc" />
+				<then>
+					<jar
+						basedir="@{module.dir}/javadoc"
+						jarfile="${plugin.javadoc.file}"
+					/>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="jar-macro">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<check-snapshot
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<equals arg1="${snapshot.uptodate}" arg2="true" />
+				<then>
+					<loop-macrodef-or-target
+						module.dirs="@{module.dir}"
+						target.name="compile-import-shared"
+					/>
+				</then>
+				<else>
+					<if>
+						<matches pattern=".*-test$" string="@{module.dir}" />
+						<then>
+							<loop-macrodef-or-target
+								module.dirs="@{module.dir}"
+								target.name="compile-test"
+							/>
+						</then>
+						<else>
+							<loop-macrodef-or-target
+								module.dirs="@{module.dir}"
+								target.name="compile"
+							/>
+						</else>
+					</if>
+				</else>
+			</if>
+
+			<check-snapshot
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<equals arg1="${snapshot.uptodate}" arg2="false" />
+				<then>
+					<if>
+						<resourcecontains
+							resource="${module.dir.unix}/build.xml"
+							substring="/build-common-osgi-plugin.xml&quot;"
+						/>
+						<then>
+							<if>
+								<or>
+									<not>
+										<uptodate targetfile="${plugin.file}">
+											<srcfiles dir="${plugin.classes.dir}" includes="**/*.*" />
+										</uptodate>
+									</not>
+									<and>
+										<available file="@{module.dir}/tmp" />
+										<not>
+											<uptodate targetfile="${plugin.file}">
+												<srcfiles dir="@{module.dir}/tmp" includes="**/*.*" />
+											</uptodate>
+										</not>
+									</and>
+								</or>
+								<then>
+									<if>
+										<resourcecount count="0" when="gt">
+											<fileset dir="@{module.dir}/docroot" includes="**/*.css" erroronmissingdir="false" />
+										</resourcecount>
+										<then>
+											<build-css
+												module.dir="@{module.dir}"
+												sass.docroot.dir="${module.dir.unix}/docroot"
+											/>
+										</then>
+									</if>
+
+									<if>
+										<resourcecount count="0" when="gt">
+											<fileset dir="@{module.dir}/src/META-INF/resources" includes="**/*.css" erroronmissingdir="false"/>
+										</resourcecount>
+										<then>
+											<build-css
+												module.dir="@{module.dir}"
+												sass.docroot.dir="${module.dir.unix}/src/META-INF/resources"
+											/>
+										</then>
+									</if>
+
+									<build-wsdl
+										module.dir="@{module.dir}"
+									/>
+
+									<build-xsd
+										module.dir="@{module.dir}"
+									/>
+
+									<set-build-xml-var
+										build.xml.var.name="original.lib.name"
+										module.dir="@{module.dir}"
+									/>
+
+									<if>
+										<isset property="set-build-xml-var.return" />
+										<then>
+											<var name="original.lib.name" value="${set-build-xml-var.return}" />
+										</then>
+									</if>
+
+									<set-build-xml-var
+										build.xml.var.name="original.lib.url"
+										module.dir="@{module.dir}"
+									/>
+
+									<if>
+										<isset property="set-build-xml-var.return" />
+										<then>
+											<var name="original.lib.url" value="${set-build-xml-var.return}" />
+										</then>
+									</if>
+
+									<set-build-xml-var
+										build.xml.var.name="original.lib.version"
+										module.dir="@{module.dir}"
+									/>
+
+									<if>
+										<isset property="set-build-xml-var.return" />
+										<then>
+											<var name="original.lib.version" value="${set-build-xml-var.return}" />
+										</then>
+									</if>
+
+									<manifest-helper />
+
+									<bndexpand propertyfile="${sdk.dir}/common.bnd" />
+
+									<bnd eclipse="false" exceptions="true" failok="false" inherit="true" output="${plugin.file}">
+										<bndfiles>
+											<fileset dir="@{module.dir}">
+												<include name="bnd.bnd" />
+											</fileset>
+										</bndfiles>
+										<classpath>
+											<pathelement location="${plugin.classes.dir}" />
+										</classpath>
+										<property name="-sourcepath" value="@{module.dir}" />
+									</bnd>
+
+									<baseline-jar
+										bndFile="@{module.dir}/bnd.bnd"
+										bndRootFile="${sdk.dir}/common.bnd"
+										newJarFile="${plugin.file}"
+									/>
+
+									<if>
+										<available file="@{module.dir}/docroot/WEB-INF/portlet.xml" />
+										<then>
+											<set-build-xml-var
+												build.xml.var.name="osgi.auto.update.xml"
+												module.dir="@{module.dir}"
+											/>
+
+											<if>
+												<or>
+													<not>
+														<isset property="set-build-xml-var.return" />
+													</not>
+													<and>
+														<isset property="set-build-xml-var.return" />
+														<equals arg1="${set-build-xml-var.return}" arg2="true" />
+													</and>
+												</or>
+												<then>
+													<tstamp>
+														<format property="tstamp.value" pattern="yyyyMMddkkmmssSSS" />
+													</tstamp>
+
+													<move file="${plugin.file}" tofile="${sdk.dir}/dist/${plugin.name}-${plugin.full.version}.war" />
+
+													<direct-deploy-portlet-cmd
+														direct.deploy.dir="${tstamp.value}"
+													/>
+
+													<var name="temp.deployed.plugin.dir" value="${tstamp.value}/${plugin.name}-${plugin.full.version}" />
+
+													<if>
+														<not>
+															<available file="${temp.deployed.plugin.dir}" />
+														</not>
+														<then>
+															<var name="temp.deployed.plugin.dir" value="${tstamp.value}/${plugin.name}" />
+														</then>
+													</if>
+
+													<if>
+														<available file="${temp.deployed.plugin.dir}" />
+														<then>
+															<touch millis="0">
+																<fileset
+																	dir="${temp.deployed.plugin.dir}"
+																	includes="WEB-INF/liferay-web.xml,WEB-INF/web.xml,WEB-INF/tld/*"
+																/>
+															</touch>
+
+															<jar destfile="${sdk.dir}/dist/${plugin.name}-${plugin.full.version}.war" duplicate="preserve" update="true">
+																<fileset
+																	dir="${app.server.portal.dir}"
+																	includes="WEB-INF/tld/c.tld"
+																/>
+																<fileset
+																	dir="${temp.deployed.plugin.dir}"
+																	includes="WEB-INF/liferay-web.xml,WEB-INF/web.xml"
+																/>
+																<fileset
+																	dir="${temp.deployed.plugin.dir}"
+																	includes="WEB-INF/tld/*"
+																/>
+															</jar>
+														</then>
+														<else>
+															<echo>Unable to automatically update web.xml in ${plugin.file}.</echo>
+														</else>
+													</if>
+
+													<var name="temp.deployed.plugin.dir" unset="true" />
+
+													<move file="${sdk.dir}/dist/${plugin.name}-${plugin.full.version}.war" tofile="${plugin.file}" />
+
+													<delete dir="${tstamp.value}" />
+												</then>
+											</if>
+										</then>
+									</if>
+								</then>
+							</if>
+						</then>
+						<else>
+							<jar
+								basedir="@{module.dir}/classes"
+								jarfile="${plugin.file}"
+							/>
+						</else>
+					</if>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="jar-source">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<available file="@{module.dir}/patches" />
+				<then>
+					<jar jarfile="${plugin.sources.file}">
+						<fileset dir="@{module.dir}/src" />
+						<zipfileset
+							dir="@{module.dir}/patches"
+							prefix="META-INF/patches"
+						/>
+					</jar>
+				</then>
+				<elseif>
+					<available file="@{module.dir}/docroot" />
+					<then>
+						<jar
+							basedir="@{module.dir}/docroot"
+							jarfile="${plugin.sources.file}"
+						/>
+					</then>
+				</elseif>
+				<else>
+					<jar
+						basedir="@{module.dir}/src"
+						jarfile="${plugin.sources.file}"
+					/>
+				</else>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="javadoc-macro">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<resourcecount count="0" when="gt">
+					<fileset dir="${plugin.source.dir}" includes="**/*.java" />
+				</resourcecount>
+				<then>
+					<javadoc
+						classpathref="plugin.classpath"
+						destdir="@{module.dir}/javadoc"
+						sourcepath="${plugin.source.dir}"
+					/>
+				</then>
+			</if>
+
+			<var name="module.java.count" unset="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="loop-macrodef-or-target">
+		<attribute name="module.dirs" />
+		<attribute name="target.name" />
+
+		<sequential>
+			<var name="module.dirs" value="@{module.dirs}" />
+			<var name="target.name" value="@{target.name}" />
+
+			<groovy>
+				<![CDATA[
+					targetName = properties["target.name"]
+
+					if ((properties["target.name"] == "jar") ||
+						(properties["target.name"] == "javadoc") ||
+						(properties["target.name"] == "war")) {
+
+						macrodefName = properties["target.name"] + "-macro"
+					}
+					else {
+						macrodefName = properties["target.name"]
+					}
+
+					moduleDirs = "${properties["module.dirs"]}".split(",")
+
+					for (moduleDir in moduleDirs) {
+						File buildXml = new File(moduleDir + "/build.xml")
+
+						if (buildXml.exists() && (moduleDir != "")) {
+							String buildXmlContent = buildXml.text
+
+							ant."set-module-properties"("module.dir": moduleDir)
+
+							if (buildXmlContent =~ "<target name=\"" + targetName + "\"") {
+								ant.ant(dir: moduleDir, target: targetName)
+							}
+							else {
+								ant."${macrodefName}"("module.dir": moduleDir)
+							}
+						}
+						else {
+							if (moduleDir == "") {
+								continue
+							}
+							else {
+								println "Skipping " + moduleDir + " because it does not have a build.xml file."
+							}
+						}
+					}
+				]]>
+			</groovy>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="manifest-helper">
+		<attribute name="analyze" default="false" />
+
+		<sequential>
+			<taskdef
+				classname="com.liferay.util.ant.ManifestHelperTask"
+				classpathref="portal.classpath"
+				name="liferay-manifest-helper"
+			/>
+
+			<liferay-manifest-helper
+				analyze="@{analyze}"
+				classpathref="plugin.classpath"
+				projectDirPropertyName="sdk.dir"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="merge">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-build-xml-var
+				build.xml.var.name="original.war.file"
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<isset property="set-build-xml-var.return" />
+				<then>
+					<var name="merge.original.war.file" value="${set-build-xml-var.return}" />
+
+					<if>
+						<not>
+							<uptodate srcfile="@{module.dir}/${merge.original.war.file}" targetfile="@{module.dir}/tmp" />
+						</not>
+						<then>
+							<remake-dir dir="@{module.dir}/tmp" />
+
+							<mkdir dir="@{module.dir}/tmp/WEB-INF/classes" />
+							<mkdir dir="@{module.dir}/tmp/WEB-INF/lib" />
+
+							<loop-macrodef-or-target
+								module.dirs="@{module.dir}"
+								target.name="merge-unzip"
+							/>
+
+							<copy todir="@{module.dir}/tmp" overwrite="true">
+								<fileset dir="@{module.dir}/docroot" />
+							</copy>
+						</then>
+					</if>
+
+					<copy todir="@{module.dir}/tmp">
+						<fileset dir="@{module.dir}/docroot" />
+					</copy>
+
+					<var name="merge.original.war.file" unset="true" />
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="merge-unzip">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-build-xml-var
+				build.xml.var.name="original.war.file"
+				module.dir="@{module.dir}"
+			/>
+
+			<var name="merge-unzip.original.war.file" value="${set-build-xml-var.return}" />
+
+			<unzip
+				dest="@{module.dir}/tmp"
+				src="@{module.dir}/${merge-unzip.original.war.file}"
+			/>
+
+			<var name="merge-unzip.original.war.file" unset="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="multiroot-subant">
+		<attribute name="build.file" />
+		<attribute name="excludes" />
+		<attribute name="includes" />
+		<attribute name="root.dir" />
+		<attribute name="target" />
+		<element name="properties" optional="true" />
+
+		<sequential>
+			<path id="includes.path">
+				<dirset dir="@{root.dir}" excludes="@{excludes}" includes="@{includes}" />
+			</path>
+
+			<local name="includes.path" />
+
+			<pathconvert pathsep="," property="includes.path" refid="includes.path" targetos="unix" />
+
+			<subant target="@{target}">
+				<multirootfileset basedirs="${includes.path}">
+					<include name="@{build.file}" />
+				</multirootfileset>
+				<properties />
+			</subant>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="print-stale-snapshot">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<check-snapshot
+				module.dir="@{module.dir}"
+				snapshot.download.enabled="false"
+			/>
+
+			<if>
+				<equals arg1="${snapshot.uptodate}" arg2="false" />
+				<then>
+					<echo>@{module.dir}</echo>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="publish-local-m2-release">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<ant dir="@{module.dir}" target="publish">
+				<property name="publish.target" value="local" />
+			</ant>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="publish-local-m2-snapshot">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<ant dir="@{module.dir}" target="publish">
+				<property name="publish.target" value="local" />
+				<property name="plugin.release.qualifier" value="-SNAPSHOT" />
+			</ant>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="publish-remote-m2-release">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<ant dir="@{module.dir}" target="publish">
+				<property name="publish.target" value="remote" />
+			</ant>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="publish-remote-m2-snapshot">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<ant dir="@{module.dir}" target="publish">
+				<property name="publish.target" value="remote" />
+				<property name="plugin.release.qualifier" value="-SNAPSHOT" />
+			</ant>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="release">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<if>
+				<available file="@{module.dir}/bnd.bnd" />
+				<then>
+					<set-module-properties
+						module.dir="@{module.dir}"
+					/>
+
+					<loop-macrodef-or-target
+						module.dirs="@{module.dir}"
+						target.name="jar"
+					/>
+
+					<bndexpand propertyfile="${sdk.dir}/common.bnd" />
+
+					<release-to-repo
+						bndRootFile="${sdk.dir}/common.bnd"
+						file="${plugin.file}"
+					/>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="remake-dir">
+		<attribute name="dir" />
+
+		<sequential>
+			<delete dir="@{dir}" />
+
+			<mkdir dir="@{dir}" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="run-cpd">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<taskdef classpathref="classpath.net.sourceforge.pmd" classname="net.sourceforge.pmd.cpd.CPDTask" name="cpd" />
+
+			<if>
+				<isset property="cpd.basedir" />
+				<then>
+					<var name="module.cpd.basedir" value="${cpd.basedir}" />
+				</then>
+				<else>
+					<var name="module.cpd.basedir" value="@{module.dir}" />
+				</else>
+			</if>
+
+			<mkdir dir="${module.cpd.basedir}/pmd-reports" />
+
+			<cpd encoding="UTF-8" format="${pmd.output.type}" minimumTokenCount="${pmd.cpd.minimun.token.count}" outputFile="${module.cpd.basedir}/pmd-reports/cpd.${pmd.output.type}">
+				<fileset dir="${module.cpd.basedir}" includes="**/*.java" />
+			</cpd>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="run-pmd">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<taskdef classpathref="classpath.net.sourceforge.pmd" classname="net.sourceforge.pmd.ant.PMDTask" name="pmd" />
+
+			<if>
+				<isset property="pmd.basedir" />
+				<then>
+					<var name="module.pmd.basedir" value="${pmd.basedir}" />
+				</then>
+				<else>
+					<var name="module.pmd.basedir" value="@{module.dir}" />
+				</else>
+			</if>
+
+			<mkdir dir="${module.pmd.basedir}/pmd-reports" />
+
+			<pmd shortFilenames="true" threads="${pmd.threads}">
+				<fileset dir="${module.pmd.basedir}" excludes="${pmd.java.excludes}" includes="${pmd.java.includes}" />
+				<formatter toConsole="${pmd.output.console}" toFile="${module.pmd.basedir}/pmd-reports/pmd-report.${pmd.output.type}" type="${pmd.output.type}" />
+				<ruleset>${pmd.java.ruleset}</ruleset>
+				<sourceLanguage name="java" version="${ant.build.javac.source}" />
+			</pmd>
+
+			<var name="module.pmd.basedir" unset="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="setup-arquillian">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<if>
+				<and>
+					<available file="@{module.dir}/test/integration" />
+					<not>
+						<resourcecontains
+							resource="${module.dir.unix}/build.xml"
+							substring="/build-common-osgi-plugin.xml&quot;"
+						/>
+					</not>
+					<not>
+						<available file="@{module.dir}/test/integration/arquillian.xml" />
+					</not>
+				</and>
+				<then>
+					<echo file="@{module.dir}/test/integration/arquillian.xml"><![CDATA[<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container qualifier="tomcat" default="true">
+		<configuration>
+			<property name="jmxPort">${jmx.remote.port}</property>
+			<property name="pass">${app.server.tomcat.manager.password}</property>
+			<property name="user">${app.server.tomcat.manager.user}</property>
+		</configuration>
+	</container>
+</arquillian>]]></echo>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="start-test-app-server">
+		<attribute name="module.dir" />
+		<attribute name="test.class" />
+
+		<sequential>
+			<if>
+				<and>
+					<isset property="lp.portal.project.dir" />
+					<resourcecount count="0" when="gt">
+						<fileset dir="@{module.dir}/test-classes/integration" includes="@{test.class}" erroronmissingdir="false">
+							<filename regex="${junit.test.excludes}" negate="true" />
+						</fileset>
+					</resourcecount>
+					<not>
+						<available file="@{module.dir}/test/integration/skip.managed.app.server" type="file" />
+					</not>
+				</and>
+				<then>
+					<ant antfile="${lp.portal.project.dir}/build-test.xml" target="setup-testable-tomcat" inheritAll="false">
+						<property name="project.dir" value="${lp.portal.project.dir}" />
+					</ant>
+
+					<ant antfile="${lp.portal.project.dir}/build-test.xml" target="start-app-server" inheritAll="false">
+						<property name="project.dir" value="${lp.portal.project.dir}" />
+						<property name="testable.portal.started.marker.file" value="${lp.portal.project.dir}/.testable.portal.started" />
+					</ant>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="stop-test-app-server">
+		<sequential>
+			<if>
+				<and>
+					<available file="${lp.portal.project.dir}/.testable.portal.started" />
+					<isset property="lp.portal.project.dir" />
+				</and>
+				<then>
+					<ant antfile="${lp.portal.project.dir}/build-test.xml" target="stop-app-server" inheritAll="false">
+						<property name="project.dir" value="${lp.portal.project.dir}" />
+					</ant>
+
+					<delete file="${lp.portal.project.dir}/.testable.portal.started" failonerror="false" />
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="test">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<test-integration
+				module.dir="@{module.dir}"
+			/>
+
+			<test-unit
+				module.dir="@{module.dir}"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="test-class">
+		<attribute name="module.dir" />
+		<attribute name="test.class" />
+
+		<sequential>
+
+			<if>
+				<resourcecount count="1">
+					<fileset dir="@{module.dir}/test/integration" includes="**/@{test.class}.java" erroronmissingdir="false" />
+				</resourcecount>
+				<then>
+					<var name="test.type" value="integration" />
+
+					<setup-arquillian module.dir="@{module.dir}" />
+				</then>
+				<elseif>
+					<resourcecount count="1">
+						<fileset dir="@{module.dir}/test/unit" includes="**/@{test.class}.java" erroronmissingdir="false"/>
+					</resourcecount>
+					<then>
+						<var name="test.type" value="unit" />
+					</then>
+				</elseif>
+				<else>
+					<if>
+						<not>
+							<isset property="test.class" />
+						</not>
+						<then>
+							<fail>Use "ant test-class -Dtest.class=StringUtilTest".</fail>
+						</then>
+						<elseif>
+							<not>
+								<isset property="test.type" />
+							</not>
+							<then>
+								<fail>Test class ${test.class} cannot be found.</fail>
+							</then>
+						</elseif>
+					</if>
+				</else>
+			</if>
+
+			<test-cmd
+				junit.forkmode="once"
+				module.dir="@{module.dir}"
+				test.class="**/${test.class}.class"
+				test.type="${test.type}"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="test-cmd">
+		<attribute name="junit.forkmode" />
+		<attribute name="module.dir" />
+		<attribute name="test.class" />
+		<attribute name="test.classpathref" default="test.classpath" />
+		<attribute name="test.type" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<available file="@{module.dir}/test/@{test.type}" />
+				<then>
+					<delete dir="@{module.dir}/test-classes/@{test.type}" />
+					<delete dir="@{module.dir}/test-results/@{test.type}" />
+
+					<compile
+						module.dir="@{module.dir}"
+					/>
+
+					<compile-test-cmd
+						module.dir="@{module.dir}"
+						test.classpathref="@{test.classpathref}"
+						test.type="@{test.type}"
+					/>
+
+					<if>
+						<equals arg1="@{test.type}" arg2="integration" />
+						<then>
+							<start-test-app-server
+								module.dir="@{module.dir}"
+								test.class="@{test.class}"
+							/>
+						</then>
+					</if>
+
+					<if>
+						<available file="@{module.dir}/test/@{test.type}" type="dir" />
+						<then>
+							<local name="junit.java.gc" />
+
+							<if>
+								<equals arg1="@{test.type}" arg2="unit" />
+								<then>
+									<if>
+										<equals arg1="${junit.java.unit.gc.logging}" arg2="on" />
+										<then>
+											<property name="junit.java.gc" value="${junit.java.unit.gc} -verbose:gc -XX:+PrintGCCause -XX:+PrintGCDetails" />
+										</then>
+										<else>
+											<property name="junit.java.gc" value="${junit.java.unit.gc}" />
+										</else>
+									</if>
+								</then>
+								<else>
+									<local name="project.dir.name" />
+
+									<basename property="module.dir.name" file="@{module.dir}" />
+
+									<property name="junit.java.gc" value="${junit.java.integration.gc} -verbose:gc -Xloggc:/tmp/${module.dir.name}-@{test.type}-gc.log -XX:+PrintGCCause -XX:+PrintGCDetails" />
+								</else>
+							</if>
+
+							<junit dir="@{module.dir}" fork="on" forkmode="@{junit.forkmode}" jvm="${junit.jvm}" outputtoformatters="false" printsummary="on" showoutput="true">
+								<sysproperty key="app.server.tomcat.dir" value="${app.server.tomcat.dir}" />
+								<sysproperty key="net.sourceforge.cobertura.datafile" file="@{module.dir}/test-coverage/cobertura.ser" />
+								<jvmarg line="${junit.debug.jpda}" />
+								<jvmarg line="${junit.java.gc}" />
+								<jvmarg value="-Dexternal-properties=${test.properties}" />
+								<jvmarg value="-Dfile.encoding=UTF-8" />
+								<jvmarg value="-Djava.net.preferIPv4Stack=true" />
+								<jvmarg value="-Dliferay.mode=test" />
+								<jvmarg value="-Dsdk.dir=${sdk.dir}" />
+								<jvmarg value="-Dtest.class.group.index=${test.class.group.index}" />
+								<jvmarg value="-Dtest.class.groups=${TEST_CLASS_GROUPS}" />
+								<jvmarg value="-Duser.timezone=GMT" />
+								<classpath location="@{module.dir}/test-coverage" />
+								<classpath refid="@{test.classpathref}" />
+								<formatter type="brief" usefile="false" />
+								<formatter type="xml" />
+								<batchtest todir="@{module.dir}/test-results/@{test.type}">
+									<fileset dir="@{module.dir}/test-classes/@{test.type}" includes="@{test.class}">
+										<filename regex="${junit.test.excludes}" negate="true" />
+									</fileset>
+								</batchtest>
+							</junit>
+						</then>
+					</if>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="test-integration">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<setup-arquillian module.dir="@{module.dir}" />
+
+			<test-cmd
+				junit.forkmode="once"
+				module.dir="@{module.dir}"
+				test.class="**/*Test.class"
+				test.type="integration"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="test-unit">
+		<attribute name="module.dir" />
+		<attribute name="test.classpathref" default="test.classpath" />
+
+		<sequential>
+			<test-cmd
+				junit.forkmode="perTest"
+				module.dir="@{module.dir}"
+				test.class="**/*Test.class"
+				test.classpathref="@{test.classpathref}"
+				test.type="unit"
+			/>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="war-alloy-portlet">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<resourcecontains
+					resource="${module.dir.unix}/docroot/WEB-INF/portlet.xml"
+					substring="com.liferay.alloy.mvc.AlloyPortlet"
+				/>
+				<then>
+					<for param="alloy.portlet.dir">
+						<dirset dir="@{module.dir}/docroot/WEB-INF/jsp" includes="*" />
+						<sequential>
+							<if>
+								<available file="@{alloy.portlet.dir}/views" type="dir" />
+								<then>
+									<antelope:stringutil property="alloy.portlet.dir" string="@{alloy.portlet.dir}">
+										<antelope:replace regex="\\" replacement="/" />
+									</antelope:stringutil>
+
+									<antelope:stringutil property="alloy.portlet.dir" string="${alloy.portlet.dir}">
+										<antelope:replace regex="${module.dir.unix}/docroot/" replacement="" />
+									</antelope:stringutil>
+
+									<zip
+										destfile="${plugin.file}"
+										update="true"
+									>
+										<mappedresources>
+											<globmapper from="*" to="${alloy.portlet.dir}/views/touch.jsp" />
+											<string><![CDATA[<%--
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+@generated
+--%>
+
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+
+<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
+
+<%@ page import="com.liferay.portal.model.Portlet" %>
+<%@ page import="com.liferay.portal.service.PortletLocalServiceUtil" %>
+
+<%@ page import="java.util.Set" %>
+
+<liferay-theme:defineObjects />
+
+<%
+Portlet portlet = PortletLocalServiceUtil.getPortletById(portletDisplay.getId());
+
+Set<String> paths = application.getResourcePaths("/WEB-INF/jsp/" + portlet.getFriendlyURLMapping() + "/controllers/");
+
+for (String path : paths) {
+	int x = path.lastIndexOf("/");
+	int y = path.indexOf("_controller.jsp");
+
+	if (y == -1) {
+		continue;
+	}
+
+	String controller = path.substring(x + 1, y);
+%>
+
+	<portlet:resourceURL var="resourceURL">
+		<portlet:param name="controller" value="<%= controller %>" />
+		<portlet:param name="action" value="touch" />
+	</portlet:resourceURL>
+
+	<iframe height="0" src="<%= resourceURL %>" style="display: none; visibility: hidden;" width="0"></iframe>
+
+<%
+}
+%>]]></string>
+										</mappedresources>
+									</zip>
+								</then>
+							</if>
+						</sequential>
+					</for>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="war-macro">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<resourcecontains
+					resource="${module.dir.unix}/build.xml"
+					substring="/build-common-osgi-plugin.xml&quot;"
+				/>
+				<then>
+					<loop-macrodef-or-target
+						module.dirs="@{module.dir}"
+						target.name="jar"
+					/>
+				</then>
+				<else>
+					<if>
+						<or>
+							<antelope:endswith string="${plugin.name}" with="-hook" />
+							<antelope:endswith string="${plugin.name}" with="-layouttpl" />
+							<antelope:endswith string="${plugin.name}" with="-web" />
+						</or>
+						<then>
+							<war-web
+								module.dir="@{module.dir}"
+							/>
+						</then>
+						<elseif>
+							<antelope:endswith string="${plugin.name}" with="-portlet" />
+							<then>
+								<loop-macrodef-or-target
+									module.dirs="@{module.dir}"
+									target.name="compile"
+								/>
+
+								<build-css
+									module.dir="@{module.dir}"
+								/>
+
+								<war-web
+									module.dir="@{module.dir}"
+								/>
+
+								<war-alloy-portlet
+									module.dir="@{module.dir}"
+								/>
+							</then>
+						</elseif>
+						<elseif>
+							<antelope:endswith string="${plugin.name}" with="-theme" />
+							<then>
+								<loop-macrodef-or-target
+									module.dirs="@{module.dir}"
+									target.name="compile"
+								/>
+
+								<build-css
+									module.dir="@{module.dir}"
+								/>
+
+								<if>
+									<not>
+										<available file="@{module.dir}/docroot/images/screenshot.png" />
+									</not>
+									<then>
+										<echo>screenshot.png does not exist.</echo>
+									</then>
+								</if>
+
+								<if>
+									<not>
+										<available file="@{module.dir}/docroot/images/thumbnail.png" />
+									</not>
+									<then>
+										<echo>thumbnail.png does not exist.</echo>
+									</then>
+								</if>
+
+								<mkdir dir="${sdk.dir}/dist" />
+
+								<delete file="${plugin.file}" />
+
+								<zip
+									basedir="@{module.dir}/docroot"
+									destfile="${plugin.file}"
+									excludes="WEB-INF/liferay-hook.xml*,_diffs.*,_diffs/**,${plugins.war.excludes}"
+								>
+									<zipfileset
+										dir="@{module.dir}/docroot"
+										fullpath="WEB-INF/liferay-hook.xml"
+										includes="WEB-INF/liferay-hook.xml.processed"
+									/>
+								</zip>
+							</then>
+						</elseif>
+						<else>
+							<loop-macrodef-or-target
+								module.dirs="@{module.dir}"
+								target.name="jar"
+							/>
+						</else>
+					</if>
+				</else>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="war-web">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<loop-macrodef-or-target
+				module.dirs="@{module.dir}"
+				target.name="compile"
+			/>
+
+			<mkdir dir="${sdk.dir}/dist" />
+
+			<if>
+				<available file="@{module.dir}/tmp" />
+				<then>
+					<var name="docroot.dir" value="@{module.dir}/tmp" />
+				</then>
+				<else>
+					<var name="docroot.dir" value="@{module.dir}/docroot" />
+				</else>
+			</if>
+
+			<delete file="${plugin.file}" />
+
+			<clean-portal-dependencies
+				module.dir="@{module.dir}"
+			/>
+
+			<if>
+				<available file="@{module.dir}/docroot/WEB-INF/liferay-hook.xml.processed" />
+				<then>
+					<var name="liferay-hook.xml.excludes" value="WEB-INF/liferay-hook.xml*" />
+				</then>
+				<else>
+					<var name="liferay-hook.xml.excludes" value="" />
+				</else>
+			</if>
+
+			<if>
+				<contains string="${app.server.dir}" substring="glassfish" />
+				<then>
+					<zip
+						basedir="${docroot.dir}"
+						destfile="${plugin.file}"
+						excludes="**/META-INF/context.xml,${liferay-hook.xml.excludes},${plugins.war.excludes}"
+					>
+						<zipfileset
+							dir="${docroot.dir}"
+							fullpath="WEB-INF/liferay-hook.xml"
+							includes="WEB-INF/liferay-hook.xml.processed"
+						/>
+					</zip>
+				</then>
+				<else>
+					<zip
+						basedir="${docroot.dir}"
+						destfile="${plugin.file}"
+						excludes="${liferay-hook.xml.excludes},${plugins.war.excludes}"
+					>
+						<zipfileset
+							dir="${docroot.dir}"
+							fullpath="WEB-INF/liferay-hook.xml"
+							includes="WEB-INF/liferay-hook.xml.processed"
+						/>
+					</zip>
+				</else>
+			</if>
+
+			<if>
+				<and>
+					<equals arg1="${plugins.src.zip.enabled}" arg2="true" />
+				</and>
+				<then>
+					<zip destfile="${plugin.src.file}">
+						<zipfileset
+							dir="${docroot.dir}"
+							excludes="${liferay-hook.xml.excludes},**/classes/**,**/lib/**"
+							prefix="${plugin.name}-src-${plugin.full.version}"
+						/>
+						<zipfileset
+							dir="${docroot.dir}"
+							fullpath="${plugin.name}-src-${plugin.full.version}/WEB-INF/liferay-hook.xml"
+							includes="WEB-INF/liferay-hook.xml.processed"
+						/>
+					</zip>
+
+					<set-build-xml-var
+						build.xml.var.name="import.shared"
+						module.dir="@{module.dir}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="compile-import-shared.import.shared" value="${set-build-xml-var.return}" />
+
+							<zip-shared-src />
+						</then>
+					</if>
+				</then>
+			</if>
+		</sequential>
+	</macrodef>
+
+	<macrodef name="zip-shared-src">
+		<attribute default="${compile-import-shared.import.shared}" name="import.shared.list" />
+
+		<sequential>
+			<for list="@{import.shared.list}" param="import.shared.current">
+				<sequential>
+					<zip destfile="${plugin.src.file}" update="true">
+						<zipfileset
+							dir="${sdk.dir}/shared/@{import.shared.current}"
+							excludes="build.xml,**/classes/**,**/lib/**"
+							prefix="@{import.shared.current}-src"
+						/>
+					</zip>
+
+					<set-build-xml-var
+						build.xml.var.name="import.shared"
+						module.dir="${sdk.dir}/shared/@{import.shared.current}"
+					/>
+
+					<if>
+						<isset property="set-build-xml-var.return" />
+						<then>
+							<var name="compile-import-shared.import.shared" value="${set-build-xml-var.return}" />
+
+							<zip-shared-src />
+						</then>
+					</if>
+				</sequential>
+			</for>
+		</sequential>
+	</macrodef>
+
+	<target name="build-css">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="build-css"
+		/>
+	</target>
+
+	<target name="build-db">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="build-db"
+		/>
+	</target>
+
+	<target name="build-upgrade-table" depends="prepare-upgrade-table">
+		<if>
+			<isset property="upgrade.table.dir" />
+			<then>
+				<loop-macrodef-or-target
+					module.dirs="${plugins.includes.path}"
+					target.name="build-upgrade-table"
+				/>
+			</then>
+			<else>
+				<fail>Please set the property "upgrade.table.dir" before running this task.</fail>
+			</else>
+		</if>
+	</target>
+
+	<target name="build-wsdl">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="build-wsdl"
+		/>
+	</target>
+
+	<target name="build-xsd">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="build-xsd"
+		/>
+	</target>
+
+	<target name="clean">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="clean"
+		/>
+	</target>
+
+	<target name="compile">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="compile"
+		/>
+	</target>
+
+	<target name="compile-jsp">
+		<subant target="compile-jsp">
+			<dirset dir="." excludes="apps/test-broken/**,**/templates/**,**/docroot/**" includes="*/**">
+				<or>
+					<present targetdir=".">
+						<mapper from="*" to="*/docroot" type="glob" />
+					</present>
+					<present targetdir=".">
+						<mapper from="*" to="*/src/META-INF/resources" type="glob" />
+					</present>
+					<present targetdir=".">
+						<mapper from="*" to="*/tmp" type="glob" />
+					</present>
+				</or>
+			</dirset>
+		</subant>
+	</target>
+
+	<target name="compile-test">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="compile-test"
+		/>
+	</target>
+
+	<target name="create">
+		<if>
+			<or>
+				<not>
+					<isset property="plugin.type" />
+				</not>
+			</or>
+			<then>
+				<fail>This task must be called by the create script.</fail>
+			</then>
+		</if>
+
+		<if>
+			<or>
+				<equals arg1="${plugin.type}" arg2="hook" />
+				<equals arg1="${plugin.type}" arg2="portlet" />
+				<equals arg1="${plugin.type}" arg2="theme" />
+			</or>
+			<then>
+				<subant target="create">
+					<fileset dir="${sdk.dir}/${plugin.type}s" includes="build.xml" />
+				</subant>
+			</then>
+			<else>
+				<subant target="create">
+					<fileset dir="${sdk.dir}/${plugin.type}" includes="build.xml" />
+				</subant>
+			</else>
+		</if>
+	</target>
+
+	<target name="deploy">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="deploy"
+		/>
+	</target>
+
+	<target name="direct-deploy">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="direct-deploy"
+		/>
+	</target>
+
+	<target name="direct-deploy-ext-cmd">
+		<direct-deploy-ext-cmd />
+	</target>
+
+	<target name="direct-deploy-hook-cmd">
+		<direct-deploy-hook-cmd />
+	</target>
+
+	<target name="direct-deploy-layouttpl-cmd">
+		<direct-deploy-layouttpl-cmd />
+	</target>
+
+	<target name="direct-deploy-portlet-cmd">
+		<direct-deploy-portlet-cmd />
+	</target>
+
+	<target name="direct-deploy-theme-cmd">
+		<direct-deploy-theme-cmd />
+	</target>
+
+	<target name="direct-deploy-web-cmd">
+		<direct-deploy-web-cmd />
+	</target>
+
+	<target name="format-javadoc">
+		<java
+			classname="com.liferay.portal.tools.JavadocFormatter"
+			classpathref="portal.classpath"
+			fork="true"
+			newenvironment="true"
+		>
+			<jvmarg value="-Xmx512m" />
+			<arg value="javadoc.init=${init}" />
+			<arg value="javadoc.input.dir=${input.dir}" />
+			<arg value="javadoc.limit=${limit}" />
+			<arg value="javadoc.output.file.prefix=${output.file.prefix}" />
+			<arg value="javadoc.update=${update}" />
+		</java>
+	</target>
+
+	<target name="format-source">
+		<java
+			classname="com.liferay.portal.tools.sourceformatter.SourceFormatter"
+			classpathref="portal.classpath"
+			fork="true"
+			newenvironment="true"
+		>
+			<jvmarg value="-Xmx512m" />
+			<jvmarg value="-Xss2048k" />
+		</java>
+
+		<delete file="ServiceBuilder.temp" />
+	</target>
+
+	<target name="jar">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="jar"
+		/>
+	</target>
+
+	<target name="jar-javadoc" depends="javadoc">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="jar-javadoc"
+		/>
+	</target>
+
+	<target name="jar-source">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="jar-source"
+		/>
+	</target>
+
+	<target name="javadoc">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="javadoc"
+		/>
+	</target>
+
+	<target name="prepare-upgrade-table">
+		<for param="zip.file">
+			<path>
+				<fileset
+					dir="${upgrade.table.dir}"
+					includes="*.zip"
+				/>
+			</path>
+			<sequential>
+				<antelope:stringutil string="@{zip.file}" property="zip.version.beginindex">
+					<indexof string="src-" fromindex="0" />
+				</antelope:stringutil>
+
+				<math
+					datatype="int"
+					operand1="${zip.version.beginindex}"
+					operand2="4"
+					operation="+"
+					result="zip.version.beginindex"
+				/>
+
+				<antelope:stringutil string="@{zip.file}" property="zip.version.endindex">
+					<indexof string=".zip" fromindex="0" />
+				</antelope:stringutil>
+
+				<antelope:stringutil string="@{zip.file}" property="zip.version">
+					<substring beginindex="${zip.version.beginindex}" endindex="${zip.version.endindex}" />
+				</antelope:stringutil>
+
+				<if>
+					<or>
+						<not>
+							<uptodate
+								srcfile="@{zip.file}"
+								targetfile="${upgrade.table.dir}/${zip.version}"
+							/>
+						</not>
+						<not>
+							<available file="${upgrade.table.dir}/${zip.version}/indexes.sql" />
+						</not>
+					</or>
+					<then>
+						<mkdir dir="${upgrade.table.dir}/${zip.version}" />
+
+						<unzip
+							dest="${upgrade.table.dir}/${zip.version}"
+							src="@{zip.file}"
+						>
+							<patternset>
+								<include name="**/*ModelImpl.java" />
+								<include name="**/sql/indexes.sql" />
+							</patternset>
+							<mapper type="flatten" />
+						</unzip>
+					</then>
+				</if>
+			</sequential>
+		</for>
+	</target>
+
+	<target name="print-current-time">
+		<tstamp>
+			<format property="current.time" pattern="MMMM d, yyyy 'at' hh:mm aa" />
+		</tstamp>
+
+		<echo message="${current.time}" />
+	</target>
+
+	<target name="print-stale-snapshot">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="print-stale-snapshot"
+		/>
+	</target>
+
+	<target name="publish-local-m2-release" depends="jar-javadoc,jar-source,war">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="publish-local-m2-release"
+		/>
+	</target>
+
+	<target name="publish-local-m2-snapshot" depends="jar-javadoc,jar-source,war">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="publish-local-m2-snapshot"
+		/>
+	</target>
+
+	<target name="publish-remote-m2-release" depends="jar-javadoc,jar-source,war">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="publish-remote-m2-release"
+		/>
+	</target>
+
+	<target name="publish-remote-m2-snapshot" depends="jar-javadoc,jar-source,war">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="publish-remote-m2-snapshot"
+		/>
+	</target>
+
+	<target name="release">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="release"
+		/>
+	</target>
+
+	<target name="run-cpd">
+		<if>
+			<not>
+				<isset property="plugins.includes.path" />
+			</not>
+			<then>
+				<property name="plugins.includes.path" value="${basedir}" />
+			</then>
+		</if>
+
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="run-cpd"
+		/>
+	</target>
+
+	<target name="run-pmd">
+		<if>
+			<not>
+				<isset property="plugins.includes.path" />
+			</not>
+			<then>
+				<property name="plugins.includes.path" value="${basedir}" />
+			</then>
+		</if>
+
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="run-pmd"
+		/>
+	</target>
+
+	<target name="setup-arquillian">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="setup-arquillian"
+		/>
+	</target>
+
+	<target name="setup-eclipse">
+		<loop-macrodef-or-target
+			module.dirs="${basedir}"
+			target.name="compile-import-shared"
+		/>
+
+		<process-ivy
+			module.dir="${basedir}"
+		/>
+
+		<java
+			classname="com.liferay.portal.tools.PluginsEnvironmentBuilder"
+			classpathref="portal.classpath"
+			fork="true"
+			newenvironment="true"
+		>
+			<jvmarg value="-Dplugins.env.dir=." />
+		</java>
+	</target>
+
+	<target name="setup-jrebel">
+		<property name="jrebel.plugin.classes.dir" value="${basedir}/${plugin.classes.dir}" />
+
+		<echo file="${jrebel.plugin.classes.dir}/rebel.xml"><![CDATA[<?xml version="1.0"?>
+
+<application
+	xmlns="http://www.zeroturnaround.com"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd"
+>
+	<classpath>
+		<dir name="${jrebel.plugin.classes.dir}" />
+	</classpath>
+</application>]]></echo>
+
+		<if>
+			<available file="docroot" type="dir" />
+			<then>
+				<replace file="${jrebel.plugin.classes.dir}/rebel.xml">
+					<replacetoken><![CDATA[</application>]]></replacetoken>
+					<replacevalue expandProperties="true"><![CDATA[	<web>
+		<link target="/${plugin.name}">
+			<dir name="${basedir}/docroot" />
+		</link>
+	</web>
+</application>]]></replacevalue>
+				</replace>
+			</then>
+		</if>
+	</target>
+
+	<target name="sort-xml-attributes">
+		<java
+			classname="com.liferay.portal.tools.XMLAttributesSorter"
+			classpathref="portal.classpath"
+			fork="true"
+			newenvironment="true"
+		>
+			<jvmarg value="-Xmx512m" />
+			<jvmarg value="-Xss2048k" />
+			<arg value="sort.xml.file.name=${sort.xml.file.name}" />
+		</java>
+	</target>
+
+	<target name="test">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="test"
+		/>
+
+		<stop-test-app-server />
+	</target>
+
+	<target name="test-integration">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="test-integration"
+		/>
+
+		<stop-test-app-server />
+	</target>
+
+	<target name="test-unit">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="test-unit"
+		/>
+	</target>
+
+	<target name="war">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="war"
+		/>
+	</target>
+
+	<target name="watch">
+		<property name="watch.flag.file" location="${sdk.dir}/tmp/watch.flag" />
+
+		<touch file="${watch.flag.file}" mkdirs="true" />
+
+		<antelope:repeat count="-1" interval="2">
+			<outofdate outputsourcespath="watch.sources.path">
+				<sourcefiles>
+					<fileset dir="${basedir}">
+						<include name="**/*.css" />
+						<include name="**/*.ftl" />
+						<include name="**/*.java" />
+						<include name="**/*.js" />
+						<include name="**/*.jsp" />
+						<include name="**/*.jspf" />
+						<include name="**/*.scss" />
+						<include name="**/*.vm" />
+						<exclude name="**/test/unit/**" />
+						<exclude name="**/test/integration/**" />
+						<exclude name="**/classes/**" />
+						<exclude name="**/.sass-cache/**" />
+					</fileset>
+				</sourcefiles>
+				<targetfiles>
+					<pathelement location="${watch.flag.file}" />
+				</targetfiles>
+				<sequential>
+					<property name="watch.sources.path" refid="watch.sources.path" />
+
+					<echo>Detected a modification in ${watch.sources.path}.</echo>
+
+					<propertyregex
+						global="false"
+						input="${watch.sources.path}"
+						override="true"
+						property="watch.deploy.path"
+						regexp="(/|\\)(src.*$|docroot.*$)"
+						replace=""
+					/>
+
+					<echo>Deploying ${watch.deploy.path}.</echo>
+
+					<deploy
+						module.dir="${watch.deploy.path}"
+					/>
+
+					<var name="watch.sources.path" unset="true" />
+
+					<touch file="${watch.flag.file}" />
+
+					<echo>Finished deployment. Watching for additional modifications.</echo>
+				</sequential>
+			</outofdate>
+		</antelope:repeat>
+	</target>
+</project>
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..384f3ed
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,544 @@
+##
+## DO NOT EDIT THIS FILE.
+##
+## To update the properties of this file, create a separate properties file
+## named "build.${user.name}.properties" with the properties to overwrite.
+##
+
+##
+## Application Server
+##
+
+    #
+    # Specify the application server type.
+    #
+    #app.server.type=geronimo
+    #app.server.type=glassfish
+    #app.server.type=jboss
+    #app.server.type=jetty
+    #app.server.type=jonas
+    #app.server.type=resin
+    app.server.type=tomcat
+    #app.server.type=weblogic
+    #app.server.type=websphere
+    #app.server.type=wildfly
+
+    #
+    # Specify the application server parent directory.
+    #
+    app.server.parent.dir=${sdk.dir}/../bundles
+
+    #
+    # Specify the paths to an unzipped Geronimo bundle.
+    #
+    app.server.geronimo.dir=${app.server.parent.dir}/geronimo-2.2.1
+    app.server.geronimo.deploy.dir=${app.server.geronimo.dir}/deploy
+    app.server.geronimo.lib.global.dir=${app.server.geronimo.dir}/var/shared/lib
+    app.server.geronimo.portal.dir=${app.server.geronimo.dir}/deploy/liferay-portal
+
+    #
+    # Specify the paths to an unzipped Glassfish bundle.
+    #
+    app.server.glassfish.dir=${app.server.parent.dir}/glassfish-3.1.2.2
+    app.server.glassfish.deploy.dir=${app.server.glassfish.dir}/autodeploy
+    app.server.glassfish.lib.global.dir=${app.server.glassfish.dir}/domains/domain1/lib
+    app.server.glassfish.portal.dir=${app.server.glassfish.dir}/domains/domain1/applications/liferay-portal
+
+    #
+    # Specify the paths to an unzipped JBoss bundle.
+    #
+    app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-6.1.0
+    app.server.jboss.deploy.dir=${app.server.jboss.dir}/standalone/deployments
+    app.server.jboss.lib.global.dir=${app.server.jboss.dir}/modules/com/liferay/portal/main
+    app.server.jboss.portal.dir=${app.server.jboss.dir}/standalone/deployments/ROOT.war
+
+    #
+    # Specify the paths to an unzipped Jetty bundle.
+    #
+    app.server.jetty.dir=${app.server.parent.dir}/jetty-8.1.10
+    app.server.jetty.deploy.dir=${app.server.jetty.dir}/webapps
+    app.server.jetty.lib.global.dir=${app.server.jetty.dir}/lib/ext/liferay
+    app.server.jetty.portal.dir=${app.server.jetty.dir}/webapps/root
+
+    #
+    # Specify the paths to an unzipped JOnAS bundle.
+    #
+    app.server.jonas.dir=${app.server.parent.dir}/jonas-5.2.3
+    app.server.jonas.deploy.dir=${app.server.jonas.dir}/deploy
+    app.server.jonas.lib.global.dir=${app.server.jonas.dir}/lib/ext
+    app.server.jonas.portal.dir=${app.server.jonas.dir}/deploy/liferay-portal
+
+    #
+    # Specify the paths to an unzipped Resin bundle.
+    #
+    app.server.resin.dir=${app.server.parent.dir}/resin-4.0.44
+    app.server.resin.deploy.dir=${app.server.resin.dir}/webapps
+    app.server.resin.lib.global.dir=${app.server.resin.dir}/ext-lib
+    app.server.resin.portal.dir=${app.server.resin.dir}/webapps/ROOT
+
+    #
+    # Specify the paths to an unzipped tc Server bundle.
+    #
+    app.server.tcserver.dir=${app.server.parent.dir}/tc-server-2.6.4
+    app.server.tcserver.deploy.dir=${app.server.tcserver.dir}/liferay/webapps
+    app.server.tcserver.lib.global.dir=${app.server.tcserver.dir}/liferay/lib
+    app.server.tcserver.portal.dir=${app.server.tcserver.dir}/liferay/webapps/ROOT
+
+    #
+    # Specify the paths to an unzipped Tomcat bundle.
+    #
+    app.server.tomcat.dir=${app.server.parent.dir}/tomcat-7.0.62
+    app.server.tomcat.deploy.dir=${app.server.tomcat.dir}/webapps
+    app.server.tomcat.lib.global.dir=${app.server.tomcat.dir}/lib/ext
+    app.server.tomcat.manager.user=tomcat
+    app.server.tomcat.manager.password=tomcat
+    app.server.tomcat.portal.dir=${app.server.tomcat.dir}/webapps/ROOT
+
+    #
+    # Specify the paths to a WebLogic domain with Liferay installed.
+    #
+    app.server.weblogic.dir=${app.server.parent.dir}/weblogic-12.1.3
+    app.server.weblogic.deploy.dir=${app.server.weblogic.dir}/domains/liferay/autodeploy
+    app.server.weblogic.lib.global.dir=${app.server.weblogic.dir}/domains/liferay/lib
+    app.server.weblogic.portal.dir=${app.server.weblogic.dir}/domains/liferay/autodeploy/ROOT
+
+    #
+    # Specify the paths to a WebSphere profile with Liferay installed.
+    #
+    app.server.websphere.dir=${app.server.parent.dir}/websphere-7.0
+    app.server.websphere.deploy.dir=${app.server.websphere.dir}/profiles/liferay/wsadmin-deploy
+    app.server.websphere.lib.global.dir=${app.server.websphere.dir}/lib/ext
+    app.server.websphere.portal.dir=${app.server.websphere.dir}/profiles/liferay/installedApps/liferay-cell/liferay-portal.ear/liferay-portal.war
+
+    #
+    # Specify the paths to an unzipped JBoss AS bundle.
+    #
+    app.server.wildfly.dir=${app.server.parent.dir}/jboss-7.1.1
+    app.server.wildfly.deploy.dir=${app.server.wildfly.dir}/standalone/deployments
+    app.server.wildfly.lib.global.dir=${app.server.wildfly.dir}/modules/com/liferay/portal/main
+    app.server.wildfly.portal.dir=${app.server.wildfly.dir}/standalone/deployments/ROOT.war
+
+##
+## Auto Deploy
+##
+
+    #
+    # Plugins will be deployed to this directory. Make sure that Liferay is
+    # also set to scan this directory.
+    #
+    auto.deploy.dir=${app.server.parent.dir}/deploy
+
+    #
+    # Set this to true if deployed WARs are unpacked. Set this to false your
+    # application server has concurrency issues with deploying large WARs.
+    #
+    auto.deploy.unpack.war=true
+
+    #
+    # Set this to true if you want the deployer to rename portlet.xml to
+    # portlet-custom.xml. This is only needed when deploying the portal on
+    # WebSphere 6.1.x with a version before 6.1.0.7 because WebSphere's portlet
+    # container will try to process a portlet at the same time that Liferay is
+    # trying to process a portlet.
+    #
+    auto.deploy.custom.portlet.xml=false
+
+##
+## Baseline JAR
+##
+
+    baseline.jar.bnddir.name=.bnd
+
+    baseline.jar.report.level=diff
+    #baseline.jar.report.level=off
+    #baseline.jar.report.level=persist
+    #baseline.jar.report.level=standard
+
+    baseline.jar.report.only.dirty.packages=true
+
+    baseline.jar.reports.dir.name=baseline-reports
+
+    -baseline=
+    -baselinerepo=localrepo
+    -fixupmessages: "While setting properties ...";is:=ignore
+    -jsp: *.jsp,*.jspf
+    -metatype: *
+    -plugin=\
+        aQute.bnd.deployer.repository.LocalIndexedRepo;\
+            local=${sdk.dir}/.bnd/localrepo;\
+            name=localrepo;\
+            phase=any;\
+            type=R5,\
+        aQute.bnd.deployer.repository.FixedIndexedRepo;\
+            cache=${sdk.dir}/.bnd/remoterepo;\
+            locations='http://obr.liferay.com/r5/liferay-portal/index.xml.gz';\
+            name=remoterepo;\
+            phase=any;\
+            type=R5,\
+        com.liferay.ant.bnd.bower.BowerAnalyzerPlugin,\
+        com.liferay.ant.bnd.jsp.JspAnalyzerPlugin,\
+        com.liferay.ant.bnd.sass.SassAnalyzerPlugin
+    -pluginpath=${sdk.dir}/osgi/lib/plugin/bnd-repository.jar
+    -releaserepo=localrepo
+    -sass: *
+
+##
+## BND JSP Support
+##
+
+    #
+    # When creating bundles which contain JSPs, simply add ${bnd.jsp.support.imports} as
+    # part of the package imports in the bnd file.
+    #
+    bnd.jsp.support.imports=\
+        ${bnd.jsp.support.imports.javax.el},\
+        ${bnd.jsp.support.imports.javax.servlet},\
+        ${bnd.jsp.support.imports.javax.servlet.jsp},\
+        ${bnd.jsp.support.imports.javax.servlet.jsp.jstl},\
+        ${bnd.jsp.support.imports.org.apache.jasper},\
+        ${bnd.jsp.support.imports.org.apache.taglibs.standard},\
+        ${bnd.jsp.support.imports.xml},\
+        javax.tools
+
+    bnd.jsp.support.imports.javax.el=\
+        com.sun.el;version='${bnd.jsp.support.version.javax.el}',\
+        com.sun.el.lang;version='${bnd.jsp.support.version.javax.el}',\
+        com.sun.el.parser;version='${bnd.jsp.support.version.javax.el}',\
+        com.sun.el.stream;version='${bnd.jsp.support.version.javax.el}',\
+        com.sun.el.util;version='${bnd.jsp.support.version.javax.el}',\
+        javax.el;version='${bnd.jsp.support.version.javax.el}'
+
+    bnd.jsp.support.imports.javax.servlet=\
+        javax.servlet;version='${bnd.jsp.support.version.javax.servlet}',\
+        javax.servlet.annotation;version='${bnd.jsp.support.version.javax.servlet}',\
+        javax.servlet.descriptor;version='${bnd.jsp.support.version.javax.servlet}',\
+        javax.servlet.http;version='${bnd.jsp.support.version.javax.servlet}',\
+        javax.servlet.resources
+
+    bnd.jsp.support.imports.javax.servlet.jsp=\
+        javax.servlet.jsp;version='${bnd.jsp.support.version.javax.servlet.jsp}',\
+        javax.servlet.jsp.el;version='${bnd.jsp.support.version.javax.servlet.jsp}',\
+        javax.servlet.jsp.tagext;version='${bnd.jsp.support.version.javax.servlet.jsp}'
+
+    bnd.jsp.support.imports.javax.servlet.jsp.jstl=\
+        javax.servlet.jsp.jstl.core;version='${bnd.jsp.support.version.javax.servlet.jsp.jstl}',\
+        javax.servlet.jsp.jstl.fmt;version='${bnd.jsp.support.version.javax.servlet.jsp.jstl}',\
+        javax.servlet.jsp.jstl.sql;version='${bnd.jsp.support.version.javax.servlet.jsp.jstl}',\
+        javax.servlet.jsp.jstl.tlv;version='${bnd.jsp.support.version.javax.servlet.jsp.jstl}'
+
+    bnd.jsp.support.imports.org.apache.jasper=\
+        org.apache.jasper;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.compiler;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.compiler.tagplugin;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.resources;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.runtime;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.security;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.servlet;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.tagplugins.jstl;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.apache.jasper.xmlparser;version='${bnd.jsp.support.version.org.apache.jasper}',\
+        org.glassfish.jsp.api;version='${bnd.jsp.support.version.org.apache.jasper}'
+
+    bnd.jsp.support.imports.org.apache.taglibs.standard=\
+        org.apache.taglibs.standard;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.extra.spath;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.functions;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.lang.jstl;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.lang.jstl.parser;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.lang.jstl.test;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.lang.jstl.test.beans;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.lang.support;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.resources;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.common.core;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.common.fmt;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.common.sql;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.common.xml;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.el.core;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.el.fmt;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.el.sql;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.el.xml;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.rt.core;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.rt.fmt;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.rt.sql;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tag.rt.xml;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tei;version='${bnd.jsp.support.version.org.apache.taglibs.standard}',\
+        org.apache.taglibs.standard.tlv;version='${bnd.jsp.support.version.org.apache.taglibs.standard}'
+
+    bnd.jsp.support.imports.xml=\
+        javax.xml.parsers,\
+        javax.xml.transform,\
+        javax.xml.transform.dom,\
+        javax.xml.transform.stream,\
+        javax.xml.validation,\
+        org.w3c.dom,\
+        org.w3c.dom.ls,\
+        org.xml.sax,\
+        org.xml.sax.ext,\
+        org.xml.sax.helpers
+
+    bnd.jsp.support.version.javax.el=[3.0.0,4.0)
+    bnd.jsp.support.version.javax.servlet=[2.6.0,4.0.0)
+    bnd.jsp.support.version.javax.servlet.jsp=[2.3.2,3.0)
+    bnd.jsp.support.version.javax.servlet.jsp.jstl=[1.2.1,2.0)
+    bnd.jsp.support.version.org.apache.jasper=[2.3.2,3.0)
+    bnd.jsp.support.version.org.apache.taglibs.standard=[1.2.3,2.0)
+
+##
+## Clean
+##
+
+    clean.delete.ivy.md5=false
+    clean.delete.lib=false
+
+##
+## Compiler
+##
+
+    ant.build.javac.source=1.7
+    ant.build.javac.target=1.7
+
+    #javac.compiler=com.google.errorprone.ErrorProneAntCompilerAdapter
+    #javac.compiler=modern
+    javac.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
+
+    javac.debug=on
+    javac.deprecation=off
+    javac.encoding=UTF-8
+    javac.nowarn=on
+
+##
+## Database
+##
+
+    #
+    # Set the database name used by the SQL scripts.
+    #
+    database.name=lportal
+
+    #
+    # Set the database server types to build SQL scripts for.
+    #
+    database.types=db2,derby,firebird,hypersonic,informix,ingres,interbase,jdatastore,mysql,oracle,postgresql,sap,sqlserver,sybase
+    #database.types=mysql
+
+##
+## Extension Environment
+##
+
+    #ext.work.dir=
+
+##
+## Ivy
+##
+
+    ivy.cache.ttl.default=eternal
+    ivy.custom.settings.file=${sdk.dir}/ivy-settings.xml
+    ivy.home=${sdk.dir}/.ivy
+
+    #ivy.jar.url=http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
+    ivy.jar.url=https://cdn.lfrs.sl/repository.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/org.apache.ivy/${ivy.version}/org.apache.ivy-${ivy.version}.jar
+
+    ivy.log.level=quiet
+    ivy.pom.developer.name=Brian Wing Shun Chan
+    ivy.pom.developer.organization=Liferay, Inc.
+    ivy.pom.developer.organizationUrl=http://www.liferay.com
+    ivy.pom.license.name=LGPL 2.1
+    ivy.pom.license.url=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+    ivy.pom.scm.connection=scm:git:git@github.com:liferay/liferay-plugins.git
+    ivy.pom.scm.developerConnection=scm:git:git@github.com:liferay/liferay-plugins.git
+    ivy.pom.scm.url=http://github.com/liferay/liferay-plugins
+    ivy.resolve.transitive.dependencies.test=true
+    ivy.resolve.transitive.dependencies=true
+
+    #ivy.version=2.4.0
+    ivy.version=2.4.0.LIFERAY-PATCHED-1-SNAPSHOT
+
+##
+## JMX
+##
+
+    jmx.remote.port=8099
+
+##
+## JRebel
+##
+
+    #
+    # Set the directory that will be used to generate a plugin's JRebel
+    # configuraton file. Not specifying a directory means that the generated
+    # JRebel configuration file will be placed in a plugin's compiled classes
+    # output directory. This is also the directory that JRebel will use to look
+    # for updated classes.
+    #
+    #jrebel.plugin.classes.dir=
+
+##
+## JUnit
+##
+
+    junit.debug.jpda=-agentlib:jdwp=transport=dt_socket,address=8001,server=y,suspend=y
+
+    junit.halt.on.failure=false
+    junit.java.integration.gc=-Xms512m -Xmx512m -XX:MaxNewSize=32m -XX:MaxPermSize=200m -XX:MaxTenuringThreshold=0 -XX:NewSize=32m -XX:ParallelGCThreads=2 -XX:PermSize=200m -XX:SurvivorRatio=65536 -XX:TargetSurvivorRatio=0 -XX:-UseAdaptiveSizePolicy -XX:+UseParallelOldGC
+    junit.java.unit.gc=-Xms256m -Xmx256m -XX:MaxNewSize=32m -XX:MaxPermSize=64m -XX:MaxTenuringThreshold=0 -XX:NewSize=32m -XX:ParallelGCThreads=2 -XX:PermSize=64m -XX:SurvivorRatio=65536 -XX:TargetSurvivorRatio=0 -XX:-UseAdaptiveSizePolicy -XX:+UseParallelOldGC
+    junit.java.unit.gc.logging=off
+    junit.jvm=java
+    junit.test.excludes=(?!)
+
+##
+## Libraries
+##
+
+    required.portal.jars=commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar
+
+##
+## Liferay Home
+##
+
+    liferay.home=${app.server.parent.dir}/..
+
+##
+## Mirrors
+##
+
+	mirrors.cache.dir=${user.home}/.liferay/mirrors
+
+##
+## Module Framework
+##
+
+    #
+    # Set the directory which will form the base path of the module framework.
+    #
+    module.framework.base.dir=${liferay.home}/osgi
+
+##
+## NodeJS
+##
+
+    nodejs.npm.url=http://nodejs.org/dist/npm/npm-${nodejs.npm.version}.zip
+	nodejs.npm.version=1.4.9
+
+    #nodejs.url=
+
+    nodejs.url[linux32]=http://nodejs.org/dist/v${nodejs.version}/node-v${nodejs.version}-linux-x86.tar.gz
+    nodejs.url[linux64]=http://nodejs.org/dist/v${nodejs.version}/node-v${nodejs.version}-linux-x64.tar.gz
+    nodejs.url[osx32]=http://nodejs.org/dist/v${nodejs.version}/node-v${nodejs.version}-darwin-x86.tar.gz
+    nodejs.url[osx64]=http://nodejs.org/dist/v${nodejs.version}/node-v${nodejs.version}-darwin-x64.tar.gz
+    nodejs.url[windows32]=http://nodejs.org/dist/v${nodejs.version}/node.exe
+    nodejs.url[windows64]=http://nodejs.org/dist/v${nodejs.version}/x64/node.exe
+
+    nodejs.version=0.10.35
+
+##
+## Operating Systems
+##
+
+    os.apple=Mac OS X
+    os.unix=Linux,FreeBSD,Solaris,SunOS
+    os.windows=Windows 95,Windows 98,Windows NT,Windows 2000,Windows 2003,Windows XP,Windows Vista,Windows 7
+
+##
+## PGP
+##
+
+    pgp.generator=
+    pgp.keyname=auto
+    pgp.passphrase=
+
+##
+## Plugins
+##
+
+    #
+    # Set the excludes and includes attributes. These attributes are read when
+    # you run "ant" from the hooks, layouttpl, portlets, shared, themes, or webs
+    # directory. By default, the ant task will go through every subdirectory.
+    # Setting these attributes can limit it to just the plugins you're working
+    # on.
+    #
+    plugins.excludes=modules-admin-portlet
+    plugins.includes=*
+
+    #
+    # Set the excludes and includes attributes for converting a bundle that has
+    # the portal and a set of deployed plugins into an EAR file. The web
+    # applications that match these attributes will be included into the
+    # generated liferay-portal.ear via the command "ant ear".
+    #
+    # For example, if you are using Tomcat, then the directory specified in
+    # the property "app.server.tomcat.deploy.dir" will point to
+    # ${app.server.tomcat.dir}/webapps by default. Running "ant ear" will create
+    # an EAR based on all the WARs in that directory with names that match the
+    # excludes and includes from these two properties.
+    #
+    plugins.ear.excludes=
+    plugins.ear.includes=tunnel-web
+
+    #
+    # Specify the path of the portal servlet context.
+    #
+    # Set this property if you deploy the portal to another path besides root.
+    #
+    plugins.ear.portal.context.path=/
+
+    #
+    # Set this to true to generate a source ZIP file when creating a plugin WAR
+    # file.
+    #
+    plugins.src.zip.enabled=false
+
+    #
+    # Set this to true to optimize the size of plugin WAR files by not included
+    # portal dependencies that will can injected at deploy time.
+    #
+    plugins.war.clean.portal.dependencies=true
+
+    #
+    # Set the excludes attributes to specify files that will be excluded from a
+    # plugin WAR.
+    #
+    #plugins.war.excludes=**/WEB-INF/service/**,**/WEB-INF/src/**
+
+##
+## PMD
+##
+
+    pmd.cpd.minimun.token.count=100
+    pmd.java.excludes=apps/**,tools/**
+    pmd.java.includes=**/src/**/*.java
+    pmd.java.ruleset=${sdk.dir}/dependencies/net.sourceforge.pmd/rulesets/java/standard-rules.xml
+    pmd.output.console=true
+    pmd.output.type=xml
+    pmd.threads=2
+
+##
+## Snapshot
+##
+
+    snapshot.check.enabled=true
+
+##
+## Sonatype
+##
+
+    sonatype.release.hostname=repository.liferay.com
+    sonatype.release.password=
+    sonatype.release.realm=Sonatype Nexus Repository Manager
+    sonatype.release.url=https://repository.liferay.com/nexus/content/repositories/liferay-public-releases
+    sonatype.release.username=
+
+    sonatype.snapshot.hostname=repository.liferay.com
+    sonatype.snapshot.password=
+    sonatype.snapshot.realm=Sonatype Nexus Repository Manager
+    sonatype.snapshot.url=https://repository.liferay.com/nexus/content/repositories/liferay-public-snapshots
+    sonatype.snapshot.username=
+
+##
+## Version
+##
+
+    #
+    # Set the version of Liferay Portal that these plugins are designed for.
+    #
+    lp.version=6.2.0
+    lp.version.file.suffix=
diff --git a/build.ture.properties b/build.ture.properties
new file mode 100644
index 0000000..f4c5d94
--- /dev/null
+++ b/build.ture.properties
@@ -0,0 +1,9 @@
+# Managed by Liferay IDE (remove this comment to prevent future updates)
+
+app.server.tomcat.lib.global.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext
+app.server.tomcat.deploy.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/webapps
+app.server.parent.dir = /home/ture/liferay/portali/paesaggistica
+app.server.tomcat.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62
+app.server.type = tomcat
+app.server.tomcat.portal.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/webapps/ROOT
+javac.encoding = UTF-8
diff --git a/build.ture.properties.paesaggistica b/build.ture.properties.paesaggistica
new file mode 100644
index 0000000..f4c5d94
--- /dev/null
+++ b/build.ture.properties.paesaggistica
@@ -0,0 +1,9 @@
+# Managed by Liferay IDE (remove this comment to prevent future updates)
+
+app.server.tomcat.lib.global.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/lib/ext
+app.server.tomcat.deploy.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/webapps
+app.server.parent.dir = /home/ture/liferay/portali/paesaggistica
+app.server.tomcat.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62
+app.server.type = tomcat
+app.server.tomcat.portal.dir = /home/ture/liferay/portali/paesaggistica/tomcat-7.0.62/webapps/ROOT
+javac.encoding = UTF-8
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..41c3bd9
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="plugins" basedir="." default="all" xmlns:antelope="antlib:ise.antelope.tasks">
+	<import file="build-common.xml" />
+
+	<condition property="plugins.includes.path" value="">
+		<or>
+			<equals arg1="${plugins.includes}" arg2="" />
+			<not>
+				<isset property="plugins.includes" />
+			</not>
+		</or>
+	</condition>
+
+	<path id="plugins.includes.path">
+		<dirset dir="apps/content-targeting" excludes="${plugins.excludes}" includes="${plugins.includes}" />
+		<dirset dir="hooks" excludes="${plugins.excludes}" includes="${plugins.includes}" />
+		<dirset dir="layouttpl" excludes="${plugins.excludes}" includes="${plugins.includes}" />
+		<dirset dir="portlets" excludes="${plugins.excludes}" includes="${plugins.includes}" />
+		<dirset dir="shared" excludes="${plugins.excludes}" includes="${plugins.includes}" />
+		<dirset dir="themes" excludes="${plugins.excludes}" includes="${plugins.includes}" />
+		<dirset dir="webs" excludes="${plugins.excludes}" includes="${plugins.includes}" />
+	</path>
+
+	<pathconvert pathsep="," property="plugins.includes.path" refid="plugins.includes.path" targetos="unix" />
+
+	<target name="all">
+		<antcall target="clean" />
+		<antcall target="deploy" />
+	</target>
+
+	<target name="build-service">
+		<ant dir="hooks" target="build-service" inheritAll="false" />
+		<ant dir="portlets" target="build-service" inheritAll="false" />
+		<ant dir="webs" target="build-service" inheritAll="false" />
+	</target>
+
+	<target name="build-summary">
+		<exec executable="git" outputproperty="git.branch">
+			<arg line="rev-parse --abbrev-ref HEAD"/>
+		</exec>
+
+		<if>
+			<or>
+				<equals arg1="${git.branch}" arg2="master" />
+				<matches pattern="ee-.*x$" string="${git.branch}" />
+			</or>
+			<then>
+				<delete>
+					<fileset dir="." includes="**/liferay-releng.changelog" />
+					<fileset dir="." includes="**/liferay-releng.changelog.md5" />
+				</delete>
+
+				<copy todir="${sdk.dir}" overwrite="true">
+					<fileset dir="${release.plugins.dir}">
+						<include name="**/liferay-plugin-package.properties" />
+					</fileset>
+				</copy>
+			</then>
+			<else>
+				<java
+					classname="com.liferay.portal.tools.PluginsSummaryBuilder"
+					classpathref="portal.classpath"
+					fork="true"
+					newenvironment="true"
+				>
+					<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+					<jvmarg value="-Dplugins.dir=${sdk.dir}" />
+				</java>
+
+				<java
+					classname="com.liferay.portal.tools.XSLTBuilder"
+					classpathref="portal.classpath"
+					fork="true"
+					newenvironment="true"
+				>
+					<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+					<arg value="${sdk.dir}/summary.xml" />
+					<arg value="${sdk.dir}/summary.xsl" />
+					<arg value="${sdk.dir}/summary.html" />
+				</java>
+			</else>
+		</if>
+	</target>
+
+	<target name="ear">
+		<delete dir="dist/liferay-portal.ear" />
+		<delete dir="dist/modules" />
+
+		<copy todir="dist" overwrite="yes">
+			<fileset
+				dir="${sdk.dir}/tools/templates/ear_tmpl"
+			/>
+		</copy>
+
+		<copy todir="dist/modules/APP-INF/lib">
+			<fileset dir="${app.server.lib.global.dir}">
+				<include name="*.jar" />
+			</fileset>
+		</copy>
+
+		<fileset dir="dist/modules" id="ear.dependency.libraries">
+			<include name="APP-INF/lib/*.jar" />
+		</fileset>
+
+		<pathconvert pathsep=" " property="ear.dependency.libraries.converted" refid="ear.dependency.libraries">
+			<mapper>
+				<chainedmapper>
+					<flattenmapper />
+					<globmapper from="*.jar" to="APP-INF/lib/*.jar" />
+				</chainedmapper>
+			</mapper>
+		</pathconvert>
+
+		<war
+			basedir="${app.server.portal.dir}"
+			destfile="dist/modules/liferay-portal.war"
+		>
+			<manifest>
+				<attribute name="Class-Path" value="${ear.dependency.libraries.converted}" />
+			</manifest>
+		</war>
+
+		<for param="module.full.path">
+			<path>
+				<dirset
+					dir="${app.server.deploy.dir}"
+					excludes="${plugins.ear.excludes}"
+					includes="${plugins.ear.includes}"
+				/>
+			</path>
+			<sequential>
+				<antelope:stringutil string="@{module.full.path}" property="module.full.path.unix">
+					<antelope:replace regex="\\" replacement="/" />
+				</antelope:stringutil>
+
+				<antelope:grep in="${module.full.path.unix}" regex="(.*/)(.*)" group="2" property="module.name" />
+
+				<war
+					basedir="@{module.full.path}"
+					destfile="dist/modules/${module.name}.war"
+				/>
+			</sequential>
+		</for>
+
+		<fileset dir="dist/modules" id="ear.modules">
+			<include name="*.war" />
+		</fileset>
+
+		<pathconvert pathsep="," property="ear.modules.converted" refid="ear.modules">
+			<mapper>
+				<chainedmapper>
+					<flattenmapper />
+				</chainedmapper>
+			</mapper>
+		</pathconvert>
+
+		<java
+			classname="com.liferay.portal.tools.EARBuilder"
+			classpathref="portal.classpath"
+			fork="true"
+			newenvironment="true"
+		>
+			<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+			<arg value="${basedir}/dist/modules/META-INF/application.xml" />
+			<arg value="${ear.modules.converted}" />
+			<arg value="${plugins.ear.portal.context.path}" />
+		</java>
+
+		<ear
+			appxml="dist/modules/META-INF/application.xml"
+			basedir="dist/modules"
+			destfile="dist/liferay-portal.ear"
+			excludes="META-INF/application.xml"
+			includes="**/*.jar,*.war,META-INF/*.xml"
+		/>
+
+		<delete dir="dist/modules" />
+	</target>
+
+	<target name="extract-plugins-sdk">
+		<mkdir dir="dist" />
+
+		<delete file="dist/liferay-plugins-sdk-${lp.version}.zip" />
+
+		<ant dir="webs/resources-importer-web" target="clean" inheritAll="false" />
+
+		<zip destfile="dist/liferay-plugins-sdk-${lp.version}.zip">
+			<zipfileset
+				dir="."
+				excludes="**/.gradle/**,**/build/**,**/gradle.properties,**/test.*.properties,*.iml,.bnd/**,.git/**,.ivy/**,build.*.properties,build.gradle,dependencies/**/ivy.xml.MD5,dependencies/**/lib/**,dist/**,ext/*-ext/**,gradle/**,gradlew*,hooks/*-hook/**,ivy.xml.MD5,layouttpl/*-layouttpl/**,lib/**,portlets/*-portlet/**,private-plugins.txt,settings.gradle,shared/*-shared/**,source_formatter_*,suites/**,summary.*,themes/*-theme/**,tmp/**,tools/node-*/**,webs/*-web/**"
+				prefix="liferay-plugins-sdk-${lp.version}"
+			/>
+			<zipfileset
+				dir="."
+				excludes="**/releng/**"
+				includes="webs/resources-importer-web/**"
+				prefix="liferay-plugins-sdk-${lp.version}"
+			/>
+			<zipfileset
+				dir="."
+				includes="lib/ant-contrib.jar,lib/antelopetasks.jar,lib/bcpg-jdk16.jar,lib/bcprov-jdk16.jar"
+				prefix="liferay-plugins-sdk-${lp.version}"
+			/>
+		</zip>
+	</target>
+
+	<target name="format-javadoc">
+		<ant dir="hooks" target="format-javadoc" inheritAll="false" />
+		<ant dir="layouttpl" target="format-javadoc" inheritAll="false" />
+		<ant dir="portlets" target="format-javadoc" inheritAll="false" />
+		<ant dir="themes" target="format-javadoc" inheritAll="false" />
+		<ant dir="webs" target="format-javadoc" inheritAll="false" />
+	</target>
+
+	<target name="setup-eclipse">
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="clean"
+		/>
+
+		<loop-macrodef-or-target
+			module.dirs="${plugins.includes.path}"
+			target.name="compile"
+		/>
+
+		<ant dir="hooks" target="setup-eclipse" inheritAll="false" />
+		<ant dir="portlets" target="setup-eclipse" inheritAll="false" />
+		<ant dir="webs" target="setup-eclipse" inheritAll="false" />
+	</target>
+
+	<target name="zip-portal">
+		<if>
+			<not>
+				<equals arg1="${app.server.type}" arg2="tomcat" />
+			</not>
+			<then>
+				<fail>
+.
+
+This task only works when the property "app.server.type" is "tomcat". However,
+the outputted files will work in any supported application server.
+				</fail>
+			</then>
+		</if>
+
+		<tstamp>
+			<format property="tstamp.value" pattern="yyyyMMddkkmmssSSS" />
+		</tstamp>
+
+		<zip destfile="dist/liferay-portal-dependencies-${tstamp.value}.zip">
+			<zipfileset
+				dir="${app.server.lib.global.dir}"
+				prefix="liferay-portal-dependencies-${tstamp.value}"
+			/>
+		</zip>
+
+		<delete file="dist/liferay-portal-${lp.version}.war" failonerror="false" />
+
+		<zip
+			basedir="${app.server.portal.dir}"
+			destfile="dist/liferay-portal-${tstamp.value}.war"
+			excludes="html/js/editor/_fckeditor/**,html/js/editor/fckeditor/_samples/**"
+		/>
+
+		<copy todir="${tstamp.value}/WEB-INF/lib">
+			<fileset
+				dir="lib"
+				includes="ccpp.jar"
+			/>
+		</copy>
+
+		<zip
+			basedir="${tstamp.value}"
+			destfile="dist/liferay-portal-${tstamp.value}.war"
+			update="yes"
+		/>
+
+		<delete dir="${tstamp.value}" />
+	</target>
+</project>
\ No newline at end of file
diff --git a/ci.properties b/ci.properties
new file mode 100644
index 0000000..cc0681e
--- /dev/null
+++ b/ci.properties
@@ -0,0 +1 @@
+jira.project.keys=CLDSVCS,LEVP,LOOP,LPS,LRAMF,LRDCOM,LRDOCS,LRIS,LRQA,LRU,SOS,SYNC,ZOE
\ No newline at end of file
diff --git a/common.bnd b/common.bnd
new file mode 100644
index 0000000..9de5dff
--- /dev/null
+++ b/common.bnd
@@ -0,0 +1,13 @@
+Bundle-SymbolicName: ${plugin.name}
+Bundle-Vendor: ${release.info.vendor}
+Bundle-Version: ${release.info.version}.${plugin.version}
+Git-Descriptor: ${system-allow-fail;git describe --dirty --always}
+Git-SHA: ${system-allow-fail;git rev-list -1 HEAD}
+Javac-Compiler: ${javac.compiler}
+Javac-Debug: ${javac.debug}
+Javac-Deprecation: ${javac.deprecation}
+Javac-Encoding: ${javac.encoding}
+
+-donotcopy: (\.touch)
+-dsannotations: *
+-sources: false
\ No newline at end of file
diff --git a/copyright.txt b/copyright.txt
new file mode 100644
index 0000000..17ba5f3
--- /dev/null
+++ b/copyright.txt
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
\ No newline at end of file
diff --git a/dependencies/aQute.bnd/ivy.xml b/dependencies/aQute.bnd/ivy.xml
new file mode 100644
index 0000000..3df8050
--- /dev/null
+++ b/dependencies/aQute.bnd/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.aQute.bnd" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="biz.aQute.bnd" org="biz.aQute.bnd" rev="2.4.1" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/aQute.bnd/ivy.xml.MD5 b/dependencies/aQute.bnd/ivy.xml.MD5
new file mode 100644
index 0000000..42e4208
--- /dev/null
+++ b/dependencies/aQute.bnd/ivy.xml.MD5
@@ -0,0 +1 @@
+45b38289274e4397c600a212c5477afa
diff --git a/dependencies/aQute.bnd/lib/biz.aQute.bnd.jar b/dependencies/aQute.bnd/lib/biz.aQute.bnd.jar
new file mode 100644
index 0000000..b624953
Binary files /dev/null and b/dependencies/aQute.bnd/lib/biz.aQute.bnd.jar differ
diff --git a/dependencies/com.liferay.ant.bnd/ivy.xml b/dependencies/com.liferay.ant.bnd/ivy.xml
new file mode 100644
index 0000000..245112d
--- /dev/null
+++ b/dependencies/com.liferay.ant.bnd/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.com.liferay.ant.bnd" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="com.liferay.ant.bnd" org="com.liferay" rev="2.0.0" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/com.liferay.ant.bnd/ivy.xml.MD5 b/dependencies/com.liferay.ant.bnd/ivy.xml.MD5
new file mode 100644
index 0000000..b5ecd14
--- /dev/null
+++ b/dependencies/com.liferay.ant.bnd/ivy.xml.MD5
@@ -0,0 +1 @@
+605466165ccd54086efdcbde81396ccb
diff --git a/dependencies/com.liferay.ant.bnd/lib/ant-launcher.jar b/dependencies/com.liferay.ant.bnd/lib/ant-launcher.jar
new file mode 100644
index 0000000..97c2262
Binary files /dev/null and b/dependencies/com.liferay.ant.bnd/lib/ant-launcher.jar differ
diff --git a/dependencies/com.liferay.ant.bnd/lib/ant.jar b/dependencies/com.liferay.ant.bnd/lib/ant.jar
new file mode 100644
index 0000000..24641e7
Binary files /dev/null and b/dependencies/com.liferay.ant.bnd/lib/ant.jar differ
diff --git a/dependencies/com.liferay.ant.bnd/lib/biz.aQute.bnd.jar b/dependencies/com.liferay.ant.bnd/lib/biz.aQute.bnd.jar
new file mode 100644
index 0000000..b624953
Binary files /dev/null and b/dependencies/com.liferay.ant.bnd/lib/biz.aQute.bnd.jar differ
diff --git a/dependencies/com.liferay.ant.bnd/lib/com.liferay.ant.bnd.jar b/dependencies/com.liferay.ant.bnd/lib/com.liferay.ant.bnd.jar
new file mode 100644
index 0000000..cb91f1e
Binary files /dev/null and b/dependencies/com.liferay.ant.bnd/lib/com.liferay.ant.bnd.jar differ
diff --git a/dependencies/com.liferay.ant.mirrors.get/ivy.xml b/dependencies/com.liferay.ant.mirrors.get/ivy.xml
new file mode 100644
index 0000000..dfa7af5
--- /dev/null
+++ b/dependencies/com.liferay.ant.mirrors.get/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.com.liferay.ant.mirrors.get" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="com.liferay.ant.mirrors.get" org="com.liferay" rev="1.0.3" />
+	</dependencies>
+</ivy-module>
diff --git a/dependencies/com.liferay.ant.mirrors.get/ivy.xml.MD5 b/dependencies/com.liferay.ant.mirrors.get/ivy.xml.MD5
new file mode 100644
index 0000000..ba7c5c0
--- /dev/null
+++ b/dependencies/com.liferay.ant.mirrors.get/ivy.xml.MD5
@@ -0,0 +1 @@
+0ffa7525c54ac6279b4bab37db8be270
diff --git a/dependencies/com.liferay.ant.mirrors.get/lib/com.liferay.ant.mirrors.get.jar b/dependencies/com.liferay.ant.mirrors.get/lib/com.liferay.ant.mirrors.get.jar
new file mode 100644
index 0000000..2a1c272
Binary files /dev/null and b/dependencies/com.liferay.ant.mirrors.get/lib/com.liferay.ant.mirrors.get.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/ivy.xml b/dependencies/com.liferay.jasper.jspc/ivy.xml
new file mode 100644
index 0000000..6493346
--- /dev/null
+++ b/dependencies/com.liferay.jasper.jspc/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.com.liferay.jasper.jspc" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="com.liferay.jasper.jspc" org="com.liferay" rev="1.0.4" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5 b/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5
new file mode 100644
index 0000000..07710c1
--- /dev/null
+++ b/dependencies/com.liferay.jasper.jspc/ivy.xml.MD5
@@ -0,0 +1 @@
+413efe1107bf241590e56459721708af
diff --git a/dependencies/com.liferay.jasper.jspc/lib/com.liferay.jasper.jspc.jar b/dependencies/com.liferay.jasper.jspc/lib/com.liferay.jasper.jspc.jar
new file mode 100644
index 0000000..4c0f045
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/com.liferay.jasper.jspc.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/ecj.jar b/dependencies/com.liferay.jasper.jspc/lib/ecj.jar
new file mode 100644
index 0000000..0f9a1da
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/ecj.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/jsp-api.jar b/dependencies/com.liferay.jasper.jspc/lib/jsp-api.jar
new file mode 100644
index 0000000..c0195af
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/jsp-api.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/jstl-api.jar b/dependencies/com.liferay.jasper.jspc/lib/jstl-api.jar
new file mode 100644
index 0000000..30d4d92
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/jstl-api.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/jstl.jar b/dependencies/com.liferay.jasper.jspc/lib/jstl.jar
new file mode 100644
index 0000000..0fd275e
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/jstl.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/servlet-api.jar b/dependencies/com.liferay.jasper.jspc/lib/servlet-api.jar
new file mode 100644
index 0000000..fb52493
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/servlet-api.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-api.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-api.jar
new file mode 100644
index 0000000..da0f0bb
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-api.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-el-api.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-el-api.jar
new file mode 100644
index 0000000..8696056
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-el-api.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-jasper-el.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-jasper-el.jar
new file mode 100644
index 0000000..8823666
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-jasper-el.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-jasper.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-jasper.jar
new file mode 100644
index 0000000..971c057
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-jasper.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-jsp-api.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-jsp-api.jar
new file mode 100644
index 0000000..8642a47
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-jsp-api.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-juli.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-juli.jar
new file mode 100644
index 0000000..3a6755b
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-juli.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-servlet-api.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-servlet-api.jar
new file mode 100644
index 0000000..5048dbb
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-servlet-api.jar differ
diff --git a/dependencies/com.liferay.jasper.jspc/lib/tomcat-util.jar b/dependencies/com.liferay.jasper.jspc/lib/tomcat-util.jar
new file mode 100644
index 0000000..7dfb6c9
Binary files /dev/null and b/dependencies/com.liferay.jasper.jspc/lib/tomcat-util.jar differ
diff --git a/dependencies/net.sourceforge.pmd/ivy.xml b/dependencies/net.sourceforge.pmd/ivy.xml
new file mode 100644
index 0000000..e62113b
--- /dev/null
+++ b/dependencies/net.sourceforge.pmd/ivy.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.org.sourceforge.pmd" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="com.liferay.pmd" org="com.liferay" rev="1.0.1" />
+		<dependency name="pmd-java" org="net.sourceforge.pmd" rev="5.2.3" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/net.sourceforge.pmd/ivy.xml.MD5 b/dependencies/net.sourceforge.pmd/ivy.xml.MD5
new file mode 100644
index 0000000..aa76dfa
--- /dev/null
+++ b/dependencies/net.sourceforge.pmd/ivy.xml.MD5
@@ -0,0 +1 @@
+8bf302b4c3d37005e0f46a0be4d0e69c
diff --git a/dependencies/net.sourceforge.pmd/lib/asm.jar b/dependencies/net.sourceforge.pmd/lib/asm.jar
new file mode 100644
index 0000000..573535b
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/asm.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/com.liferay.pmd.jar b/dependencies/net.sourceforge.pmd/lib/com.liferay.pmd.jar
new file mode 100644
index 0000000..f375fab
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/com.liferay.pmd.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/commons-io.jar b/dependencies/net.sourceforge.pmd/lib/commons-io.jar
new file mode 100644
index 0000000..90035a4
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/commons-io.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/commons-lang3.jar b/dependencies/net.sourceforge.pmd/lib/commons-lang3.jar
new file mode 100644
index 0000000..2ce08ae
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/commons-lang3.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/javacc.jar b/dependencies/net.sourceforge.pmd/lib/javacc.jar
new file mode 100644
index 0000000..2550727
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/javacc.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/jaxen.jar b/dependencies/net.sourceforge.pmd/lib/jaxen.jar
new file mode 100644
index 0000000..c201609
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/jaxen.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/jcommander.jar b/dependencies/net.sourceforge.pmd/lib/jcommander.jar
new file mode 100644
index 0000000..e86b47b
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/jcommander.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/pmd-core.jar b/dependencies/net.sourceforge.pmd/lib/pmd-core.jar
new file mode 100644
index 0000000..ab0d3a3
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/pmd-core.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/pmd-java.jar b/dependencies/net.sourceforge.pmd/lib/pmd-java.jar
new file mode 100644
index 0000000..9d2501c
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/pmd-java.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/saxon.jar b/dependencies/net.sourceforge.pmd/lib/saxon.jar
new file mode 100644
index 0000000..6ded01e
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/saxon.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/xercesImpl.jar b/dependencies/net.sourceforge.pmd/lib/xercesImpl.jar
new file mode 100644
index 0000000..0aaa990
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/xercesImpl.jar differ
diff --git a/dependencies/net.sourceforge.pmd/lib/xml-apis.jar b/dependencies/net.sourceforge.pmd/lib/xml-apis.jar
new file mode 100644
index 0000000..4673346
Binary files /dev/null and b/dependencies/net.sourceforge.pmd/lib/xml-apis.jar differ
diff --git a/dependencies/net.sourceforge.pmd/rulesets/java/standard-rules.xml b/dependencies/net.sourceforge.pmd/rulesets/java/standard-rules.xml
new file mode 100644
index 0000000..e7e433e
--- /dev/null
+++ b/dependencies/net.sourceforge.pmd/rulesets/java/standard-rules.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+
+<ruleset
+	name="Liferay rules"
+	xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
+>
+	<description>
+		Selected standard rules from PMD out of box rule sets. Please refer to the origin rule set file, rule name and version info for future update.
+	</description>
+	<rule
+		class="com.liferay.pmd.rules.junit.AssertFailJUnitRule"
+		language="java"
+		message="Do not call Assert#fail improperly."
+		name="AssertFailJUnitRule"
+		since="0.1">
+		<description>
+			Detect when Assert#fail is called improperly.
+		</description>
+		<priority>3</priority>
+		<example>
+			<![CDATA[
+
+@Test
+public void test() {
+	try {
+
+		// ...
+
+	}
+	catch (Exception e) {
+		Assert.fail();
+	}
+}
+			]]>
+		</example>
+		<example>
+			<![CDATA[
+
+@Test
+public void test() {
+	Assert.fail();
+}
+
+			]]>
+		</example>
+	</rule>
+	<rule
+		class="net.sourceforge.pmd.lang.java.rule.basic.BooleanInstantiationRule"
+		externalInfoUrl="http://pmd.sourceforge.net/snapshot/pmd-java/rules/java/basic.html#BooleanInstantiation"
+		message="Avoid instantiating Boolean objects; reference Boolean.TRUE or Boolean.FALSE or call Boolean.valueOf() instead."
+		name="BooleanInstantiation"
+		since="1.2"
+	>
+		<description>
+			[Origin rule set file rulesets/java/basic.xml] Avoid instantiating Boolean objects; you can reference Boolean.TRUE, Boolean.FALSE, or call Boolean.valueOf() instead.
+		</description>
+		<priority>2</priority>
+		<example>
+			<![CDATA[
+
+// Poor, unnecessary creation, just reference Boolean.TRUE
+
+new Boolean("true");
+
+// Poor, unnecessary creation, just reference Boolean.FALSE
+
+Boolean.valueOf(false);
+			]]>
+		</example>
+	</rule>
+	<rule
+		class="com.liferay.pmd.rules.java.OverrideBothEqualsAndHashcodeRule"
+		externalInfoUrl="http://pmd.sourceforge.net/snapshot/pmd-java/rules/java/basic.html#OverrideBothEqualsAndHashcode"
+		language="java"
+		message="Ensure you override both equals() and hashCode()"
+		name="OverrideBothEqualsAndHashcode"
+		since="0.4"
+	>
+		<description>
+			[Origin rule set file rulesets/java/basic.xml] Override both public boolean Object.equals(Object other), and public int Object.hashCode(), or override neither. Even if you are inheriting a hashCode() from a parent class, consider implementing hashCode and explicitly delegating to your superclass.
+		</description>
+		<priority>3</priority>
+		<example>
+			<![CDATA[
+
+// Poor, missing a hashcode() method
+
+public class Bar {
+
+	public boolean equals(Object object) {
+		return true;
+	}
+
+}
+
+// Poor, missing an equals() method
+
+public class Baz {
+
+	public int hashCode() {
+		return 0;
+	}
+
+}
+
+// Perfect, both methods are provided
+
+public class Foo {
+
+	public boolean equals(Object object) {
+		return true;
+	}
+
+	public int hashCode() {
+		return 0;
+	}
+
+}
+			]]>
+		</example>
+	</rule>
+	<rule
+		class="net.sourceforge.pmd.lang.java.rule.unnecessary.UnnecessaryReturnRule"
+		externalInfoUrl="http://pmd.sourceforge.net/snapshot/pmd-java/rules/java/unnecessary.html#UnnecessaryReturn"
+		message="Avoid unnecessary return statements"
+		name="UnnecessaryReturn"
+		since="1.3"
+	>
+		<description>
+			[Origin rule set file rulesets/java/unnecessary.xml] Avoid the use of unnecessary return statements.
+		</description>
+		<priority>3</priority>
+		<example>
+			<![CDATA[
+public class Foo {
+
+	public void bar() {
+		int x = 42;
+
+		return;
+	}
+
+}
+			]]>
+		</example>
+	</rule>
+	<rule
+		class="net.sourceforge.pmd.lang.java.rule.unnecessary.UselessOperationOnImmutableRule"
+		externalInfoUrl="http://pmd.sourceforge.net/snapshot/pmd-java/rules/java/unnecessary.html#UselessOperationOnImmutable"
+		message="An operation on an Immutable object (String, BigDecimal or BigInteger) won't change the object itself"
+		name="UselessOperationOnImmutable"
+		since="3.5">
+		<description>
+			[Origin rule set file rulesets/java/unnecessary.xml] An operation on an Immutable object (String, BigDecimal or BigInteger) won't change the object itself since the result of the operation is a new object. Therefore, ignoring the operation result is an error.
+		</description>
+		<priority>3</priority>
+		<example>
+			<![CDATA[
+
+BigDecimal bigDecimal = new BigDecimal(10);
+
+// Poor, useless operation
+
+bigDecimal.add(new BigDecimal(5));
+
+// Perfect, useful operation
+
+bigDecimal = bigDecimal.add(new BigDecimal(5));
+			]]>
+		</example>
+	</rule>
+	<rule
+		class="net.sourceforge.pmd.lang.java.rule.unusedcode.UnusedLocalVariableRule"
+		externalInfoUrl="http://pmd.sourceforge.net/pmd-5.2.3/pmd-java/rules/java/unusedcode.html#UnusedLocalVariable"
+		language="java"
+		message="Avoid unused local variables such as ''{0}''."
+		name="UnusedLocalVariable"
+		since="0.1">
+		<description>
+			[Origin rule set file rulesets/java/unusedcode.xml] Detects when a local variable is declared and/or assigned, but not used.
+		</description>
+		<priority>3</priority>
+		<example>
+			<![CDATA[
+public class Foo {
+
+	public void doSomething() {
+
+		// Poor, unused local variable
+
+		int i = 5;
+	}
+
+}
+			]]>
+		</example>
+	</rule>
+</ruleset>
\ No newline at end of file
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml b/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml
new file mode 100644
index 0000000..04406da
--- /dev/null
+++ b/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="org.apache.maven.maven.ant.tasks" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="maven-ant-tasks" org="org.apache.maven" rev="2.1.3" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5 b/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5
new file mode 100644
index 0000000..eac6c7a
--- /dev/null
+++ b/dependencies/org.apache.maven.maven.ant.tasks/ivy.xml.MD5
@@ -0,0 +1 @@
+2aae42c5c43b993944b8c0fe9e31d5fb
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/ant-launcher.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/ant-launcher.jar
new file mode 100644
index 0000000..08ec632
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/ant-launcher.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/ant.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/ant.jar
new file mode 100644
index 0000000..85292f0
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/ant.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/backport-util-concurrent.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/backport-util-concurrent.jar
new file mode 100644
index 0000000..3a4c279
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/backport-util-concurrent.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/classworlds.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/classworlds.jar
new file mode 100644
index 0000000..1208b48
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/classworlds.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-ant-tasks.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-ant-tasks.jar
new file mode 100644
index 0000000..bec446f
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-ant-tasks.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-artifact-manager.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-artifact-manager.jar
new file mode 100644
index 0000000..181bc39
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-artifact-manager.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-artifact.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-artifact.jar
new file mode 100644
index 0000000..abab479
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-artifact.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-error-diagnostics.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-error-diagnostics.jar
new file mode 100644
index 0000000..9daada2
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-error-diagnostics.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-model.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-model.jar
new file mode 100644
index 0000000..73175f8
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-model.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-plugin-registry.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-plugin-registry.jar
new file mode 100644
index 0000000..1b87d9a
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-plugin-registry.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-profile.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-profile.jar
new file mode 100644
index 0000000..5394d32
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-profile.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-project.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-project.jar
new file mode 100644
index 0000000..63b9ebd
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-project.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-repository-metadata.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-repository-metadata.jar
new file mode 100644
index 0000000..5b4f494
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-repository-metadata.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-settings.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-settings.jar
new file mode 100644
index 0000000..edef547
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/maven-settings.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/nekohtml.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/nekohtml.jar
new file mode 100644
index 0000000..716901e
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/nekohtml.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-container-default.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-container-default.jar
new file mode 100644
index 0000000..d205236
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-container-default.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-interpolation.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-interpolation.jar
new file mode 100644
index 0000000..c937688
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-interpolation.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-utils.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-utils.jar
new file mode 100644
index 0000000..8149689
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/plexus-utils.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-file.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-file.jar
new file mode 100644
index 0000000..39da9ec
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-file.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-http-lightweight.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-http-lightweight.jar
new file mode 100644
index 0000000..845bef0
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-http-lightweight.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-http-shared.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-http-shared.jar
new file mode 100644
index 0000000..08a96a5
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-http-shared.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-provider-api.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-provider-api.jar
new file mode 100644
index 0000000..246548d
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/wagon-provider-api.jar differ
diff --git a/dependencies/org.apache.maven.maven.ant.tasks/lib/xercesMinimal.jar b/dependencies/org.apache.maven.maven.ant.tasks/lib/xercesMinimal.jar
new file mode 100644
index 0000000..649a66b
Binary files /dev/null and b/dependencies/org.apache.maven.maven.ant.tasks/lib/xercesMinimal.jar differ
diff --git a/dependencies/org.codehaus.groovy/ivy.xml b/dependencies/org.codehaus.groovy/ivy.xml
new file mode 100644
index 0000000..6b9a32e
--- /dev/null
+++ b/dependencies/org.codehaus.groovy/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.org.codehaus.groovy" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="groovy-all" org="org.codehaus.groovy" rev="2.0.1" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/org.codehaus.groovy/ivy.xml.MD5 b/dependencies/org.codehaus.groovy/ivy.xml.MD5
new file mode 100644
index 0000000..3c011cc
--- /dev/null
+++ b/dependencies/org.codehaus.groovy/ivy.xml.MD5
@@ -0,0 +1 @@
+e1a7d560dfc36faf61c7d7da67bb03df
diff --git a/dependencies/org.codehaus.groovy/lib/groovy-all.jar b/dependencies/org.codehaus.groovy/lib/groovy-all.jar
new file mode 100644
index 0000000..aad4185
Binary files /dev/null and b/dependencies/org.codehaus.groovy/lib/groovy-all.jar differ
diff --git a/dependencies/org.freemarker/ivy.xml b/dependencies/org.freemarker/ivy.xml
new file mode 100644
index 0000000..72f3620
--- /dev/null
+++ b/dependencies/org.freemarker/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.org.freemarker" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="org.freemarker" org="com.liferay" rev="2.3.17.LIFERAY-PATCHED-1" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/org.freemarker/ivy.xml.MD5 b/dependencies/org.freemarker/ivy.xml.MD5
new file mode 100644
index 0000000..5dff026
--- /dev/null
+++ b/dependencies/org.freemarker/ivy.xml.MD5
@@ -0,0 +1 @@
+f6d028f89713fdbf3004b38da2b16dcf
diff --git a/dependencies/org.freemarker/lib/org.freemarker.jar b/dependencies/org.freemarker/lib/org.freemarker.jar
new file mode 100644
index 0000000..74c16fd
Binary files /dev/null and b/dependencies/org.freemarker/lib/org.freemarker.jar differ
diff --git a/dependencies/org.sonar.ant/ivy.xml b/dependencies/org.sonar.ant/ivy.xml
new file mode 100644
index 0000000..40722ed
--- /dev/null
+++ b/dependencies/org.sonar.ant/ivy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk.dependencies.org.sonar.ant" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="sonar-ant-task" org="org.codehaus.sonar-plugins" rev="2.2"/>
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/dependencies/org.sonar.ant/ivy.xml.MD5 b/dependencies/org.sonar.ant/ivy.xml.MD5
new file mode 100644
index 0000000..6d91380
--- /dev/null
+++ b/dependencies/org.sonar.ant/ivy.xml.MD5
@@ -0,0 +1 @@
+3325db6f628a33488c6c832368b134e4
diff --git a/dependencies/org.sonar.ant/lib/sonar-ant-task.jar b/dependencies/org.sonar.ant/lib/sonar-ant-task.jar
new file mode 100644
index 0000000..125e86c
Binary files /dev/null and b/dependencies/org.sonar.ant/lib/sonar-ant-task.jar differ
diff --git a/ext/build-common-ext.xml b/ext/build-common-ext.xml
new file mode 100644
index 0000000..6d0fc06
--- /dev/null
+++ b/ext/build-common-ext.xml
@@ -0,0 +1,348 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-ext">
+	<import file="../build-common-plugin.xml" />
+
+	<target name="build-db">
+		<echo>
+.
+
+WARNING: Support for ServiceBuilder in EXT plugins will be deprecated in future
+versions. EXT plugins are designed to override the portal's core code that
+cannot be done with hooks, layout templates, portlets, or themes. EXT plugins
+are not meant to contain new custom services. Please migrate your service.xml to
+a portlet plugin.
+		</echo>
+
+		<antcall target="build-common-plugin.build-db" />
+	</target>
+
+	<target name="build-service">
+		<path id="service.classpath">
+			<path refid="lib.classpath" />
+			<path refid="portal.classpath" />
+			<fileset dir="${app.server.lib.portal.dir}" includes="commons-digester.jar,commons-lang.jar,easyconf.jar" />
+			<!--<fileset dir="docroot/WEB-INF/lib" includes="*.jar" />
+			<pathelement location="docroot/WEB-INF/classes" />-->
+		</path>
+
+		<echo>
+.
+
+WARNING: Support for ServiceBuilder in EXT plugins will be deprecated in future
+versions. EXT plugins are designed to override the portal's core code that
+cannot be done with hooks, layout templates, portlets, or themes. EXT plugins
+are not meant to contain new custom services. Please migrate your service.xml to
+a portlet plugin.
+		</echo>
+
+		<java
+			classname="com.liferay.portal.tools.servicebuilder.ServiceBuilder"
+			classpathref="service.classpath"
+		>
+			<arg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+			<arg value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger" />
+			<arg value="service.input.file=${service.file}" />
+			<arg value="service.hbm.file=${basedir}/docroot/WEB-INF/ext-impl/src/META-INF/ext-hbm.xml" />
+			<arg value="service.orm.file=${basedir}/docroot/WEB-INF/ext-impl/src/META-INF/ext-orm.xml" />
+			<arg value="service.model.hints.file=${basedir}/docroot/WEB-INF/ext-impl/src/META-INF/ext-model-hints.xml" />
+			<arg value="service.spring.file=${basedir}/docroot/WEB-INF/ext-impl/src/META-INF/ext-spring.xml" />
+			<arg value="service.api.dir=${basedir}/docroot/WEB-INF/ext-service/src" />
+			<arg value="service.impl.dir=${basedir}/docroot/WEB-INF/ext-impl/src" />
+			<arg value="service.remoting.file=${basedir}/docroot/WEB-INF/ext-web/docroot/WEB-INF/remoting-servlet-ext.xml" />
+			<arg value="service.sql.dir=${basedir}/docroot/WEB-INF/sql" />
+			<arg value="service.sql.file=portal-tables.sql" />
+			<arg value="service.sql.indexes.file=indexes.sql" />
+			<arg value="service.sql.indexes.properties.file=indexes.properties" />
+			<arg value="service.sql.sequences.file=sequences.sql" />
+			<arg value="service.bean.locator.util=com.liferay.portal.kernel.bean.PortalBeanLocatorUtil" />
+			<arg value="service.props.util=com.liferay.portal.util.PropsUtil" />
+		</java>
+
+		<delete file="ServiceBuilder.temp" />
+	</target>
+
+	<target name="check-ext-property">
+		<if>
+			<not>
+				<available file="${property.name}" />
+			</not>
+			<then>
+				<fail>
+.
+
+${property.name} does not exist!
+
+The properties "app.server.dir", "app.server.zip.name", and "ext.work.dir" are
+not properly specified.
+
+The directory denoted by the property "ext.work.dir" will be deleted and the zip
+file denoted by the property "app.server.zip.name" will be unzipped into this
+directory. The property "app.server.dir" must point to the application server
+directory that was unzipped into "ext.work.dir".
+
+For example, if "ext.work.dir" points to "C:\ext-work", and
+"app.server.zip.name" points to "C:\files\liferay-portal-tomcat-6.0-${lp.version}.zip",
+then "app.server.dir" should point to
+"C:\ext-work\liferay-portal-${lp.version}\tomcat-6.0.18".
+				</fail>
+			</then>
+		</if>
+	</target>
+
+	<target name="clean">
+		<delete includeemptydirs="true">
+			<fileset dir="docroot/WEB-INF" includes="ext-*/classes/**,ext-*/ext-*.jar" />
+		</delete>
+
+		<delete file="${plugin.file}" />
+	</target>
+
+	<target name="clean-app-server">
+		<antcall target="check-ext-property">
+			<param name="property.name" value="${app.server.zip.name}" />
+		</antcall>
+
+		<antcall target="check-ext-property">
+			<param name="property.name" value="${ext.work.dir}" />
+		</antcall>
+
+		<antcall target="clean" />
+
+		<delete dir="${app.server.dir}" />
+
+		<unzip src="${app.server.zip.name}" dest="${ext.work.dir}" />
+	</target>
+
+	<target name="compile">
+		<antcall target="compile-with-global-class-loader">
+			<param name="module.name" value="service" />
+		</antcall>
+
+		<antcall target="compile-with-portal-class-loader">
+			<param name="module.class.path" value="docroot/WEB-INF/ext-service/classes" />
+			<param name="module.name" value="util-bridges" />
+		</antcall>
+
+		<antcall target="compile-with-portal-class-loader">
+			<param name="module.class.path" value="docroot/WEB-INF/ext-service/classes;docroot/WEB-INF/ext-util-bridges/classes" />
+			<param name="module.name" value="util-java" />
+		</antcall>
+
+		<antcall target="compile-with-portal-class-loader">
+			<param name="module.class.path" value="docroot/WEB-INF/ext-service/classes;docroot/WEB-INF/ext-util-bridges/classes;docroot/WEB-INF/ext-util-java/classes" />
+			<param name="module.name" value="util-taglib" />
+		</antcall>
+
+		<antcall target="compile-with-portal-class-loader">
+			<param name="module.class.path" value="docroot/WEB-INF/ext-service/classes;docroot/WEB-INF/ext-util-bridges/classes;docroot/WEB-INF/ext-util-java/classes;docroot/WEB-INF/ext-util-taglib/classes" />
+			<param name="module.name" value="impl" />
+		</antcall>
+
+		<delete>
+			<fileset dir="docroot/WEB-INF/ext-impl/classes" includes="portal-*.properties,system-*.properties" />
+		</delete>
+
+		<if>
+			<available file="docroot/WEB-INF/ext-web/docroot/WEB-INF/lib" />
+			<then>
+						<fail>
+.
+
+"docroot\WEB-INF\ext-web\docroot\WEB-INF\lib" must not exist. Put JAR files in
+"docroot\WEB-INF\ext-lib\portal" that need to be accessible to the portal class
+loader.
+						</fail>
+			</then>
+		</if>
+	</target>
+
+	<target name="compile-with-global-class-loader">
+		<mkdir dir="docroot/WEB-INF/ext-lib/global" />
+		<mkdir dir="docroot/WEB-INF/ext-${module.name}/classes" />
+
+		<if>
+			<available file="docroot/WEB-INF/ext-${module.name}/src" />
+			<then>
+				<path id="plugin-lib.classpath">
+					<fileset dir="docroot/WEB-INF/ext-lib/global" includes="*.jar" />
+					<pathelement location="docroot/WEB-INF/ext-${module.name}/classes" />
+				</path>
+
+				<compile-java
+					javac.classpathref="plugin.classpath"
+					javac.destdir="docroot/WEB-INF/ext-${module.name}/classes"
+					javac.srcdir="docroot/WEB-INF/ext-${module.name}/src"
+				/>
+			</then>
+		</if>
+	</target>
+
+	<target name="compile-with-portal-class-loader">
+		<mkdir dir="docroot/WEB-INF/ext-lib/global" />
+		<mkdir dir="docroot/WEB-INF/ext-lib/portal" />
+		<mkdir dir="docroot/WEB-INF/ext-${module.name}/classes" />
+		<mkdir dir="docroot/WEB-INF/ext-${module.name}/src" />
+
+		<path id="plugin-lib.classpath">
+			<fileset dir="docroot/WEB-INF/ext-lib/global" includes="*.jar" />
+			<fileset dir="docroot/WEB-INF/ext-lib/portal" includes="*.jar" />
+			<pathelement path="${module.class.path}" />
+			<fileset dir="${app.server.lib.portal.dir}" includes="*.jar" />
+		</path>
+
+		<compile-java
+			javac.classpathref="plugin.classpath"
+			javac.destdir="docroot/WEB-INF/ext-${module.name}/classes"
+			javac.srcdir="docroot/WEB-INF/ext-${module.name}/src"
+		/>
+	</target>
+
+	<target name="deploy-properties">
+		<copy todir="${app.server.classes.portal.dir}" overwrite="true">
+			<fileset dir="docroot/WEB-INF/ext-impl/src" includes="portal-*.properties,system-*.properties" />
+		</copy>
+	</target>
+
+	<target name="direct-deploy" depends="war">
+		<copy todir="${app.server.lib.global.dir}" overwrite="true">
+			<fileset dir="docroot/WEB-INF/ext-lib/global" includes="*.jar" />
+		</copy>
+
+		<copy
+			file="docroot/WEB-INF/ext-service/ext-service.jar"
+			tofile="${app.server.lib.global.dir}/ext-${plugin.name}-service.jar"
+			overwrite="true"
+		/>
+
+		<copy todir="${app.server.lib.portal.dir}" overwrite="true">
+			<fileset dir="docroot/WEB-INF/ext-lib/portal" includes="*.jar" />
+		</copy>
+
+		<copy
+			file="docroot/WEB-INF/ext-impl/ext-impl.jar"
+			tofile="${app.server.lib.portal.dir}/ext-${plugin.name}-impl.jar"
+			overwrite="true"
+		/>
+
+		<copy
+			file="docroot/WEB-INF/ext-util-bridges/ext-util-bridges.jar"
+			tofile="${app.server.lib.portal.dir}/ext-${plugin.name}-util-bridges.jar"
+			overwrite="true"
+		/>
+
+		<copy
+			file="docroot/WEB-INF/ext-util-java/ext-util-java.jar"
+			tofile="${app.server.lib.portal.dir}/ext-${plugin.name}-util-java.jar"
+			overwrite="true"
+		/>
+
+		<copy
+			file="docroot/WEB-INF/ext-util-taglib/ext-util-taglib.jar"
+			tofile="${app.server.lib.portal.dir}/ext-${plugin.name}-util-taglib.jar"
+			overwrite="true"
+		/>
+
+		<if>
+			<available file="docroot/WEB-INF/ext-web/docroot" />
+			<then>
+				<copy todir="${app.server.portal.dir}" overwrite="true">
+					<fileset dir="docroot/WEB-INF/ext-web/docroot" excludes="WEB-INF/web.xml" />
+				</copy>
+			</then>
+		</if>
+
+		<if>
+			<available file="docroot/WEB-INF/ext-web/docroot/WEB-INF/web.xml" />
+			<then>
+				<java
+					classname="com.liferay.portal.tools.WebXMLBuilder"
+					classpathref="portal.classpath"
+					fork="true"
+					newenvironment="true"
+				>
+					<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
+					<arg value="${app.server.portal.dir}/WEB-INF/web.xml" />
+					<arg value="docroot/WEB-INF/ext-web/docroot/WEB-INF/web.xml" />
+					<arg value="${app.server.portal.dir}/WEB-INF/web.xml.merged" />
+				</java>
+
+				<move file="${app.server.portal.dir}/WEB-INF/web.xml.merged" tofile="${app.server.portal.dir}/WEB-INF/web.xml" />
+			</then>
+		</if>
+
+		<unzip src="${plugin.file}" dest="${app.server.portal.dir}">
+			<patternset>
+				<include name="WEB-INF/ext-${plugin.name}.xml" />
+			</patternset>
+		</unzip>
+
+		<antcall target="deploy-properties" />
+	</target>
+
+	<target name="war" depends="compile">
+		<jar
+			basedir="docroot/WEB-INF/ext-service/classes"
+			destfile="docroot/WEB-INF/ext-service/ext-service.jar"
+		/>
+
+		<antcall target="war-util">
+			<param name="util.suffix" value="bridges" />
+		</antcall>
+
+		<antcall target="war-util">
+			<param name="util.suffix" value="java" />
+		</antcall>
+
+		<antcall target="war-util">
+			<param name="util.suffix" value="taglib" />
+		</antcall>
+
+		<jar
+			basedir="docroot/WEB-INF/ext-impl/classes"
+			destfile="docroot/WEB-INF/ext-impl/ext-impl.jar"
+			excludes="portal-*.properties,system-*.properties"
+		/>
+
+		<java
+			classname="com.liferay.portal.tools.ExtInfoBuilder"
+			classpathref="portal.classpath"
+			fork="true"
+			maxmemory="256m"
+			newenvironment="true"
+		>
+			<arg line="docroot/WEB-INF docroot/WEB-INF ${plugin.name}" />
+		</java>
+
+		<mkdir dir="${sdk.dir}/dist" />
+
+		<delete file="${plugin.file}" />
+
+		<zip destfile="${plugin.file}">
+			<zipfileset
+				dir="docroot"
+				excludes="build.xml,**/portal-*.properties,**/system-*.properties"
+			/>
+			<zipfileset
+				dir="docroot/WEB-INF/ext-impl/src"
+				includes="portal-*.properties,system-*.properties"
+				prefix="WEB-INF/ext-web/docroot/WEB-INF/classes"
+			/>
+		</zip>
+
+		<delete file="docroot/WEB-INF/ext-${plugin.name}.xml" />
+	</target>
+
+	<target name="war-util">
+		<jar
+			basedir="docroot/WEB-INF/ext-util-${util.suffix}/classes"
+			destfile="docroot/WEB-INF/ext-util-${util.suffix}/ext-util-${util.suffix}.jar"
+		/>
+
+		<copy
+			file="docroot/WEB-INF/ext-util-${util.suffix}/ext-util-${util.suffix}.jar"
+			tofile="docroot/WEB-INF/ext-impl/classes/com/liferay/portal/deploy/dependencies/ext-${plugin.name}-util-${util.suffix}.jar"
+		/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/ext/build.xml b/ext/build.xml
new file mode 100644
index 0000000..73e4ee3
--- /dev/null
+++ b/ext/build.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="ext" basedir="." default="deploy">
+	<import file="../build-common-plugins.xml" />
+
+	<target name="create">
+		<if>
+			<not>
+				<isset property="ext.name" />
+			</not>
+			<then>
+				<fail>This task must be called by the create script.</fail>
+			</then>
+		</if>
+
+		<property name="ext.parent.dir" value="${user.dir}" />
+		<property name="ext.plugin.dir" value="${ext.parent.dir}/${ext.name}-ext" />
+
+		<if>
+			<available file="${ext.plugin.dir}" />
+			<then>
+				<fail>${ext.name}-ext already exists.</fail>
+			</then>
+		</if>
+
+		<copy todir="${ext.plugin.dir}">
+			<fileset
+				dir="${sdk.dir}/tools/templates/ext_tmpl"
+			/>
+		</copy>
+
+		<mkdir dir="${ext.plugin.dir}/docroot/WEB-INF/ext-impl/src" />
+		<mkdir dir="${ext.plugin.dir}/docroot/WEB-INF/ext-lib/global" />
+		<mkdir dir="${ext.plugin.dir}/docroot/WEB-INF/ext-lib/portal" />
+		<mkdir dir="${ext.plugin.dir}/docroot/WEB-INF/ext-service/src" />
+		<mkdir dir="${ext.plugin.dir}/docroot/WEB-INF/ext-util-bridges/src" />
+		<mkdir dir="${ext.plugin.dir}/docroot/WEB-INF/ext-util-java/src" />
+		<mkdir dir="${ext.plugin.dir}/docroot/WEB-INF/ext-util-taglib/src" />
+
+		<replace dir="${ext.plugin.dir}">
+			<replacefilter token="@ext.display.name@" value="${ext.display.name}" />
+			<replacefilter token="@ext.name@" value="${ext.name}" />
+			<replacefilter token="@plugin.type.dir@" value="${plugin.type.dir}" />
+		</replace>
+	</target>
+
+	<target name="upgrade-ext">
+		<if>
+			<not>
+				<isset property="ext.name" />
+			</not>
+			<then>
+				<fail>
+.
+
+Usage: ant upgrade-ext -Dext.dir=C:\ext -Dext.name=hello-world -Dext.display.name="Hello World"
+
+The arguments "ext.dir", "ext.name", and "ext.display.name" are not properly
+specified.
+
+This task will build an EXT plugin from a legacy EXT environment. The files in
+the directory denoted by "ext.dir" will be copied into the EXT plugin directory
+called "ext.name"-ext. The property "ext.dir" must point to a legacy EXT
+environment and the EXT plugin directory called "ext-name"-ext must not already
+exist.
+				</fail>
+			</then>
+		</if>
+
+		<if>
+			<available file="${ext.name}-ext" />
+			<then>
+				<fail>${ext.name}-ext already exists.</fail>
+			</then>
+		</if>
+
+		<antcall target="create">
+			<param name="ext.display.name" value="${ext.display.name}" />
+			<param name="ext.name" value="${ext.name}" />
+		</antcall>
+
+		<copy todir="${ext.name}-ext/docroot/WEB-INF/ext-impl/src" failonerror="false">
+			<fileset dir="${ext.dir}/ext-impl/src" />
+		</copy>
+
+		<copy todir="${ext.name}-ext/docroot/WEB-INF/ext-lib/global" failonerror="false">
+			<fileset dir="${ext.dir}/ext-lib/global" />
+		</copy>
+
+		<copy todir="${ext.name}-ext/docroot/WEB-INF/ext-lib/portal" failonerror="false">
+			<fileset dir="${ext.dir}/ext-lib/portal" />
+		</copy>
+
+		<copy todir="${ext.name}-ext/docroot/WEB-INF/ext-service/src" failonerror="false">
+			<fileset dir="${ext.dir}/ext-service/src" />
+		</copy>
+
+		<copy todir="${ext.name}-ext/docroot/WEB-INF/ext-web/docroot" failonerror="false" overwrite="true">
+			<fileset
+				dir="${ext.dir}/ext-web/docroot"
+				excludes="**/struts-config.xml,**/tiles-defs.xml"
+			/>
+		</copy>
+
+		<copy
+			file="${ext.dir}/ext-web/docroot/WEB-INF/struts-config.xml"
+			tofile="${ext.name}-ext/docroot/WEB-INF/ext-web/docroot/WEB-INF/struts-config-ext.xml"
+		/>
+
+		<copy
+			file="${ext.dir}/ext-web/docroot/WEB-INF/tiles-defs.xml"
+			tofile="${ext.name}-ext/docroot/WEB-INF/ext-web/docroot/WEB-INF/tiles-defs-ext.xml"
+		/>
+
+		<copy todir="${ext.name}-ext/docroot/WEB-INF/sql" failonerror="false">
+			<fileset dir="${ext.dir}/sql" />
+		</copy>
+	</target>
+</project>
\ No newline at end of file
diff --git a/ext/create.bat b/ext/create.bat
new file mode 100644
index 0000000..4147e26
--- /dev/null
+++ b/ext/create.bat
@@ -0,0 +1,25 @@
+@echo off
+
+if "" == "%1" goto errorCreate
+
+if "" == "%2" goto errorCreate
+
+call ant -Dext.name=%1 -Dext.display.name=%2 create
+
+rem call ant deploy
+
+goto end
+
+:errorCreate
+	echo.
+	echo Usage: create.bat hello-world "Hello World"
+	echo.
+	echo The first hello-world is your extension environment name. A new directory will
+	echo be created based on the extension environment name.
+	echo.
+	echo The second "Hello World" is the extension environment's display name. The
+	echo quotation marks are only needed because there is a space in the display name.
+
+	goto end
+
+:end
\ No newline at end of file
diff --git a/ext/create.sh b/ext/create.sh
new file mode 100644
index 0000000..8655d95
--- /dev/null
+++ b/ext/create.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#set -x
+
+if [ $# -lt 2 ]; then
+	echo
+	echo Usage: ./create.sh hello-world \"Hello World\"
+	echo
+	echo The first hello-world is your extension environment name. A new directory will
+	echo be created based on the extension environment name.
+	echo
+	echo The second "Hello World" is the extension environment\'s display name. The
+	echo quotation marks are only needed because there is a space in the display name.
+
+	exit 127
+fi
+
+ant -Dext.name=$1 -Dext.display.name=\"$2\" create
+
+#ant deploy
+
+exit 0
\ No newline at end of file
diff --git a/hooks/build-common-hook.xml b/hooks/build-common-hook.xml
new file mode 100644
index 0000000..4137b7a
--- /dev/null
+++ b/hooks/build-common-hook.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-hook">
+	<import file="../build-common-plugin.xml" />
+</project>
\ No newline at end of file
diff --git a/hooks/build.xml b/hooks/build.xml
new file mode 100644
index 0000000..8e5132d
--- /dev/null
+++ b/hooks/build.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="hooks" basedir="." default="deploy">
+	<import file="../build-common-plugins.xml" />
+
+	<target name="create">
+		<if>
+			<or>
+				<not>
+					<isset property="hook.display.name" />
+				</not>
+				<not>
+					<isset property="hook.name" />
+				</not>
+			</or>
+			<then>
+				<fail>This task must be called by the create script.</fail>
+			</then>
+		</if>
+
+		<property name="hook.parent.dir" value="${user.dir}" />
+		<property name="hook.dir" value="${hook.parent.dir}/${hook.name}-hook" />
+
+		<if>
+			<available file="${hook.dir}" />
+			<then>
+				<fail>${hook.name}-hook already exists.</fail>
+			</then>
+		</if>
+
+		<copy todir="${hook.dir}">
+			<fileset
+				dir="${sdk.dir}/tools/templates/hook_tmpl"
+			/>
+		</copy>
+
+		<replace dir="${hook.dir}">
+			<replacefilter token="@app.server.tomcat.manager.password@" value="${app.server.tomcat.manager.password}" />
+			<replacefilter token="@app.server.tomcat.manager.user@" value="${app.server.tomcat.manager.user}" />
+			<replacefilter token="@hook.display.name@" value="${hook.display.name}" />
+			<replacefilter token="@hook.name@" value="${hook.name}" />
+			<replacefilter token="@jmx.remote.port@" value="${jmx.remote.port}" />
+			<replacefilter token="@plugin.type.dir@" value="${plugin.type.dir}" />
+		</replace>
+	</target>
+</project>
\ No newline at end of file
diff --git a/hooks/create.bat b/hooks/create.bat
new file mode 100644
index 0000000..574b28b
--- /dev/null
+++ b/hooks/create.bat
@@ -0,0 +1,25 @@
+@echo off
+
+if "" == "%1" goto errorCreate
+
+if "" == "%2" goto errorCreate
+
+call ant -Dhook.name=%1 -Dhook.display.name=%2 create
+
+rem call ant deploy
+
+goto end
+
+:errorCreate
+	echo.
+	echo Usage: create.bat hello-world "Hello World"
+	echo.
+	echo The first hello-world is your hook id. A new directory will be created based on
+	echo the hook id.
+	echo.
+	echo The second "Hello World" is the hook's display name. The quotation marks are
+	echo only needed because there is a space in the display name.
+
+	goto end
+
+:end
\ No newline at end of file
diff --git a/hooks/create.sh b/hooks/create.sh
new file mode 100644
index 0000000..ad5d82e
--- /dev/null
+++ b/hooks/create.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#set -x
+
+if [ $# -lt 2 ]; then
+	echo
+	echo Usage: ./create.sh hello-world \"Hello World\"
+	echo
+	echo The first hello-world is your hook id. A new directory will be created based on
+	echo the hook id.
+	echo
+	echo The second \"Hello World\" is the hook\'s display name. The quotation marks are
+	echo only needed because there is a space in the display name.
+
+	exit 127
+fi
+
+ant -Dhook.name=$1 -Dhook.display.name=\"$2\" create
+
+#ant deploy
+
+exit 0
\ No newline at end of file
diff --git a/hooks/sicilia-login-hook/.classpath b/hooks/sicilia-login-hook/.classpath
new file mode 100644
index 0000000..bf57290
--- /dev/null
+++ b/hooks/sicilia-login-hook/.classpath
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/hook">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=sicilia-login-hook&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bliferay_sdk_dir%3Asicilia-login-hook%7D%2Fivy-settings.xml&amp;loadSettingsOnDemand=false&amp;ivyUserDir=%24%7Bliferay_sdk_dir%3Asicilia-login-hook%7D%2F.ivy&amp;propertyFiles=">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
+</classpath>
diff --git a/hooks/sicilia-login-hook/.project b/hooks/sicilia-login-hook/.project
new file mode 100644
index 0000000..6e8b3e5
--- /dev/null
+++ b/hooks/sicilia-login-hook/.project
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sicilia-login-hook</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1669365700807</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/hooks/sicilia-login-hook/.settings/.jsdtscope b/hooks/sicilia-login-hook/.settings/.jsdtscope
new file mode 100644
index 0000000..840a01d
--- /dev/null
+++ b/hooks/sicilia-login-hook/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="docroot"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.component b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..e04d966
--- /dev/null
+++ b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="sicilia-login-hook">
+        <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
+        <dependent-module archiveName="sicilia-login-portlet-service.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/sicilia-login-portlet/docroot/WEB-INF/lib/sicilia-login-portlet-service.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="sicilia-login-hook"/>
+        <property name="java-output-path" value="/sicilia-login-hook/docroot/WEB-INF/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..1f9ee53
--- /dev/null
+++ b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+<root>
+  <facet id="liferay.hook">
+    <node name="libprov">
+      <attribute name="provider-id" value="com.liferay.ide.eclipse.plugin.hook.libraryProvider"/>
+    </node>
+  </facet>
+</root>
diff --git a/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.project.facet.core.xml b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..cded63a
--- /dev/null
+++ b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
+  <fixed facet="java"/>
+  <fixed facet="jst.web"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="liferay.hook" version="6.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/hooks/sicilia-login-hook/.settings/org.eclipse.wst.jsdt.ui.superType.container b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/hooks/sicilia-login-hook/.settings/org.eclipse.wst.jsdt.ui.superType.name b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/hooks/sicilia-login-hook/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/hooks/sicilia-login-hook/build.xml b/hooks/sicilia-login-hook/build.xml
new file mode 100644
index 0000000..c2d19b3
--- /dev/null
+++ b/hooks/sicilia-login-hook/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="sicilia-login-hook" basedir="." default="deploy">
+	<import file="../build-common-hook.xml" />
+</project>
\ No newline at end of file
diff --git a/hooks/sicilia-login-hook/docroot/META-INF/MANIFEST.MF b/hooks/sicilia-login-hook/docroot/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/.gitignore b/hooks/sicilia-login-hook/docroot/WEB-INF/.gitignore
new file mode 100644
index 0000000..840e7d3
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/.gitignore
@@ -0,0 +1 @@
+/classes/
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/bcprov-jdk15on.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/bcprov-jdk15on.jar
new file mode 100644
index 0000000..4076e11
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/bcprov-jdk15on.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-codec.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-codec.jar
new file mode 100644
index 0000000..2245120
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-codec.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-collections.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-collections.jar
new file mode 100644
index 0000000..c35fa1f
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-collections.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-httpclient.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-httpclient.jar
new file mode 100644
index 0000000..7c59774
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-httpclient.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-lang.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-lang.jar
new file mode 100644
index 0000000..98467d3
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/commons-lang.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/esapi.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/esapi.jar
new file mode 100644
index 0000000..06b9149
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/esapi.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/guava.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/guava.jar
new file mode 100644
index 0000000..632772f
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/guava.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/httpclient.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/httpclient.jar
new file mode 100644
index 0000000..218ee25
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/httpclient.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/httpcore.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/httpcore.jar
new file mode 100644
index 0000000..163dc43
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/httpcore.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/java-support.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/java-support.jar
new file mode 100644
index 0000000..557873f
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/java-support.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jcl-over-slf4j.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jcl-over-slf4j.jar
new file mode 100644
index 0000000..90153b0
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jcl-over-slf4j.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/joda-time.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/joda-time.jar
new file mode 100644
index 0000000..69fa924
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/joda-time.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jsr305.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jsr305.jar
new file mode 100644
index 0000000..021df89
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jsr305.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jul-to-slf4j.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jul-to-slf4j.jar
new file mode 100644
index 0000000..9b5e8c1
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/jul-to-slf4j.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/log4j-over-slf4j.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/log4j-over-slf4j.jar
new file mode 100644
index 0000000..3f30396
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/log4j-over-slf4j.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/metrics-core.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/metrics-core.jar
new file mode 100644
index 0000000..5767166
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/metrics-core.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/not-yet-commons-ssl.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/not-yet-commons-ssl.jar
new file mode 100644
index 0000000..9e38f97
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/not-yet-commons-ssl.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/opensaml.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/opensaml.jar
new file mode 100644
index 0000000..34ae4e3
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/opensaml.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/openws.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/openws.jar
new file mode 100644
index 0000000..563b0f9
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/openws.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/slf4j-api.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/slf4j-api.jar
new file mode 100644
index 0000000..8f004d3
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/slf4j-api.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/velocity.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/velocity.jar
new file mode 100644
index 0000000..ae936d3
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/velocity.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/xmlsec.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/xmlsec.jar
new file mode 100644
index 0000000..2512fb5
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/xmlsec.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/lib/xmltooling.jar b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/xmltooling.jar
new file mode 100644
index 0000000..6bf1f4f
Binary files /dev/null and b/hooks/sicilia-login-hook/docroot/WEB-INF/lib/xmltooling.jar differ
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/liferay-hook.xml b/hooks/sicilia-login-hook/docroot/WEB-INF/liferay-hook.xml
new file mode 100644
index 0000000..6cd1c92
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/liferay-hook.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
+
+<hook>
+	<portal-properties>portal.properties</portal-properties>
+	<servlet-filter>
+		<servlet-filter-name>Sicilia SSO</servlet-filter-name>
+		<servlet-filter-impl>it.mwg.sicilia.login.filter.SiciliaLoginFilter</servlet-filter-impl>
+	</servlet-filter>
+	<servlet-filter-mapping>
+		<servlet-filter-name>Sicilia SSO</servlet-filter-name>
+		<url-pattern>/c/portal/login</url-pattern>
+		<dispatcher>FORWARD</dispatcher>
+		<dispatcher>REQUEST</dispatcher>
+	</servlet-filter-mapping>
+</hook>
\ No newline at end of file
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/liferay-plugin-package.properties b/hooks/sicilia-login-hook/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..433fe62
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,12 @@
+name=Sicilia Login Hook
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
+required-deployment-contexts=sicilia-login-portlet
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/constants/ApiConstants.java b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/constants/ApiConstants.java
new file mode 100644
index 0000000..0b880c4
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/constants/ApiConstants.java
@@ -0,0 +1,21 @@
+package it.mwg.sicilia.login.constants;
+
+/**
+ * @author Manifattura Web Group per Regione Siciliana
+ */
+public class ApiConstants {
+
+	public static final String PARAMETER_AUTH = "auth";
+	public static final String PARAMETER_CALLBACK_URL = "callback";
+	public static final String PARAMETER_TOKEN = "token";
+	public static final String PARAMETER_USERNAME = "username";
+	public static final String PARAMETER_PASSWORD = "password";
+	public static final String PARAMETER_FIRST_NAME = "nome";
+	public static final String PARAMETER_LAST_NAME = "cognome";
+	public static final String PARAMETER_CODICE_FISCALE = "codice_fiscale";
+
+	private static final String SESSION_BASE = "SICILIA_HOOK_";
+	public static final String SESSION_AUTH = SESSION_BASE + PARAMETER_AUTH.toUpperCase();
+	public static final String SESSION_TOKEN = SESSION_BASE + PARAMETER_TOKEN.toUpperCase();
+	public static final String SESSION_USER_DATA = SESSION_BASE + "USER_DATA";
+}
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/filter/SiciliaAutoLogin.java b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/filter/SiciliaAutoLogin.java
new file mode 100644
index 0000000..7cf752c
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/filter/SiciliaAutoLogin.java
@@ -0,0 +1,132 @@
+package it.mwg.sicilia.login.filter;
+
+import it.mwg.sicilia.login.constants.ApiConstants;
+
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.security.SecureRandom;
+import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.User;
+import com.liferay.portal.security.auth.AutoLogin;
+import com.liferay.portal.security.auth.AutoLoginException;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.UserLocalServiceUtil;
+import com.liferay.portal.util.PortalUtil;
+
+/**
+ * @author Manifattura Web Group per Regione Siciliana
+ */
+public class SiciliaAutoLogin implements AutoLogin {
+
+	@Override
+	public String[] login(HttpServletRequest request, HttpServletResponse response) throws AutoLoginException {
+		User user = null;
+		HttpSession session = request.getSession();
+		@SuppressWarnings("unchecked")
+		Map<String, String> userData = (Map<String, String>) session.getAttribute(ApiConstants.SESSION_USER_DATA);
+		if (Validator.isNotNull(userData)) {
+			long companyId = PortalUtil.getCompanyId(request);
+			user = logUser(companyId, userData.get(ApiConstants.PARAMETER_CODICE_FISCALE),
+					userData.get(ApiConstants.PARAMETER_FIRST_NAME), userData.get(ApiConstants.PARAMETER_LAST_NAME));
+			if (Validator.isNotNull(user)) {
+				String redirect = ParamUtil.getString(request, "redirect");
+				if (Validator.isNotNull(redirect)) {
+					request.setAttribute(AUTO_LOGIN_REDIRECT_AND_CONTINUE, redirect);
+				}
+				return new String[] { String.valueOf(user.getUserId()), user.getPassword(),
+						String.valueOf(user.isPasswordEncrypted()) };
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String[] handleException(HttpServletRequest request, HttpServletResponse response, Exception e)
+			throws AutoLoginException {
+
+		_log.error(e);
+		return null;
+	}
+
+	private User logUser(long companyId, String screenName, String firstName, String lastName) {
+
+		_log.info("Cerco l'utente " + screenName + " (" + firstName + " " + lastName + ")");
+		User user = null;
+		try {
+			user = UserLocalServiceUtil.fetchUserByScreenName(companyId, screenName);
+			if (Validator.isNull(user)) {
+				long creatorUserId = UserLocalServiceUtil.getDefaultUserId(companyId);
+				boolean autoPassword = true;
+				String password = randomPassword(24);
+				boolean autoScreenName = false;
+				String emailAddress = screenName + "@no-email.regione.sicilia.it";
+				long facebookId = 0;
+				String openId = StringPool.BLANK;
+				Locale locale = Locale.ITALY;
+				String middleName = StringPool.BLANK;
+				int prefixId = 0;
+				int suffixId = 0;
+				boolean male = true;
+				int birthdayMonth = 0;
+				int birthdayDay = 1;
+				int birthdayYear = 1970;
+				String jobTitle = StringPool.BLANK;
+				long[] groupIds = null;
+				long[] organizationIds = null;
+				long[] roleIds = null;
+				long[] userGroupIds = null;
+				boolean sendEmail = false;
+				ServiceContext serviceContext = new ServiceContext();
+				user = UserLocalServiceUtil.addUser(creatorUserId, companyId, autoPassword, password, password,
+						autoScreenName, screenName.toLowerCase(), emailAddress, facebookId, openId, locale,
+						capitalize(firstName), middleName, capitalize(lastName), prefixId, suffixId, male,
+						birthdayMonth, birthdayDay, birthdayYear, jobTitle, groupIds, organizationIds, roleIds,
+						userGroupIds, sendEmail, serviceContext);
+				user.setPasswordModified(true);
+				user.setPasswordModifiedDate(new Date());
+				user.setPasswordReset(false);
+				UserLocalServiceUtil.updateUser(user);
+			}
+		} catch (SystemException | PortalException e) {
+			_log.error("Errore durante l'autenticazione/creazione dell'utente " + screenName, e);
+		}
+		return user;
+	}
+
+	private String capitalize(String str) {
+
+		int length = str.length();
+		StringBuilder sb = new StringBuilder(length);
+		boolean capital = true;
+		for (int i = 0; i < length; i++) {
+			char c = str.charAt(i);
+			sb.append(capital ? Character.toTitleCase(c) : Character.toLowerCase(c));
+			capital = (c == ' ');
+		}
+		return sb.toString();
+	}
+
+	private String randomPassword(int length) {
+
+		SecureRandom rnd = new SecureRandom();
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < length; i++) {
+			sb.append((char) (32 + rnd.nextInt(95)));
+		}
+		return sb.toString();
+	}
+
+	private static final Log _log = LogFactoryUtil.getLog(SiciliaAutoLogin.class);
+}
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/filter/SiciliaLoginFilter.java b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/filter/SiciliaLoginFilter.java
new file mode 100644
index 0000000..d8c50bc
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/filter/SiciliaLoginFilter.java
@@ -0,0 +1,79 @@
+package it.mwg.sicilia.login.filter;
+
+import it.mwg.sicilia.login.constants.ApiConstants;
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+import it.mwg.sicilia.login.util.ApiUtil;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.util.PortalUtil;
+
+/**
+ * @author Manifattura Web Group per Regione Siciliana
+ */
+public class SiciliaLoginFilter implements Filter {
+
+	@Override
+	public void destroy() {}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+			ServletException {
+
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		if (httpRequest.getHeader("x-requested-with") == null) {
+			long companyId = PortalUtil.getCompanyId(httpRequest);
+			String url = httpRequest.getRequestURL().toString();
+			String qs = httpRequest.getQueryString();
+			if (Validator.isNotNull(qs)) {
+				url += StringPool.QUESTION + qs;
+			}
+			HttpSession session = httpRequest.getSession();
+			String token = (String) session.getAttribute(ApiConstants.SESSION_TOKEN);
+			if (Validator.isNull(token)) {
+				token = ApiUtil.getToken(companyId, url);
+				if (Validator.isNull(token)) {
+					_log.error("Il token è nullo");
+				} else {
+					session.setAttribute(ApiConstants.SESSION_TOKEN, token);
+					((HttpServletResponse) response).sendRedirect(ConfigurazioneLocalServiceUtil
+							.getApiServer(companyId) + "?t=" + token);
+				}
+				return;
+			} else {
+				Map<String, String> userData = ApiUtil.getUserInfo(companyId, token);
+				if (Validator.isNull(userData)) {
+					// Se il token è scaduto si ricomincia
+					token = ApiUtil.getToken(companyId, url);
+					session.setAttribute(ApiConstants.SESSION_TOKEN, token);
+					((HttpServletResponse) response).sendRedirect(ConfigurazioneLocalServiceUtil
+							.getApiServer(companyId) + "?t=" + token);
+					return;
+				} else {
+					session.setAttribute(ApiConstants.SESSION_USER_DATA, userData);
+				}
+			}
+		}
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void init(FilterConfig config) throws ServletException {}
+
+	public static final Log _log = LogFactoryUtil.getLog(SiciliaLoginFilter.class);
+}
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/util/ApiUtil.java b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/util/ApiUtil.java
new file mode 100644
index 0000000..a5a2a53
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/src/it/mwg/sicilia/login/util/ApiUtil.java
@@ -0,0 +1,159 @@
+package it.mwg.sicilia.login.util;
+
+import it.mwg.sicilia.login.constants.ApiConstants;
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.liferay.portal.kernel.json.JSONException;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.Validator;
+
+/**
+ * @author Manifattura Web Group per Regione Siciliana
+ */
+public class ApiUtil {
+
+	public static String getToken(long companyId, String callbackURL) {
+
+		if (Validator.isNull(auth)) {
+			login(companyId);
+		}
+		for (int i = 0; i < 10; i++) {
+			if (Validator.isNotNull(auth)) {
+				JSONObject map = JSONFactoryUtil.createJSONObject();
+				map.put(ApiConstants.PARAMETER_AUTH, auth);
+				map.put(ApiConstants.PARAMETER_CALLBACK_URL, callbackURL);
+				map = post(companyId, ENDPOINT_GET_TOKEN, map);
+				if (Validator.isNotNull(map)) {
+					switch (map.getInt(LABEL_ERROR_CODE)) {
+						case ERROR_OK:
+							return map.getString(ApiConstants.PARAMETER_TOKEN);
+						case ERROR_INVALID_AUTH:
+							_log.info("Auth scaduto. Eseguo nuovo login");
+							login(companyId);
+							break;
+						default:
+							_log.error("Errore durante la creazione del token: " + map.toString());
+							return null;
+					}
+				} else {
+					_log.error("Errore inatteso durante la creazione del token");
+				}
+			}
+		}
+		return null;
+	}
+
+	private static String getUrl(long companyId, String suffix) {
+
+		StringBuilder sb = new StringBuilder(ConfigurazioneLocalServiceUtil.getApiServer(companyId));
+		if (sb.charAt(sb.length() - 1) != '/') {
+			sb.append('/');
+		}
+		sb.append(suffix);
+		return sb.toString();
+	}
+
+	public static Map<String, String> getUserInfo(long companyId, String token) {
+
+		JSONObject map = JSONFactoryUtil.createJSONObject();
+		map.put(ApiConstants.PARAMETER_AUTH, auth).put(ApiConstants.PARAMETER_TOKEN, token);
+		map = post(companyId, ENDPOINT_GET_USER, map);
+		if (Validator.isNotNull(map)) {
+			switch (map.getInt(LABEL_ERROR_CODE)) {
+				case ERROR_OK:
+					Map<String, String> ret = new HashMap<String, String>();
+					ret.put(ApiConstants.PARAMETER_FIRST_NAME, map.getString(ApiConstants.PARAMETER_FIRST_NAME));
+					ret.put(ApiConstants.PARAMETER_LAST_NAME, map.getString(ApiConstants.PARAMETER_LAST_NAME));
+					ret.put(ApiConstants.PARAMETER_CODICE_FISCALE, map.getString(ApiConstants.PARAMETER_CODICE_FISCALE));
+					return ret;
+				default:
+					_log.error("Errore durante il recupero dei dati utente: " + map.toString());
+			}
+		}
+		return null;
+	}
+
+	private static void login(long companyId) {
+
+		JSONObject map = JSONFactoryUtil.createJSONObject();
+		map.put(ApiConstants.PARAMETER_USERNAME, ConfigurazioneLocalServiceUtil.getApiUsername(companyId));
+		map.put(ApiConstants.PARAMETER_PASSWORD, ConfigurazioneLocalServiceUtil.getApiPassword(companyId));
+		map = post(companyId, ENDPOINT_LOGIN, map);
+		if (Validator.isNotNull(map)) {
+			if (ERROR_OK == map.getInt(LABEL_ERROR_CODE)) {
+				auth = map.getString(ApiConstants.PARAMETER_AUTH);
+			} else {
+				_log.error("Errore durante il login: " + map.toString());
+				auth = null;
+			}
+		}
+	}
+
+	private static JSONObject post(long companyId, String endPoint, JSONObject json) {
+
+		try {
+			URL url = new URL(getUrl(companyId, endPoint));
+			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+			connection.setRequestMethod("POST");
+			connection.setRequestProperty("User-Agent", HTTP_USER_AGENT);
+			connection.setDoOutput(true);
+			connection.setReadTimeout(10000);
+			OutputStream stream = connection.getOutputStream();
+			stream.write(json.toString().getBytes());
+			stream.flush();
+			stream.close();
+			int code = connection.getResponseCode();
+			String response = readResponse(connection);
+			connection.disconnect();
+			if (code == HttpURLConnection.HTTP_OK) {
+				JSONObject ret = JSONFactoryUtil.createJSONObject(response);
+				return ret;
+			} else {
+				_log.error("Inviato: " + json.toString() + " (" + url.toString() + endPoint + ")");
+				_log.error("Ricevuto: " + response);
+			}
+		} catch (IOException | JSONException e) {
+			_log.error(e);
+		}
+		return null;
+	}
+
+	private static String readResponse(HttpURLConnection connection) throws IOException {
+
+		BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+		StringBuilder builder = new StringBuilder();
+		String inputLine;
+		while ((inputLine = reader.readLine()) != null) {
+			builder.append(inputLine);
+		}
+		reader.close();
+		return builder.toString();
+	}
+
+	private static final Log _log = LogFactoryUtil.getLog(ApiUtil.class);
+
+	private static String auth = null;
+
+	private static final String ENDPOINT_LOGIN = "api/v1/login.cgi";
+	private static final String ENDPOINT_GET_TOKEN = "api/v1/get_token.cgi";
+	private static final String ENDPOINT_GET_USER = "api/v1/get_user.cgi";
+
+	private static final int ERROR_OK = 0;
+	private static final int ERROR_INVALID_AUTH = 1;
+
+	private static final String LABEL_ERROR_CODE = "code";
+
+	private static final String HTTP_USER_AGENT = "Sicilia Login like Mozilla/5.0";
+}
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/src/portal.properties b/hooks/sicilia-login-hook/docroot/WEB-INF/src/portal.properties
new file mode 100644
index 0000000..49465fe
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/src/portal.properties
@@ -0,0 +1,2 @@
+#auth.pipeline.enable.liferay.check=false  
+auto.login.hooks=it.mwg.sicilia.login.filter.SiciliaAutoLogin
diff --git a/hooks/sicilia-login-hook/docroot/WEB-INF/web.xml b/hooks/sicilia-login-hook/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..ff1320b
--- /dev/null
+++ b/hooks/sicilia-login-hook/docroot/WEB-INF/web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.5"
+	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+</web-app>
\ No newline at end of file
diff --git a/hooks/sicilia-login-hook/ivy.xml b/hooks/sicilia-login-hook/ivy.xml
new file mode 100644
index 0000000..af13eba
--- /dev/null
+++ b/hooks/sicilia-login-hook/ivy.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="sicilia-login-hook" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="../../ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0" />
+
+		<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.13" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/hooks/sicilia-login-hook/ivy.xml.MD5 b/hooks/sicilia-login-hook/ivy.xml.MD5
new file mode 100644
index 0000000..3860cef
--- /dev/null
+++ b/hooks/sicilia-login-hook/ivy.xml.MD5
@@ -0,0 +1 @@
+f32cef52cdc5e9d134e7a5e7d76b9c50
diff --git a/hooks/sicilia-login-hook/test/integration/arquillian.xml b/hooks/sicilia-login-hook/test/integration/arquillian.xml
new file mode 100644
index 0000000..9413609
--- /dev/null
+++ b/hooks/sicilia-login-hook/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">8099</property>
+			<property name="pass">tomcat</property>
+			<property name="user">tomcat</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/ivy-settings-publisher.xml b/ivy-settings-publisher.xml
new file mode 100644
index 0000000..a1588f7
--- /dev/null
+++ b/ivy-settings-publisher.xml
@@ -0,0 +1,24 @@
+<ivysettings>
+	<include file="${ivy.custom.settings.file}" />
+
+	<credentials host="${sonatype.release.hostname}" realm="${sonatype.release.realm}" passwd="${sonatype.release.password}" username="${sonatype.release.username}" />
+	<credentials host="${sonatype.snapshot.hostname}" realm="${sonatype.snapshot.realm}" passwd="${sonatype.snapshot.password}" username="${sonatype.snapshot.username}" />
+
+	<resolvers>
+		<filesystem m2compatible="true" name="local-m2">
+			<artifact pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
+		</filesystem>
+
+		<url m2compatible="true" name="sonatype-m2-release">
+			<artifact pattern="${sonatype.release.url}/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
+		</url>
+
+		<url m2compatible="true" name="sonatype-m2-snapshot">
+			<artifact pattern="${sonatype.snapshot.url}/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
+		</url>
+	</resolvers>
+
+	<signers>
+		<pgp keyId="${pgp.keyname}" name="${pgp.generator}" password="${pgp.passphrase}" />
+	</signers>
+</ivysettings>
\ No newline at end of file
diff --git a/ivy-settings.xml b/ivy-settings.xml
new file mode 100644
index 0000000..30a41fe
--- /dev/null
+++ b/ivy-settings.xml
@@ -0,0 +1,20 @@
+<ivysettings>
+	<settings defaultResolver="default"/>
+	<resolvers>
+		<ibiblio name="l1" m2compatible="true" root="file://${user.home}/.m2/repository" />
+		<ibiblio name="r1" m2compatible="true" root="https://repo1.maven.org/maven2/"/>
+		<ibiblio name="r2" m2compatible="true" root="https://repo.maven.apache.org/maven2/"/>
+		<ibiblio name="r3" m2compatible="true" root="https://cdn.lfrs.sl/repository.liferay.com/nexus/content/groups/public" />
+		<ibiblio name="r4" m2compatible="true" root="http://jasperreports.sourceforge.net/maven2/"/>
+		<ibiblio name="r5" m2compatible="true" root="https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/"/>
+
+		<chain name="default" dual="true">
+			<resolver ref="l1"/>
+			<resolver ref="r1"/>
+			<resolver ref="r2"/>
+			<resolver ref="r3"/>
+			<resolver ref="r4"/>
+			<resolver ref="r5"/>
+		</chain>
+	</resolvers>
+</ivysettings>
diff --git a/ivy.xml b/ivy.xml
new file mode 100644
index 0000000..abc54a8
--- /dev/null
+++ b/ivy.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="com.liferay.sdk" organisation="com.liferay">
+		<license name="LGPL 2.1" url="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt" />
+
+		<description homepage="http://www.liferay.com" />
+	</info>
+
+	<configurations>
+		<conf name="default" />
+		<conf name="internal" />
+		<conf name="provided" />
+		<conf name="runtime" />
+		<conf name="test" />
+	</configurations>
+
+	<dependencies defaultconf="default">
+		<dependency name="activation" org="javax.activation" rev="1.1" />
+		<dependency name="ant-apache-bsf" org="org.apache.ant" rev="1.8.3" />
+		<dependency name="antelopetasks" org="org.tigris.antelope" rev="3.2.10" />
+		<dependency name="bcpg-jdk16" org="org.bouncycastle" rev="1.46" />
+		<dependency name="bcprov-jdk16" org="org.bouncycastle" rev="1.46" />
+		<dependency name="bsh" org="org.beanshell" rev="2.0b4" />
+		<dependency name="bsf" org="bsf" rev="2.4.0" />
+		<dependency name="ccpp" org="javax.ccpp" rev="1.0" />
+		<dependency name="commons-logging" org="commons-logging" rev="1.1.1" />
+		<dependency name="ecj" org="org.eclipse.jdt.core.compiler" rev="3.7.2" />
+		<dependency name="error_prone_ant" org="com.google.errorprone" rev="1.0.8" />
+		<dependency name="jalopy" org="jalopy" rev="1.5rc3" />
+		<dependency name="javax.servlet-api" org="javax.servlet" rev="3.0.1" />
+		<dependency name="jsp-api" org="javax.servlet.jsp" rev="2.1" />
+		<dependency name="log4j" org="log4j" rev="1.2.16" />
+		<dependency name="mail" org="javax.mail" rev="1.4" />
+		<dependency name="net.sf.jargs" org="com.liferay" rev="1.0" />
+		<dependency name="org.osgi.compendium" org="org.osgi" rev="5.0.0" />
+		<dependency name="org.osgi.core" org="org.osgi" rev="5.0.0" />
+		<dependency name="qdox" org="com.thoughtworks.qdox" rev="1.12.1" />
+		<dependency name="serializer" org="xalan" rev="2.7.1" />
+		<dependency name="xalan" org="xalan" rev="2.7.1" />
+		<dependency name="xercesImpl" org="xerces" rev="2.10.0" />
+		<dependency name="xml-apis" org="xml-apis" rev="1.4.01" />
+		<dependency conf="test->default" name="junit" org="junit" rev="4.12" />
+		<dependency conf="test->default" name="mockito-all" org="org.mockito" rev="1.9.5" />
+		<dependency conf="test->default" name="powermock-api-mockito" org="org.powermock" rev="1.6.1" />
+		<dependency conf="test->default" name="powermock-api-support" org="org.powermock" rev="1.6.1" />
+		<dependency conf="test->default" name="powermock-core" org="org.powermock" rev="1.6.1" />
+		<dependency conf="test->default" name="powermock-module-junit4" org="org.powermock" rev="1.6.1" />
+		<dependency conf="test->default" name="powermock-module-junit4-common" org="org.powermock" rev="1.6.1" />
+		<dependency conf="test->default" name="powermock-reflect" org="org.powermock" rev="1.6.1" />
+		<dependency conf="test->default" name="spring-test" org="org.springframework" rev="3.0.7.RELEASE" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/ivy.xml.MD5 b/ivy.xml.MD5
new file mode 100644
index 0000000..feae7b2
--- /dev/null
+++ b/ivy.xml.MD5
@@ -0,0 +1 @@
+ae2292c03b059802eec34967b7e85b8a
diff --git a/layouttpl/build-common-layouttpl.xml b/layouttpl/build-common-layouttpl.xml
new file mode 100644
index 0000000..97d42d0
--- /dev/null
+++ b/layouttpl/build-common-layouttpl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-layouttpl">
+	<import file="../build-common-plugin.xml" />
+</project>
\ No newline at end of file
diff --git a/layouttpl/build.xml b/layouttpl/build.xml
new file mode 100644
index 0000000..ce61cfa
--- /dev/null
+++ b/layouttpl/build.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="layouttpl" basedir="." default="deploy" xmlns:antelope="antlib:ise.antelope.tasks">
+	<import file="../build-common-plugins.xml" />
+
+	<target name="create">
+		<if>
+			<or>
+				<not>
+					<isset property="layouttpl.display.name" />
+				</not>
+				<not>
+					<isset property="layouttpl.name" />
+				</not>
+			</or>
+			<then>
+				<fail>This task must be called by the create script.</fail>
+			</then>
+		</if>
+
+		<property name="layouttpl.parent.dir" value="${user.dir}" />
+		<property name="layouttpl.dir" value="${layouttpl.parent.dir}/${layouttpl.name}-layouttpl" />
+
+		<if>
+			<available file="${layouttpl.dir}" />
+			<then>
+				<fail>${layouttpl.name}-layouttpl already exists.</fail>
+			</then>
+		</if>
+
+		<copy todir="${layouttpl.dir}">
+			<fileset
+				dir="${sdk.dir}/tools/templates/layouttpl_tmpl"
+			/>
+		</copy>
+
+		<antelope:stringutil string="${layouttpl.name}" property="layouttpl.template.name">
+			<replace regex="-" replacement="_" />
+		</antelope:stringutil>
+
+		<replace dir="${layouttpl.dir}">
+			<replacefilter token="@layouttpl.display.name@" value="${layouttpl.display.name}" />
+			<replacefilter token="@layouttpl.name@" value="${layouttpl.name}" />
+			<replacefilter token="@layouttpl.template.name@" value="${layouttpl.template.name}" />
+			<replacefilter token="@plugin.type.dir@" value="${plugin.type.dir}" />
+		</replace>
+
+		<move
+			file="${layouttpl.dir}/docroot/blank_columns.png"
+			tofile="${layouttpl.dir}/docroot/${layouttpl.template.name}.png"
+		/>
+
+		<move
+			file="${layouttpl.dir}/docroot/blank_columns.tpl"
+			tofile="${layouttpl.dir}/docroot/${layouttpl.template.name}.tpl"
+		/>
+
+		<move
+			file="${layouttpl.dir}/docroot/blank_columns.wap.tpl"
+			tofile="${layouttpl.dir}/docroot/${layouttpl.template.name}.wap.tpl"
+		/>
+
+		<touch file="${layouttpl.dir}/docroot/${layouttpl.template.name}.wap.tpl" />
+	</target>
+</project>
\ No newline at end of file
diff --git a/layouttpl/create.bat b/layouttpl/create.bat
new file mode 100644
index 0000000..61c6e3b
--- /dev/null
+++ b/layouttpl/create.bat
@@ -0,0 +1,28 @@
+@echo off
+
+if "" == "%1" goto errorCreate
+if "" == "%2" goto errorCreate
+
+call ant -Dlayouttpl.name=%1 -Dlayouttpl.display.name=%2 create
+
+cd %1-layouttpl
+
+rem call ant deploy
+
+cd ..
+
+goto end
+
+:errorCreate
+	echo.
+	echo Usage: create.bat hello-world "Hello World"
+	echo.
+	echo The first hello-world is your layouttpl id. A new directory will be created
+	echo based on the layouttpl id.
+	echo.
+	echo The second "Hello World" is the layouttpl's display name. The quotation marks
+	echo are only needed because there is a space in the display name.
+
+	goto end
+
+:end
\ No newline at end of file
diff --git a/layouttpl/create.sh b/layouttpl/create.sh
new file mode 100644
index 0000000..ab37c3f
--- /dev/null
+++ b/layouttpl/create.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#set -x
+
+if [ $# -lt 2 ]; then
+	echo
+	echo Usage: ./create.sh hello-world \"Hello World\"
+	echo
+	echo The first hello-world is your layouttpl id. A new directory will be created
+	echo based on the layouttpl id.
+	echo
+	echo The second \"Hello World\" is the layouttpl\'s display name. The quotation marks
+	echo are only needed because there is a space in the display name.
+
+	exit 127
+fi
+
+ant -Dlayouttpl.name=$1 -Dlayouttpl.display.name=\"$2\" create
+
+cd $1-layouttpl
+
+#ant deploy
+
+exit 0
\ No newline at end of file
diff --git a/lib/activation.jar b/lib/activation.jar
new file mode 100644
index 0000000..53f82a1
Binary files /dev/null and b/lib/activation.jar differ
diff --git a/lib/ant-apache-bsf.jar b/lib/ant-apache-bsf.jar
new file mode 100644
index 0000000..5196d57
Binary files /dev/null and b/lib/ant-apache-bsf.jar differ
diff --git a/lib/ant-contrib.jar b/lib/ant-contrib.jar
new file mode 100644
index 0000000..0625376
Binary files /dev/null and b/lib/ant-contrib.jar differ
diff --git a/lib/ant-launcher.jar b/lib/ant-launcher.jar
new file mode 100644
index 0000000..e1dcfb2
Binary files /dev/null and b/lib/ant-launcher.jar differ
diff --git a/lib/ant.jar b/lib/ant.jar
new file mode 100644
index 0000000..f68c9cf
Binary files /dev/null and b/lib/ant.jar differ
diff --git a/lib/antelopetasks.jar b/lib/antelopetasks.jar
new file mode 100644
index 0000000..ff6375d
Binary files /dev/null and b/lib/antelopetasks.jar differ
diff --git a/lib/bcpg-jdk16.jar b/lib/bcpg-jdk16.jar
new file mode 100644
index 0000000..8e51360
Binary files /dev/null and b/lib/bcpg-jdk16.jar differ
diff --git a/lib/bcprov-jdk16.jar b/lib/bcprov-jdk16.jar
new file mode 100644
index 0000000..27d3481
Binary files /dev/null and b/lib/bcprov-jdk16.jar differ
diff --git a/lib/bsf.jar b/lib/bsf.jar
new file mode 100644
index 0000000..2288c36
Binary files /dev/null and b/lib/bsf.jar differ
diff --git a/lib/bsh.jar b/lib/bsh.jar
new file mode 100644
index 0000000..36fe03d
Binary files /dev/null and b/lib/bsh.jar differ
diff --git a/lib/ccpp.jar b/lib/ccpp.jar
new file mode 100644
index 0000000..a06a98a
Binary files /dev/null and b/lib/ccpp.jar differ
diff --git a/lib/commons-logging.jar b/lib/commons-logging.jar
new file mode 100644
index 0000000..1deef14
Binary files /dev/null and b/lib/commons-logging.jar differ
diff --git a/lib/ecj.jar b/lib/ecj.jar
new file mode 100644
index 0000000..92f9909
Binary files /dev/null and b/lib/ecj.jar differ
diff --git a/lib/error_prone_ant.jar b/lib/error_prone_ant.jar
new file mode 100644
index 0000000..e4282e3
Binary files /dev/null and b/lib/error_prone_ant.jar differ
diff --git a/lib/jalopy.jar b/lib/jalopy.jar
new file mode 100644
index 0000000..fe51ce2
Binary files /dev/null and b/lib/jalopy.jar differ
diff --git a/lib/javax.servlet-api.jar b/lib/javax.servlet-api.jar
new file mode 100644
index 0000000..4e2edcc
Binary files /dev/null and b/lib/javax.servlet-api.jar differ
diff --git a/lib/jsp-api.jar b/lib/jsp-api.jar
new file mode 100644
index 0000000..c0195af
Binary files /dev/null and b/lib/jsp-api.jar differ
diff --git a/lib/log4j.jar b/lib/log4j.jar
new file mode 100644
index 0000000..5429a90
Binary files /dev/null and b/lib/log4j.jar differ
diff --git a/lib/mail.jar b/lib/mail.jar
new file mode 100644
index 0000000..fd4555b
Binary files /dev/null and b/lib/mail.jar differ
diff --git a/lib/net.sf.jargs.jar b/lib/net.sf.jargs.jar
new file mode 100644
index 0000000..cdbc80b
Binary files /dev/null and b/lib/net.sf.jargs.jar differ
diff --git a/lib/org.osgi.compendium.jar b/lib/org.osgi.compendium.jar
new file mode 100644
index 0000000..84141aa
Binary files /dev/null and b/lib/org.osgi.compendium.jar differ
diff --git a/lib/org.osgi.core.jar b/lib/org.osgi.core.jar
new file mode 100644
index 0000000..d881a6a
Binary files /dev/null and b/lib/org.osgi.core.jar differ
diff --git a/lib/qdox.jar b/lib/qdox.jar
new file mode 100644
index 0000000..092fc51
Binary files /dev/null and b/lib/qdox.jar differ
diff --git a/lib/serializer.jar b/lib/serializer.jar
new file mode 100644
index 0000000..99f98db
Binary files /dev/null and b/lib/serializer.jar differ
diff --git a/lib/xalan.jar b/lib/xalan.jar
new file mode 100644
index 0000000..458fa73
Binary files /dev/null and b/lib/xalan.jar differ
diff --git a/lib/xercesImpl.jar b/lib/xercesImpl.jar
new file mode 100644
index 0000000..9dcd8c3
Binary files /dev/null and b/lib/xercesImpl.jar differ
diff --git a/lib/xml-apis.jar b/lib/xml-apis.jar
new file mode 100644
index 0000000..4673346
Binary files /dev/null and b/lib/xml-apis.jar differ
diff --git a/misc/jalopy.xml b/misc/jalopy.xml
new file mode 100644
index 0000000..03ba99e
--- /dev/null
+++ b/misc/jalopy.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
+<jalopy>
+<internal>
+<version>6</version>
+</internal>
+<printer>
+<blanklines>
+<after>
+<header>1</header>
+<lastImport>1</lastImport>
+</after>
+</blanklines>
+<comments>
+<javadoc>
+<generate>
+<class>1</class>
+</generate>
+<templates>
+<class>/**
+ * @author $author$
+*/</class>
+<interface>/**
+ * @author $author$
+*/</interface>
+</templates>
+</javadoc>
+<remove>
+<singleline>true</singleline>
+</remove>
+</comments>
+<header>
+<text>/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */</text>
+<use>true</use>
+</header>
+<indentation>
+<sizes>
+<braceRightAfter>0</braceRightAfter>
+<tabs>4</tabs>
+</sizes>
+<tabs>
+<enable>true</enable>
+</tabs>
+</indentation>
+<misc>
+<insertTrailingNewline>false</insertTrailingNewline>
+</misc>
+<sorting>
+<declaration>
+<enable>false</enable>
+</declaration>
+</sorting>
+<whitespace>
+<after>
+<typeCast>false</typeCast>
+</after>
+</whitespace>
+<wrapping>
+<always>
+<after>
+<braceRight>true</braceRight>
+</after>
+</always>
+</wrapping>
+</printer>
+</jalopy>
\ No newline at end of file
diff --git a/osgi/lib/plugin/bnd-repository.jar b/osgi/lib/plugin/bnd-repository.jar
new file mode 100644
index 0000000..944ae0d
Binary files /dev/null and b/osgi/lib/plugin/bnd-repository.jar differ
diff --git a/portlets/build-common-alloy-portlet.xml b/portlets/build-common-alloy-portlet.xml
new file mode 100644
index 0000000..aa5aec6
--- /dev/null
+++ b/portlets/build-common-alloy-portlet.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-alloy-portlet">
+	<import file="build-common-portlet.xml" />
+
+	<target name="test-jsp">
+		<compile-jsp
+			compile.jsp.delete.generated.files="false"
+			compile.jsp.docroot.dir="docroot"
+		/>
+
+		<path id="jsp.test.classpath">
+			<fileset dir="${app.server.dir}/lib" />
+			<path refid="test.classpath" />
+			<pathelement location="${compile.jsp.jspc.dir}/classes"/>
+		</path>
+
+		<test-unit
+			module.dir="${basedir}"
+			test.classpathref="jsp.test.classpath"
+		/>
+
+		<delete dir="${compile.jsp.jspc.dir}" quiet="true" />
+	</target>
+</project>
\ No newline at end of file
diff --git a/portlets/build-common-portlet.xml b/portlets/build-common-portlet.xml
new file mode 100644
index 0000000..cfaaabc
--- /dev/null
+++ b/portlets/build-common-portlet.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-portlet">
+	<import file="../build-common-plugin.xml" />
+</project>
\ No newline at end of file
diff --git a/portlets/build.xml b/portlets/build.xml
new file mode 100644
index 0000000..a235541
--- /dev/null
+++ b/portlets/build.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="portlets" basedir="." default="deploy" xmlns:antelope="antlib:ise.antelope.tasks">
+	<import file="../build-common-plugins.xml" />
+
+	<target name="create">
+		<if>
+			<or>
+				<not>
+					<isset property="portlet.display.name" />
+				</not>
+				<not>
+					<isset property="portlet.name" />
+				</not>
+			</or>
+			<then>
+				<fail>This task must be called by the create script.</fail>
+			</then>
+		</if>
+
+		<property name="portlet.parent.dir" value="${user.dir}" />
+		<property name="portlet.dir" value="${portlet.parent.dir}/${portlet.name}-portlet" />
+
+		<if>
+			<available file="${portlet.dir}" />
+			<then>
+				<fail>${portlet.dir} already exists.</fail>
+			</then>
+		</if>
+
+		<copy todir="${portlet.dir}">
+			<fileset
+				dir="${sdk.dir}/tools/templates/portlet_tmpl"
+			/>
+		</copy>
+
+		<antelope:stringutil string="${portlet.display.name}" property="portlet.java.class.name">
+			<antelope:replace regex="\s+" replacement="" />
+			<antelope:trim />
+		</antelope:stringutil>
+
+		<antelope:stringutil string="${portlet.name}" property="portlet.java.package.name">
+			<antelope:replace regex="-" replacement="" />
+			<antelope:trim />
+		</antelope:stringutil>
+
+		<if>
+			<not>
+				<or>
+					<not>
+						<isset property="portlet.framework" />
+					</not>
+					<equals arg1="${portlet.framework}" arg2="" />
+					<equals arg1="${portlet.framework}" arg2="mvc" />
+				</or>
+			</not>
+			<then>
+				<if>
+					<or>
+						<equals arg1="${portlet.framework}" arg2="icefaces" />
+						<equals arg1="${portlet.framework}" arg2="liferay_faces_alloy" />
+						<equals arg1="${portlet.framework}" arg2="primefaces" />
+						<equals arg1="${portlet.framework}" arg2="richfaces" />
+					</or>
+					<then>
+						<copy todir="${portlet.dir}">
+							<fileset
+								dir="${sdk.dir}/tools/templates/portlet_jsf_tmpl"
+							/>
+						</copy>
+					</then>
+				</if>
+
+				<copy overwrite="true" todir="${portlet.dir}">
+					<fileset
+						dir="${sdk.dir}/tools/templates/portlet_${portlet.framework}_tmpl"
+					/>
+				</copy>
+			</then>
+		</if>
+
+		<if>
+			<or>
+				<equals arg1="${portlet.framework}" arg2="icefaces" />
+				<equals arg1="${portlet.framework}" arg2="jsf" />
+				<equals arg1="${portlet.framework}" arg2="liferay_faces_alloy" />
+				<equals arg1="${portlet.framework}" arg2="primefaces" />
+				<equals arg1="${portlet.framework}" arg2="richfaces" />
+			</or>
+			<then>
+				<if>
+					<or>
+						<equals arg1="${portlet.framework}" arg2="jsf" />
+						<equals arg1="${portlet.framework}" arg2="liferay_faces_alloy" />
+						<equals arg1="${portlet.framework}" arg2="primefaces" />
+						<equals arg1="${portlet.framework}" arg2="richfaces" />
+					</or>
+					<then>
+						<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
+
+portal-dependency-jars=commons-beanutils.jar,commons-collections.jar,commons-digester.jar,commons-fileupload.jar,commons-io.jar,commons-lang.jar
+
+speed-filters-enabled=false
+						</echo>
+					</then>
+					<else>
+						<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
+
+portal-dependency-jars=commons-beanutils.jar,commons-collections.jar,commons-digester.jar,commons-lang.jar
+
+speed-filters-enabled=false
+						</echo>
+					</else>
+				</if>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/liferay-portlet.xml">
+					<replacetoken><![CDATA[</icon>]]></replacetoken>
+					<replacevalue><![CDATA[</icon>
+		<requires-namespaced-parameters>false</requires-namespaced-parameters>
+		<ajaxable>false</ajaxable>]]></replacevalue>
+				</replace>
+
+				<replaceregexp match="&lt;/header-portlet-css&gt;(.*)&lt;/footer-portlet-javascript&gt;" replace="&lt;/header-portlet-css&gt;" flags="s">
+					<fileset
+						dir="${portlet.dir}/docroot/WEB-INF"
+						includes="liferay-portlet.xml"
+					/>
+				</replaceregexp>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<portlet-class>com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet</portlet-class>]]></replacetoken>
+					<replacevalue><![CDATA[<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>]]></replacevalue>
+				</replace>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<name>view-template</name>]]></replacetoken>
+					<replacevalue><![CDATA[<name>javax.portlet.faces.defaultViewId.view</name>]]></replacevalue>
+				</replace>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<value>/view.jsp</value>]]></replacetoken>
+					<replacevalue><![CDATA[<value>/views/view.xhtml</value>]]></replacevalue>
+				</replace>
+
+				<delete includeemptydirs="true">
+					<fileset
+						dir="${portlet.dir}/docroot"
+						includes="js/**,view.jsp"
+					/>
+				</delete>
+			</then>
+		</if>
+
+		<if>
+			<equals arg1="${portlet.framework}" arg2="spring_mvc" />
+			<then>
+				<move
+					file="${portlet.dir}/docroot/WEB-INF/jsp/view.jsp"
+					tofile="${portlet.dir}/docroot/WEB-INF/jsp/${portlet.name}/view.jsp"
+				/>
+
+				<move
+					file="${portlet.dir}/docroot/WEB-INF/spring-context/portlet-context.xml"
+					tofile="${portlet.dir}/docroot/WEB-INF/spring-context/portlet/${portlet.name}-portlet.xml"
+				/>
+
+				<move
+					file="${portlet.dir}/docroot/WEB-INF/src/PortletViewController.java"
+					tofile="${portlet.dir}/docroot/WEB-INF/src/${portlet.java.package.name}/${portlet.java.class.name}PortletViewController.java"
+				/>
+
+				<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
+
+portal-dependency-jars=aopalliance.jar,commons-logging.jar,jstl-api.jar,jstl-impl.jar,spring-aop.jar,spring-beans.jar,spring-context.jar,spring-core.jar,spring-expression.jar,spring-web.jar,spring-webmvc.jar,spring-webmvc-portlet.jar</echo>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/liferay-portlet.xml">
+					<replacetoken><![CDATA[</icon>]]></replacetoken>
+					<replacevalue><![CDATA[</icon>
+		<requires-namespaced-parameters>false</requires-namespaced-parameters>]]></replacevalue>
+				</replace>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<portlet-class>com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet</portlet-class>]]></replacetoken>
+					<replacevalue><![CDATA[<portlet-class>org.springframework.web.portlet.DispatcherPortlet</portlet-class>]]></replacevalue>
+				</replace>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<name>view-template</name>]]></replacetoken>
+					<replacevalue><![CDATA[<name>contextConfigLocation</name>]]></replacevalue>
+				</replace>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<value>/view.jsp</value>]]></replacetoken>
+					<replacevalue><![CDATA[<value>/WEB-INF/spring-context/portlet/@portlet.name@-portlet.xml</value>]]></replacevalue>
+				</replace>
+
+				<delete includeemptydirs="true">
+					<fileset
+						dir="${portlet.dir}/docroot"
+						includes="view.jsp"
+					/>
+				</delete>
+			</then>
+		</if>
+
+		<if>
+			<equals arg1="${portlet.framework}" arg2="vaadin" />
+			<then>
+				<move
+					file="${portlet.dir}/docroot/WEB-INF/src/Application.java"
+					tofile="${portlet.dir}/docroot/WEB-INF/src/${portlet.java.package.name}/${portlet.java.class.name}Application.java"
+				/>
+
+				<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
+
+portal-dependency-jars=vaadin.jar</echo>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<portlet-class>com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet</portlet-class>]]></replacetoken>
+					<replacevalue><![CDATA[<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>]]></replacevalue>
+				</replace>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<name>view-template</name>]]></replacetoken>
+					<replacevalue><![CDATA[<name>application</name>]]></replacevalue>
+				</replace>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/portlet.xml">
+					<replacetoken><![CDATA[<value>/view.jsp</value>]]></replacetoken>
+					<replacevalue><![CDATA[<value>@portlet.java.package.name@.@portlet.java.class.name@Application</value>]]></replacevalue>
+				</replace>
+
+				<replaceregexp match="&lt;/icon&gt;(.*)&lt;/footer-portlet-javascript&gt;" replace="&lt;/icon&gt;" flags="s">
+					<fileset
+						dir="${portlet.dir}/docroot/WEB-INF"
+						includes="liferay-portlet.xml"
+					/>
+				</replaceregexp>
+
+				<replace file="${portlet.dir}/docroot/WEB-INF/liferay-portlet.xml">
+					<replacetoken><![CDATA[</icon>]]></replacetoken>
+					<replacevalue><![CDATA[</icon>
+		<requires-namespaced-parameters>false</requires-namespaced-parameters>
+		<ajaxable>false</ajaxable>]]></replacevalue>
+				</replace>
+
+				<delete includeemptydirs="true">
+					<fileset
+						dir="${portlet.dir}/docroot"
+						includes="css/**,js/**,view.jsp"
+					/>
+				</delete>
+			</then>
+		</if>
+
+		<replace dir="${portlet.dir}">
+			<replacefilter token="@app.server.tomcat.manager.password@" value="${app.server.tomcat.manager.password}" />
+			<replacefilter token="@app.server.tomcat.manager.user@" value="${app.server.tomcat.manager.user}" />
+			<replacefilter token="@jmx.remote.port@" value="${jmx.remote.port}" />
+			<replacefilter token="@plugin.type.dir@" value="${plugin.type.dir}" />
+			<replacefilter token="@portlet.display.name@" value="${portlet.display.name}" />
+			<replacefilter token="@portlet.java.class.name@" value="${portlet.java.class.name}" />
+			<replacefilter token="@portlet.java.package.name@" value="${portlet.java.package.name}" />
+			<replacefilter token="@portlet.name@" value="${portlet.name}" />
+		</replace>
+
+		<mkdir dir="${portlet.dir}/docroot/WEB-INF/tld" />
+
+		<copy todir="${portlet.dir}/docroot/WEB-INF/tld">
+			<fileset dir="${app.server.portal.dir}/WEB-INF/tld">
+				<include name="aui.tld" />
+				<include name="liferay-portlet.tld" />
+				<include name="liferay-portlet-ext.tld" />
+				<include name="liferay-security.tld" />
+				<include name="liferay-theme.tld" />
+				<include name="liferay-ui.tld" />
+				<include name="liferay-util.tld" />
+			</fileset>
+		</copy>
+	</target>
+</project>
diff --git a/portlets/create.bat b/portlets/create.bat
new file mode 100644
index 0000000..baaa1a7
--- /dev/null
+++ b/portlets/create.bat
@@ -0,0 +1,33 @@
+@echo off
+
+if "" == "%1" goto errorCreate
+
+if "" == "%2" goto errorCreate
+
+if "" == "%3" set PORTLET_FRAMEWORK=mvc
+if not "" == "%3" set PORTLET_FRAMEWORK=%3
+
+call ant -Dportlet.name=%1 -Dportlet.display.name=%2 -Dportlet.framework=%PORTLET_FRAMEWORK% create
+
+rem call ant deploy
+
+goto end
+
+:errorCreate
+	echo.
+	echo Usage: create.bat hello-world "Hello World"
+	echo.
+	echo The first hello-world is your portlet id. A new directory will be created based
+	echo on the portlet id.
+	echo.
+	echo The second "Hello World" is the portlet's display name. The quotation marks are
+	echo only needed because there is a space in the display name.
+	echo.
+	echo A third value can be passed to specify the portlet framework to use. Valid
+	echo values are "jsf", "icefaces", "liferay_faces_alloy", "mvc", "primefaces",
+	echo "richfaces", "spring_mvc", or "vaadin". The default value is "mvc". The
+	echo quotation marks are not needed.
+
+	goto end
+
+:end
\ No newline at end of file
diff --git a/portlets/create.sh b/portlets/create.sh
new file mode 100644
index 0000000..4e41fb8
--- /dev/null
+++ b/portlets/create.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#set -x
+
+if [ $# -lt 2 ]; then
+	echo
+	echo Usage: ./create.sh hello-world \"Hello World\"
+	echo
+	echo The first hello-world is your portlet id. A new directory will be created based
+	echo on the portlet id.
+	echo
+	echo The second \"Hello World\" is the portlet\'s display name. The quotation marks are
+	echo only needed because there is a space in the display name.
+	echo
+	echo A third value can be passed to specify the portlet framework to use. Valid
+	echo values are \"jsf\", \"icefaces\", \"liferay_faces_alloy\", \"mvc\", \"primefaces\",
+	echo \"richfaces\", \"spring_mvc\", or \"vaadin\". The default value is \"mvc\". The
+	echo quotation marks are not needed.
+
+	exit 127
+fi
+
+ant -Dportlet.name=$1 -Dportlet.display.name=\"$2\" -Dportlet.framework=$3 create
+
+#ant deploy
+
+exit 0
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/.classpath b/portlets/sicilia-login-portlet/.classpath
new file mode 100644
index 0000000..2dcb5cc
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
+	<classpathentry kind="src" path="docroot/WEB-INF/service"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.liferay.ide.eclipse.server.tomcat.runtimeClasspathProvider/Liferay v6.2 CE (Tomcat 7)">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="com.liferay.ide.eclipse.server.plugin.container/portlet">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=sicilia-login-portlet&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bliferay_sdk_dir%3Asicilia-login-portlet%7D%2Fivy-settings.xml&amp;loadSettingsOnDemand=false&amp;ivyUserDir=%24%7Bliferay_sdk_dir%3Asicilia-login-portlet%7D%2F.ivy&amp;propertyFiles=">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
+</classpath>
diff --git a/portlets/sicilia-login-portlet/.project b/portlets/sicilia-login-portlet/.project
new file mode 100644
index 0000000..3c9468f
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.project
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sicilia-login-portlet</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1669365750355</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/portlets/sicilia-login-portlet/.settings/.jsdtscope b/portlets/sicilia-login-portlet/.settings/.jsdtscope
new file mode 100644
index 0000000..840a01d
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="docroot"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/portlets/sicilia-login-portlet/.settings/org.eclipse.jdt.core.prefs b/portlets/sicilia-login-portlet/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/portlets/sicilia-login-portlet/.settings/org.eclipse.jst.jsp.core.prefs b/portlets/sicilia-login-portlet/.settings/org.eclipse.jst.jsp.core.prefs
new file mode 100644
index 0000000..3a5c98d
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/org.eclipse.jst.jsp.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+validateFragments=false
+validation.use-project-settings=true
diff --git a/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.component b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..4b5261c
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="sicilia-login-portlet">
+        <wb-resource deploy-path="/" source-path="/docroot" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/docroot/WEB-INF/service"/>
+        <property name="context-root" value="sicilia-login-portlet"/>
+        <property name="java-output-path" value="/sicilia-login-portlet/docroot/WEB-INF/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..500dfcc
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+<root>
+  <facet id="liferay.portlet">
+    <node name="libprov">
+      <attribute name="provider-id" value="com.liferay.ide.eclipse.plugin.portlet.libraryProvider"/>
+    </node>
+  </facet>
+</root>
diff --git a/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..b0264db
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Liferay v6.2 CE (Tomcat 7)"/>
+  <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="liferay.portlet" version="6.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.container b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.name b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/.tern-project b/portlets/sicilia-login-portlet/.tern-project
new file mode 100644
index 0000000..a185ba0
--- /dev/null
+++ b/portlets/sicilia-login-portlet/.tern-project
@@ -0,0 +1 @@
+{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/build.xml b/portlets/sicilia-login-portlet/build.xml
new file mode 100644
index 0000000..28b5809
--- /dev/null
+++ b/portlets/sicilia-login-portlet/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="sicilia-login-portlet" basedir="." default="deploy">
+	<import file="../build-common-portlet.xml" />
+</project>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/META-INF/MANIFEST.MF b/portlets/sicilia-login-portlet/docroot/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/.gitignore b/portlets/sicilia-login-portlet/docroot/WEB-INF/.gitignore
new file mode 100644
index 0000000..840e7d3
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/.gitignore
@@ -0,0 +1 @@
+/classes/
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/lib/commons-codec.jar b/portlets/sicilia-login-portlet/docroot/WEB-INF/lib/commons-codec.jar
new file mode 100644
index 0000000..1d7417c
Binary files /dev/null and b/portlets/sicilia-login-portlet/docroot/WEB-INF/lib/commons-codec.jar differ
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-display.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-display.xml
new file mode 100644
index 0000000..13b1cbc
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-display.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
+
+<display>
+	<category name="category.hidden">
+		<portlet id="configurazione-sicilia-login" />
+	</category>
+</display>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-hook.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-hook.xml
new file mode 100644
index 0000000..812685c
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-hook.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
+<hook>
+	<portal-properties>portal.properties</portal-properties>
+</hook>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..d5caeca
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,13 @@
+name=Sicilia Login Portlet
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Manifattura Web Group s.r.l.
+licenses=LGPL
+liferay-versions=6.2.0+
+portal-dependency-tlds=c.tld
+portal-dependency-jars=jstl-impl.jar
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-portlet.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-portlet.xml
new file mode 100644
index 0000000..7884cc2
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/liferay-portlet.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
+
+<liferay-portlet-app>
+	<portlet>
+		<portlet-name>configurazione-sicilia-login</portlet-name>
+		<icon>/icon.png</icon>
+		<control-panel-entry-category>configuration</control-panel-entry-category>
+		<control-panel-entry-weight>1.2</control-panel-entry-weight>
+	</portlet>
+	<role-mapper>
+		<role-name>administrator</role-name>
+		<role-link>Administrator</role-link>
+	</role-mapper>
+	<role-mapper>
+		<role-name>guest</role-name>
+		<role-link>Guest</role-link>
+	</role-mapper>
+	<role-mapper>
+		<role-name>power-user</role-name>
+		<role-link>Power User</role-link>
+	</role-mapper>
+	<role-mapper>
+		<role-name>user</role-name>
+		<role-link>User</role-link>
+	</role-mapper>
+</liferay-portlet-app>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/portlet.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/portlet.xml
new file mode 100644
index 0000000..0db3cf0
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/portlet.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+	version="2.0">
+	
+	<portlet>
+		<portlet-name>configurazione-sicilia-login</portlet-name>
+		<display-name>Configurazione Login Hook</display-name>
+		<portlet-class>it.mwg.sicilia.login.portlet.ConfigurazioneLogin</portlet-class>
+		<init-param>
+			<name>view-template</name>
+			<value>/html/configurazione/view.jsp</value>
+		</init-param>
+		<expiration-cache>0</expiration-cache>
+		<supports>
+			<mime-type>text/html</mime-type>
+			<portlet-mode>view</portlet-mode>
+		</supports>
+		<resource-bundle>content.Language</resource-bundle>
+		<portlet-info>
+			<title>Sicilia Login Portlet</title>
+			<short-title>Sicilia Login Portlet</short-title>
+			<keywords></keywords>
+		</portlet-info>
+		<security-role-ref>
+			<role-name>administrator</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>guest</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>power-user</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>user</role-name>
+		</security-role-ref>
+	</portlet>
+</portlet-app>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/service.xml
new file mode 100644
index 0000000..8ee3b27
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.1.0//EN"
+		"http://www.liferay.com/dtd/liferay-service-builder_6_1_0.dtd">
+<service-builder package-path="it.mwg.sicilia.login">
+	<author>Manifattura Web Group s.r.l.</author>
+	<namespace>sicilia_login</namespace>
+	<entity name="Configurazione" local-service="true" remote-service="false">
+		<column name="configurazioneId" type="long" primary="true" />
+		<column name="nome" type="String" />
+		<column name="valore" type="String" />
+		<column name="companyId" type="long" />
+		<column name="userId" type="long" />
+		<column name="userName" type="String" />
+		<column name="createDate" type="Date" />
+		<column name="modifiedDate" type="Date" />
+
+		<finder return-type="Collection" name="CompanyId">
+			<finder-column name="companyId" />
+		</finder>
+
+		<finder return-type="Configurazione" name="CompanyId_Nome" unique="true">
+			<finder-column name="companyId" />
+			<finder-column name="nome" />
+		</finder>
+	</entity>
+</service-builder>
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/NoSuchConfigurazioneException.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/NoSuchConfigurazioneException.java
new file mode 100644
index 0000000..4c12eb7
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/NoSuchConfigurazioneException.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login;
+
+import com.liferay.portal.NoSuchModelException;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ */
+public class NoSuchConfigurazioneException extends NoSuchModelException {
+
+	public NoSuchConfigurazioneException() {
+		super();
+	}
+
+	public NoSuchConfigurazioneException(String msg) {
+		super(msg);
+	}
+
+	public NoSuchConfigurazioneException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+
+	public NoSuchConfigurazioneException(Throwable cause) {
+		super(cause);
+	}
+
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/Configurazione.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/Configurazione.java
new file mode 100644
index 0000000..27b9849
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/Configurazione.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model;
+
+import com.liferay.portal.model.PersistedModel;
+
+/**
+ * The extended model interface for the Configurazione service. Represents a row in the &quot;sicilia_login_Configurazione&quot; database table, with each column mapped to a property of this class.
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazioneModel
+ * @see it.mwg.sicilia.login.model.impl.ConfigurazioneImpl
+ * @see it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl
+ * @generated
+ */
+public interface Configurazione extends ConfigurazioneModel, PersistedModel {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify this interface directly. Add methods to {@link it.mwg.sicilia.login.model.impl.ConfigurazioneImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
+	 */
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneClp.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneClp.java
new file mode 100644
index 0000000..16d2475
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneClp.java
@@ -0,0 +1,547 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model;
+
+import com.liferay.portal.kernel.bean.AutoEscapeBeanHandler;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.util.ProxyUtil;
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.model.BaseModel;
+import com.liferay.portal.model.impl.BaseModelImpl;
+import com.liferay.portal.util.PortalUtil;
+
+import it.mwg.sicilia.login.service.ClpSerializer;
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+import java.io.Serializable;
+
+import java.lang.reflect.Method;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ */
+public class ConfigurazioneClp extends BaseModelImpl<Configurazione>
+	implements Configurazione {
+	public ConfigurazioneClp() {
+	}
+
+	@Override
+	public Class<?> getModelClass() {
+		return Configurazione.class;
+	}
+
+	@Override
+	public String getModelClassName() {
+		return Configurazione.class.getName();
+	}
+
+	@Override
+	public long getPrimaryKey() {
+		return _configurazioneId;
+	}
+
+	@Override
+	public void setPrimaryKey(long primaryKey) {
+		setConfigurazioneId(primaryKey);
+	}
+
+	@Override
+	public Serializable getPrimaryKeyObj() {
+		return _configurazioneId;
+	}
+
+	@Override
+	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
+		setPrimaryKey(((Long)primaryKeyObj).longValue());
+	}
+
+	@Override
+	public Map<String, Object> getModelAttributes() {
+		Map<String, Object> attributes = new HashMap<String, Object>();
+
+		attributes.put("configurazioneId", getConfigurazioneId());
+		attributes.put("nome", getNome());
+		attributes.put("valore", getValore());
+		attributes.put("companyId", getCompanyId());
+		attributes.put("userId", getUserId());
+		attributes.put("userName", getUserName());
+		attributes.put("createDate", getCreateDate());
+		attributes.put("modifiedDate", getModifiedDate());
+
+		return attributes;
+	}
+
+	@Override
+	public void setModelAttributes(Map<String, Object> attributes) {
+		Long configurazioneId = (Long)attributes.get("configurazioneId");
+
+		if (configurazioneId != null) {
+			setConfigurazioneId(configurazioneId);
+		}
+
+		String nome = (String)attributes.get("nome");
+
+		if (nome != null) {
+			setNome(nome);
+		}
+
+		String valore = (String)attributes.get("valore");
+
+		if (valore != null) {
+			setValore(valore);
+		}
+
+		Long companyId = (Long)attributes.get("companyId");
+
+		if (companyId != null) {
+			setCompanyId(companyId);
+		}
+
+		Long userId = (Long)attributes.get("userId");
+
+		if (userId != null) {
+			setUserId(userId);
+		}
+
+		String userName = (String)attributes.get("userName");
+
+		if (userName != null) {
+			setUserName(userName);
+		}
+
+		Date createDate = (Date)attributes.get("createDate");
+
+		if (createDate != null) {
+			setCreateDate(createDate);
+		}
+
+		Date modifiedDate = (Date)attributes.get("modifiedDate");
+
+		if (modifiedDate != null) {
+			setModifiedDate(modifiedDate);
+		}
+	}
+
+	@Override
+	public long getConfigurazioneId() {
+		return _configurazioneId;
+	}
+
+	@Override
+	public void setConfigurazioneId(long configurazioneId) {
+		_configurazioneId = configurazioneId;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setConfigurazioneId",
+						long.class);
+
+				method.invoke(_configurazioneRemoteModel, configurazioneId);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public String getNome() {
+		return _nome;
+	}
+
+	@Override
+	public void setNome(String nome) {
+		_nome = nome;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setNome", String.class);
+
+				method.invoke(_configurazioneRemoteModel, nome);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public String getValore() {
+		return _valore;
+	}
+
+	@Override
+	public void setValore(String valore) {
+		_valore = valore;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setValore", String.class);
+
+				method.invoke(_configurazioneRemoteModel, valore);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public long getCompanyId() {
+		return _companyId;
+	}
+
+	@Override
+	public void setCompanyId(long companyId) {
+		_companyId = companyId;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setCompanyId", long.class);
+
+				method.invoke(_configurazioneRemoteModel, companyId);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public long getUserId() {
+		return _userId;
+	}
+
+	@Override
+	public void setUserId(long userId) {
+		_userId = userId;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setUserId", long.class);
+
+				method.invoke(_configurazioneRemoteModel, userId);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public String getUserUuid() throws SystemException {
+		return PortalUtil.getUserValue(getUserId(), "uuid", _userUuid);
+	}
+
+	@Override
+	public void setUserUuid(String userUuid) {
+		_userUuid = userUuid;
+	}
+
+	@Override
+	public String getUserName() {
+		return _userName;
+	}
+
+	@Override
+	public void setUserName(String userName) {
+		_userName = userName;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setUserName", String.class);
+
+				method.invoke(_configurazioneRemoteModel, userName);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public Date getCreateDate() {
+		return _createDate;
+	}
+
+	@Override
+	public void setCreateDate(Date createDate) {
+		_createDate = createDate;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setCreateDate", Date.class);
+
+				method.invoke(_configurazioneRemoteModel, createDate);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	@Override
+	public Date getModifiedDate() {
+		return _modifiedDate;
+	}
+
+	@Override
+	public void setModifiedDate(Date modifiedDate) {
+		_modifiedDate = modifiedDate;
+
+		if (_configurazioneRemoteModel != null) {
+			try {
+				Class<?> clazz = _configurazioneRemoteModel.getClass();
+
+				Method method = clazz.getMethod("setModifiedDate", Date.class);
+
+				method.invoke(_configurazioneRemoteModel, modifiedDate);
+			}
+			catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		}
+	}
+
+	public BaseModel<?> getConfigurazioneRemoteModel() {
+		return _configurazioneRemoteModel;
+	}
+
+	public void setConfigurazioneRemoteModel(
+		BaseModel<?> configurazioneRemoteModel) {
+		_configurazioneRemoteModel = configurazioneRemoteModel;
+	}
+
+	public Object invokeOnRemoteModel(String methodName,
+		Class<?>[] parameterTypes, Object[] parameterValues)
+		throws Exception {
+		Object[] remoteParameterValues = new Object[parameterValues.length];
+
+		for (int i = 0; i < parameterValues.length; i++) {
+			if (parameterValues[i] != null) {
+				remoteParameterValues[i] = ClpSerializer.translateInput(parameterValues[i]);
+			}
+		}
+
+		Class<?> remoteModelClass = _configurazioneRemoteModel.getClass();
+
+		ClassLoader remoteModelClassLoader = remoteModelClass.getClassLoader();
+
+		Class<?>[] remoteParameterTypes = new Class[parameterTypes.length];
+
+		for (int i = 0; i < parameterTypes.length; i++) {
+			if (parameterTypes[i].isPrimitive()) {
+				remoteParameterTypes[i] = parameterTypes[i];
+			}
+			else {
+				String parameterTypeName = parameterTypes[i].getName();
+
+				remoteParameterTypes[i] = remoteModelClassLoader.loadClass(parameterTypeName);
+			}
+		}
+
+		Method method = remoteModelClass.getMethod(methodName,
+				remoteParameterTypes);
+
+		Object returnValue = method.invoke(_configurazioneRemoteModel,
+				remoteParameterValues);
+
+		if (returnValue != null) {
+			returnValue = ClpSerializer.translateOutput(returnValue);
+		}
+
+		return returnValue;
+	}
+
+	@Override
+	public void persist() throws SystemException {
+		if (this.isNew()) {
+			ConfigurazioneLocalServiceUtil.addConfigurazione(this);
+		}
+		else {
+			ConfigurazioneLocalServiceUtil.updateConfigurazione(this);
+		}
+	}
+
+	@Override
+	public Configurazione toEscapedModel() {
+		return (Configurazione)ProxyUtil.newProxyInstance(Configurazione.class.getClassLoader(),
+			new Class[] { Configurazione.class },
+			new AutoEscapeBeanHandler(this));
+	}
+
+	@Override
+	public Object clone() {
+		ConfigurazioneClp clone = new ConfigurazioneClp();
+
+		clone.setConfigurazioneId(getConfigurazioneId());
+		clone.setNome(getNome());
+		clone.setValore(getValore());
+		clone.setCompanyId(getCompanyId());
+		clone.setUserId(getUserId());
+		clone.setUserName(getUserName());
+		clone.setCreateDate(getCreateDate());
+		clone.setModifiedDate(getModifiedDate());
+
+		return clone;
+	}
+
+	@Override
+	public int compareTo(Configurazione configurazione) {
+		long primaryKey = configurazione.getPrimaryKey();
+
+		if (getPrimaryKey() < primaryKey) {
+			return -1;
+		}
+		else if (getPrimaryKey() > primaryKey) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+
+		if (!(obj instanceof ConfigurazioneClp)) {
+			return false;
+		}
+
+		ConfigurazioneClp configurazione = (ConfigurazioneClp)obj;
+
+		long primaryKey = configurazione.getPrimaryKey();
+
+		if (getPrimaryKey() == primaryKey) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	public Class<?> getClpSerializerClass() {
+		return _clpSerializerClass;
+	}
+
+	@Override
+	public int hashCode() {
+		return (int)getPrimaryKey();
+	}
+
+	@Override
+	public String toString() {
+		StringBundler sb = new StringBundler(17);
+
+		sb.append("{configurazioneId=");
+		sb.append(getConfigurazioneId());
+		sb.append(", nome=");
+		sb.append(getNome());
+		sb.append(", valore=");
+		sb.append(getValore());
+		sb.append(", companyId=");
+		sb.append(getCompanyId());
+		sb.append(", userId=");
+		sb.append(getUserId());
+		sb.append(", userName=");
+		sb.append(getUserName());
+		sb.append(", createDate=");
+		sb.append(getCreateDate());
+		sb.append(", modifiedDate=");
+		sb.append(getModifiedDate());
+		sb.append("}");
+
+		return sb.toString();
+	}
+
+	@Override
+	public String toXmlString() {
+		StringBundler sb = new StringBundler(28);
+
+		sb.append("<model><model-name>");
+		sb.append("it.mwg.sicilia.login.model.Configurazione");
+		sb.append("</model-name>");
+
+		sb.append(
+			"<column><column-name>configurazioneId</column-name><column-value><![CDATA[");
+		sb.append(getConfigurazioneId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>nome</column-name><column-value><![CDATA[");
+		sb.append(getNome());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>valore</column-name><column-value><![CDATA[");
+		sb.append(getValore());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>companyId</column-name><column-value><![CDATA[");
+		sb.append(getCompanyId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>userId</column-name><column-value><![CDATA[");
+		sb.append(getUserId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>userName</column-name><column-value><![CDATA[");
+		sb.append(getUserName());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>createDate</column-name><column-value><![CDATA[");
+		sb.append(getCreateDate());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>modifiedDate</column-name><column-value><![CDATA[");
+		sb.append(getModifiedDate());
+		sb.append("]]></column-value></column>");
+
+		sb.append("</model>");
+
+		return sb.toString();
+	}
+
+	private long _configurazioneId;
+	private String _nome;
+	private String _valore;
+	private long _companyId;
+	private long _userId;
+	private String _userUuid;
+	private String _userName;
+	private Date _createDate;
+	private Date _modifiedDate;
+	private BaseModel<?> _configurazioneRemoteModel;
+	private Class<?> _clpSerializerClass = it.mwg.sicilia.login.service.ClpSerializer.class;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneModel.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneModel.java
new file mode 100644
index 0000000..419b26c
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneModel.java
@@ -0,0 +1,264 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model;
+
+import com.liferay.portal.kernel.bean.AutoEscape;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.model.AuditedModel;
+import com.liferay.portal.model.BaseModel;
+import com.liferay.portal.model.CacheModel;
+import com.liferay.portal.service.ServiceContext;
+
+import com.liferay.portlet.expando.model.ExpandoBridge;
+
+import java.io.Serializable;
+
+import java.util.Date;
+
+/**
+ * The base model interface for the Configurazione service. Represents a row in the &quot;sicilia_login_Configurazione&quot; database table, with each column mapped to a property of this class.
+ *
+ * <p>
+ * This interface and its corresponding implementation {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link it.mwg.sicilia.login.model.impl.ConfigurazioneImpl}.
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see Configurazione
+ * @see it.mwg.sicilia.login.model.impl.ConfigurazioneImpl
+ * @see it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl
+ * @generated
+ */
+public interface ConfigurazioneModel extends AuditedModel,
+	BaseModel<Configurazione> {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this interface directly. All methods that expect a configurazione model instance should use the {@link Configurazione} interface instead.
+	 */
+
+	/**
+	 * Returns the primary key of this configurazione.
+	 *
+	 * @return the primary key of this configurazione
+	 */
+	public long getPrimaryKey();
+
+	/**
+	 * Sets the primary key of this configurazione.
+	 *
+	 * @param primaryKey the primary key of this configurazione
+	 */
+	public void setPrimaryKey(long primaryKey);
+
+	/**
+	 * Returns the configurazione ID of this configurazione.
+	 *
+	 * @return the configurazione ID of this configurazione
+	 */
+	public long getConfigurazioneId();
+
+	/**
+	 * Sets the configurazione ID of this configurazione.
+	 *
+	 * @param configurazioneId the configurazione ID of this configurazione
+	 */
+	public void setConfigurazioneId(long configurazioneId);
+
+	/**
+	 * Returns the nome of this configurazione.
+	 *
+	 * @return the nome of this configurazione
+	 */
+	@AutoEscape
+	public String getNome();
+
+	/**
+	 * Sets the nome of this configurazione.
+	 *
+	 * @param nome the nome of this configurazione
+	 */
+	public void setNome(String nome);
+
+	/**
+	 * Returns the valore of this configurazione.
+	 *
+	 * @return the valore of this configurazione
+	 */
+	@AutoEscape
+	public String getValore();
+
+	/**
+	 * Sets the valore of this configurazione.
+	 *
+	 * @param valore the valore of this configurazione
+	 */
+	public void setValore(String valore);
+
+	/**
+	 * Returns the company ID of this configurazione.
+	 *
+	 * @return the company ID of this configurazione
+	 */
+	@Override
+	public long getCompanyId();
+
+	/**
+	 * Sets the company ID of this configurazione.
+	 *
+	 * @param companyId the company ID of this configurazione
+	 */
+	@Override
+	public void setCompanyId(long companyId);
+
+	/**
+	 * Returns the user ID of this configurazione.
+	 *
+	 * @return the user ID of this configurazione
+	 */
+	@Override
+	public long getUserId();
+
+	/**
+	 * Sets the user ID of this configurazione.
+	 *
+	 * @param userId the user ID of this configurazione
+	 */
+	@Override
+	public void setUserId(long userId);
+
+	/**
+	 * Returns the user uuid of this configurazione.
+	 *
+	 * @return the user uuid of this configurazione
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public String getUserUuid() throws SystemException;
+
+	/**
+	 * Sets the user uuid of this configurazione.
+	 *
+	 * @param userUuid the user uuid of this configurazione
+	 */
+	@Override
+	public void setUserUuid(String userUuid);
+
+	/**
+	 * Returns the user name of this configurazione.
+	 *
+	 * @return the user name of this configurazione
+	 */
+	@AutoEscape
+	@Override
+	public String getUserName();
+
+	/**
+	 * Sets the user name of this configurazione.
+	 *
+	 * @param userName the user name of this configurazione
+	 */
+	@Override
+	public void setUserName(String userName);
+
+	/**
+	 * Returns the create date of this configurazione.
+	 *
+	 * @return the create date of this configurazione
+	 */
+	@Override
+	public Date getCreateDate();
+
+	/**
+	 * Sets the create date of this configurazione.
+	 *
+	 * @param createDate the create date of this configurazione
+	 */
+	@Override
+	public void setCreateDate(Date createDate);
+
+	/**
+	 * Returns the modified date of this configurazione.
+	 *
+	 * @return the modified date of this configurazione
+	 */
+	@Override
+	public Date getModifiedDate();
+
+	/**
+	 * Sets the modified date of this configurazione.
+	 *
+	 * @param modifiedDate the modified date of this configurazione
+	 */
+	@Override
+	public void setModifiedDate(Date modifiedDate);
+
+	@Override
+	public boolean isNew();
+
+	@Override
+	public void setNew(boolean n);
+
+	@Override
+	public boolean isCachedModel();
+
+	@Override
+	public void setCachedModel(boolean cachedModel);
+
+	@Override
+	public boolean isEscapedModel();
+
+	@Override
+	public Serializable getPrimaryKeyObj();
+
+	@Override
+	public void setPrimaryKeyObj(Serializable primaryKeyObj);
+
+	@Override
+	public ExpandoBridge getExpandoBridge();
+
+	@Override
+	public void setExpandoBridgeAttributes(BaseModel<?> baseModel);
+
+	@Override
+	public void setExpandoBridgeAttributes(ExpandoBridge expandoBridge);
+
+	@Override
+	public void setExpandoBridgeAttributes(ServiceContext serviceContext);
+
+	@Override
+	public Object clone();
+
+	@Override
+	public int compareTo(
+		it.mwg.sicilia.login.model.Configurazione configurazione);
+
+	@Override
+	public int hashCode();
+
+	@Override
+	public CacheModel<it.mwg.sicilia.login.model.Configurazione> toCacheModel();
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione toEscapedModel();
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione toUnescapedModel();
+
+	@Override
+	public String toString();
+
+	@Override
+	public String toXmlString();
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneSoap.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneSoap.java
new file mode 100644
index 0000000..492033e
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneSoap.java
@@ -0,0 +1,165 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model;
+
+import java.io.Serializable;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * This class is used by SOAP remote services.
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @generated
+ */
+public class ConfigurazioneSoap implements Serializable {
+	public static ConfigurazioneSoap toSoapModel(Configurazione model) {
+		ConfigurazioneSoap soapModel = new ConfigurazioneSoap();
+
+		soapModel.setConfigurazioneId(model.getConfigurazioneId());
+		soapModel.setNome(model.getNome());
+		soapModel.setValore(model.getValore());
+		soapModel.setCompanyId(model.getCompanyId());
+		soapModel.setUserId(model.getUserId());
+		soapModel.setUserName(model.getUserName());
+		soapModel.setCreateDate(model.getCreateDate());
+		soapModel.setModifiedDate(model.getModifiedDate());
+
+		return soapModel;
+	}
+
+	public static ConfigurazioneSoap[] toSoapModels(Configurazione[] models) {
+		ConfigurazioneSoap[] soapModels = new ConfigurazioneSoap[models.length];
+
+		for (int i = 0; i < models.length; i++) {
+			soapModels[i] = toSoapModel(models[i]);
+		}
+
+		return soapModels;
+	}
+
+	public static ConfigurazioneSoap[][] toSoapModels(Configurazione[][] models) {
+		ConfigurazioneSoap[][] soapModels = null;
+
+		if (models.length > 0) {
+			soapModels = new ConfigurazioneSoap[models.length][models[0].length];
+		}
+		else {
+			soapModels = new ConfigurazioneSoap[0][0];
+		}
+
+		for (int i = 0; i < models.length; i++) {
+			soapModels[i] = toSoapModels(models[i]);
+		}
+
+		return soapModels;
+	}
+
+	public static ConfigurazioneSoap[] toSoapModels(List<Configurazione> models) {
+		List<ConfigurazioneSoap> soapModels = new ArrayList<ConfigurazioneSoap>(models.size());
+
+		for (Configurazione model : models) {
+			soapModels.add(toSoapModel(model));
+		}
+
+		return soapModels.toArray(new ConfigurazioneSoap[soapModels.size()]);
+	}
+
+	public ConfigurazioneSoap() {
+	}
+
+	public long getPrimaryKey() {
+		return _configurazioneId;
+	}
+
+	public void setPrimaryKey(long pk) {
+		setConfigurazioneId(pk);
+	}
+
+	public long getConfigurazioneId() {
+		return _configurazioneId;
+	}
+
+	public void setConfigurazioneId(long configurazioneId) {
+		_configurazioneId = configurazioneId;
+	}
+
+	public String getNome() {
+		return _nome;
+	}
+
+	public void setNome(String nome) {
+		_nome = nome;
+	}
+
+	public String getValore() {
+		return _valore;
+	}
+
+	public void setValore(String valore) {
+		_valore = valore;
+	}
+
+	public long getCompanyId() {
+		return _companyId;
+	}
+
+	public void setCompanyId(long companyId) {
+		_companyId = companyId;
+	}
+
+	public long getUserId() {
+		return _userId;
+	}
+
+	public void setUserId(long userId) {
+		_userId = userId;
+	}
+
+	public String getUserName() {
+		return _userName;
+	}
+
+	public void setUserName(String userName) {
+		_userName = userName;
+	}
+
+	public Date getCreateDate() {
+		return _createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		_createDate = createDate;
+	}
+
+	public Date getModifiedDate() {
+		return _modifiedDate;
+	}
+
+	public void setModifiedDate(Date modifiedDate) {
+		_modifiedDate = modifiedDate;
+	}
+
+	private long _configurazioneId;
+	private String _nome;
+	private String _valore;
+	private long _companyId;
+	private long _userId;
+	private String _userName;
+	private Date _createDate;
+	private Date _modifiedDate;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneWrapper.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneWrapper.java
new file mode 100644
index 0000000..19b0b70
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/model/ConfigurazioneWrapper.java
@@ -0,0 +1,461 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model;
+
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.ModelWrapper;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * This class is a wrapper for {@link Configurazione}.
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see Configurazione
+ * @generated
+ */
+public class ConfigurazioneWrapper implements Configurazione,
+	ModelWrapper<Configurazione> {
+	public ConfigurazioneWrapper(Configurazione configurazione) {
+		_configurazione = configurazione;
+	}
+
+	@Override
+	public Class<?> getModelClass() {
+		return Configurazione.class;
+	}
+
+	@Override
+	public String getModelClassName() {
+		return Configurazione.class.getName();
+	}
+
+	@Override
+	public Map<String, Object> getModelAttributes() {
+		Map<String, Object> attributes = new HashMap<String, Object>();
+
+		attributes.put("configurazioneId", getConfigurazioneId());
+		attributes.put("nome", getNome());
+		attributes.put("valore", getValore());
+		attributes.put("companyId", getCompanyId());
+		attributes.put("userId", getUserId());
+		attributes.put("userName", getUserName());
+		attributes.put("createDate", getCreateDate());
+		attributes.put("modifiedDate", getModifiedDate());
+
+		return attributes;
+	}
+
+	@Override
+	public void setModelAttributes(Map<String, Object> attributes) {
+		Long configurazioneId = (Long)attributes.get("configurazioneId");
+
+		if (configurazioneId != null) {
+			setConfigurazioneId(configurazioneId);
+		}
+
+		String nome = (String)attributes.get("nome");
+
+		if (nome != null) {
+			setNome(nome);
+		}
+
+		String valore = (String)attributes.get("valore");
+
+		if (valore != null) {
+			setValore(valore);
+		}
+
+		Long companyId = (Long)attributes.get("companyId");
+
+		if (companyId != null) {
+			setCompanyId(companyId);
+		}
+
+		Long userId = (Long)attributes.get("userId");
+
+		if (userId != null) {
+			setUserId(userId);
+		}
+
+		String userName = (String)attributes.get("userName");
+
+		if (userName != null) {
+			setUserName(userName);
+		}
+
+		Date createDate = (Date)attributes.get("createDate");
+
+		if (createDate != null) {
+			setCreateDate(createDate);
+		}
+
+		Date modifiedDate = (Date)attributes.get("modifiedDate");
+
+		if (modifiedDate != null) {
+			setModifiedDate(modifiedDate);
+		}
+	}
+
+	/**
+	* Returns the primary key of this configurazione.
+	*
+	* @return the primary key of this configurazione
+	*/
+	@Override
+	public long getPrimaryKey() {
+		return _configurazione.getPrimaryKey();
+	}
+
+	/**
+	* Sets the primary key of this configurazione.
+	*
+	* @param primaryKey the primary key of this configurazione
+	*/
+	@Override
+	public void setPrimaryKey(long primaryKey) {
+		_configurazione.setPrimaryKey(primaryKey);
+	}
+
+	/**
+	* Returns the configurazione ID of this configurazione.
+	*
+	* @return the configurazione ID of this configurazione
+	*/
+	@Override
+	public long getConfigurazioneId() {
+		return _configurazione.getConfigurazioneId();
+	}
+
+	/**
+	* Sets the configurazione ID of this configurazione.
+	*
+	* @param configurazioneId the configurazione ID of this configurazione
+	*/
+	@Override
+	public void setConfigurazioneId(long configurazioneId) {
+		_configurazione.setConfigurazioneId(configurazioneId);
+	}
+
+	/**
+	* Returns the nome of this configurazione.
+	*
+	* @return the nome of this configurazione
+	*/
+	@Override
+	public java.lang.String getNome() {
+		return _configurazione.getNome();
+	}
+
+	/**
+	* Sets the nome of this configurazione.
+	*
+	* @param nome the nome of this configurazione
+	*/
+	@Override
+	public void setNome(java.lang.String nome) {
+		_configurazione.setNome(nome);
+	}
+
+	/**
+	* Returns the valore of this configurazione.
+	*
+	* @return the valore of this configurazione
+	*/
+	@Override
+	public java.lang.String getValore() {
+		return _configurazione.getValore();
+	}
+
+	/**
+	* Sets the valore of this configurazione.
+	*
+	* @param valore the valore of this configurazione
+	*/
+	@Override
+	public void setValore(java.lang.String valore) {
+		_configurazione.setValore(valore);
+	}
+
+	/**
+	* Returns the company ID of this configurazione.
+	*
+	* @return the company ID of this configurazione
+	*/
+	@Override
+	public long getCompanyId() {
+		return _configurazione.getCompanyId();
+	}
+
+	/**
+	* Sets the company ID of this configurazione.
+	*
+	* @param companyId the company ID of this configurazione
+	*/
+	@Override
+	public void setCompanyId(long companyId) {
+		_configurazione.setCompanyId(companyId);
+	}
+
+	/**
+	* Returns the user ID of this configurazione.
+	*
+	* @return the user ID of this configurazione
+	*/
+	@Override
+	public long getUserId() {
+		return _configurazione.getUserId();
+	}
+
+	/**
+	* Sets the user ID of this configurazione.
+	*
+	* @param userId the user ID of this configurazione
+	*/
+	@Override
+	public void setUserId(long userId) {
+		_configurazione.setUserId(userId);
+	}
+
+	/**
+	* Returns the user uuid of this configurazione.
+	*
+	* @return the user uuid of this configurazione
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public java.lang.String getUserUuid()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazione.getUserUuid();
+	}
+
+	/**
+	* Sets the user uuid of this configurazione.
+	*
+	* @param userUuid the user uuid of this configurazione
+	*/
+	@Override
+	public void setUserUuid(java.lang.String userUuid) {
+		_configurazione.setUserUuid(userUuid);
+	}
+
+	/**
+	* Returns the user name of this configurazione.
+	*
+	* @return the user name of this configurazione
+	*/
+	@Override
+	public java.lang.String getUserName() {
+		return _configurazione.getUserName();
+	}
+
+	/**
+	* Sets the user name of this configurazione.
+	*
+	* @param userName the user name of this configurazione
+	*/
+	@Override
+	public void setUserName(java.lang.String userName) {
+		_configurazione.setUserName(userName);
+	}
+
+	/**
+	* Returns the create date of this configurazione.
+	*
+	* @return the create date of this configurazione
+	*/
+	@Override
+	public java.util.Date getCreateDate() {
+		return _configurazione.getCreateDate();
+	}
+
+	/**
+	* Sets the create date of this configurazione.
+	*
+	* @param createDate the create date of this configurazione
+	*/
+	@Override
+	public void setCreateDate(java.util.Date createDate) {
+		_configurazione.setCreateDate(createDate);
+	}
+
+	/**
+	* Returns the modified date of this configurazione.
+	*
+	* @return the modified date of this configurazione
+	*/
+	@Override
+	public java.util.Date getModifiedDate() {
+		return _configurazione.getModifiedDate();
+	}
+
+	/**
+	* Sets the modified date of this configurazione.
+	*
+	* @param modifiedDate the modified date of this configurazione
+	*/
+	@Override
+	public void setModifiedDate(java.util.Date modifiedDate) {
+		_configurazione.setModifiedDate(modifiedDate);
+	}
+
+	@Override
+	public boolean isNew() {
+		return _configurazione.isNew();
+	}
+
+	@Override
+	public void setNew(boolean n) {
+		_configurazione.setNew(n);
+	}
+
+	@Override
+	public boolean isCachedModel() {
+		return _configurazione.isCachedModel();
+	}
+
+	@Override
+	public void setCachedModel(boolean cachedModel) {
+		_configurazione.setCachedModel(cachedModel);
+	}
+
+	@Override
+	public boolean isEscapedModel() {
+		return _configurazione.isEscapedModel();
+	}
+
+	@Override
+	public java.io.Serializable getPrimaryKeyObj() {
+		return _configurazione.getPrimaryKeyObj();
+	}
+
+	@Override
+	public void setPrimaryKeyObj(java.io.Serializable primaryKeyObj) {
+		_configurazione.setPrimaryKeyObj(primaryKeyObj);
+	}
+
+	@Override
+	public com.liferay.portlet.expando.model.ExpandoBridge getExpandoBridge() {
+		return _configurazione.getExpandoBridge();
+	}
+
+	@Override
+	public void setExpandoBridgeAttributes(
+		com.liferay.portal.model.BaseModel<?> baseModel) {
+		_configurazione.setExpandoBridgeAttributes(baseModel);
+	}
+
+	@Override
+	public void setExpandoBridgeAttributes(
+		com.liferay.portlet.expando.model.ExpandoBridge expandoBridge) {
+		_configurazione.setExpandoBridgeAttributes(expandoBridge);
+	}
+
+	@Override
+	public void setExpandoBridgeAttributes(
+		com.liferay.portal.service.ServiceContext serviceContext) {
+		_configurazione.setExpandoBridgeAttributes(serviceContext);
+	}
+
+	@Override
+	public java.lang.Object clone() {
+		return new ConfigurazioneWrapper((Configurazione)_configurazione.clone());
+	}
+
+	@Override
+	public int compareTo(
+		it.mwg.sicilia.login.model.Configurazione configurazione) {
+		return _configurazione.compareTo(configurazione);
+	}
+
+	@Override
+	public int hashCode() {
+		return _configurazione.hashCode();
+	}
+
+	@Override
+	public com.liferay.portal.model.CacheModel<it.mwg.sicilia.login.model.Configurazione> toCacheModel() {
+		return _configurazione.toCacheModel();
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione toEscapedModel() {
+		return new ConfigurazioneWrapper(_configurazione.toEscapedModel());
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione toUnescapedModel() {
+		return new ConfigurazioneWrapper(_configurazione.toUnescapedModel());
+	}
+
+	@Override
+	public java.lang.String toString() {
+		return _configurazione.toString();
+	}
+
+	@Override
+	public java.lang.String toXmlString() {
+		return _configurazione.toXmlString();
+	}
+
+	@Override
+	public void persist()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		_configurazione.persist();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+
+		if (!(obj instanceof ConfigurazioneWrapper)) {
+			return false;
+		}
+
+		ConfigurazioneWrapper configurazioneWrapper = (ConfigurazioneWrapper)obj;
+
+		if (Validator.equals(_configurazione,
+					configurazioneWrapper._configurazione)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @deprecated As of 6.1.0, replaced by {@link #getWrappedModel}
+	 */
+	public Configurazione getWrappedConfigurazione() {
+		return _configurazione;
+	}
+
+	@Override
+	public Configurazione getWrappedModel() {
+		return _configurazione;
+	}
+
+	@Override
+	public void resetOriginalValues() {
+		_configurazione.resetOriginalValues();
+	}
+
+	private Configurazione _configurazione;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ClpSerializer.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ClpSerializer.java
new file mode 100644
index 0000000..3dd26a7
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ClpSerializer.java
@@ -0,0 +1,289 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream;
+import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayOutputStream;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.ClassLoaderObjectInputStream;
+import com.liferay.portal.kernel.util.PropsUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.BaseModel;
+
+import it.mwg.sicilia.login.model.ConfigurazioneClp;
+
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import java.lang.reflect.Method;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ */
+public class ClpSerializer {
+	public static String getServletContextName() {
+		if (Validator.isNotNull(_servletContextName)) {
+			return _servletContextName;
+		}
+
+		synchronized (ClpSerializer.class) {
+			if (Validator.isNotNull(_servletContextName)) {
+				return _servletContextName;
+			}
+
+			try {
+				ClassLoader classLoader = ClpSerializer.class.getClassLoader();
+
+				Class<?> portletPropsClass = classLoader.loadClass(
+						"com.liferay.util.portlet.PortletProps");
+
+				Method getMethod = portletPropsClass.getMethod("get",
+						new Class<?>[] { String.class });
+
+				String portletPropsServletContextName = (String)getMethod.invoke(null,
+						"sicilia-login-portlet-deployment-context");
+
+				if (Validator.isNotNull(portletPropsServletContextName)) {
+					_servletContextName = portletPropsServletContextName;
+				}
+			}
+			catch (Throwable t) {
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"Unable to locate deployment context from portlet properties");
+				}
+			}
+
+			if (Validator.isNull(_servletContextName)) {
+				try {
+					String propsUtilServletContextName = PropsUtil.get(
+							"sicilia-login-portlet-deployment-context");
+
+					if (Validator.isNotNull(propsUtilServletContextName)) {
+						_servletContextName = propsUtilServletContextName;
+					}
+				}
+				catch (Throwable t) {
+					if (_log.isInfoEnabled()) {
+						_log.info(
+							"Unable to locate deployment context from portal properties");
+					}
+				}
+			}
+
+			if (Validator.isNull(_servletContextName)) {
+				_servletContextName = "sicilia-login-portlet";
+			}
+
+			return _servletContextName;
+		}
+	}
+
+	public static Object translateInput(BaseModel<?> oldModel) {
+		Class<?> oldModelClass = oldModel.getClass();
+
+		String oldModelClassName = oldModelClass.getName();
+
+		if (oldModelClassName.equals(ConfigurazioneClp.class.getName())) {
+			return translateInputConfigurazione(oldModel);
+		}
+
+		return oldModel;
+	}
+
+	public static Object translateInput(List<Object> oldList) {
+		List<Object> newList = new ArrayList<Object>(oldList.size());
+
+		for (int i = 0; i < oldList.size(); i++) {
+			Object curObj = oldList.get(i);
+
+			newList.add(translateInput(curObj));
+		}
+
+		return newList;
+	}
+
+	public static Object translateInputConfigurazione(BaseModel<?> oldModel) {
+		ConfigurazioneClp oldClpModel = (ConfigurazioneClp)oldModel;
+
+		BaseModel<?> newModel = oldClpModel.getConfigurazioneRemoteModel();
+
+		newModel.setModelAttributes(oldClpModel.getModelAttributes());
+
+		return newModel;
+	}
+
+	public static Object translateInput(Object obj) {
+		if (obj instanceof BaseModel<?>) {
+			return translateInput((BaseModel<?>)obj);
+		}
+		else if (obj instanceof List<?>) {
+			return translateInput((List<Object>)obj);
+		}
+		else {
+			return obj;
+		}
+	}
+
+	public static Object translateOutput(BaseModel<?> oldModel) {
+		Class<?> oldModelClass = oldModel.getClass();
+
+		String oldModelClassName = oldModelClass.getName();
+
+		if (oldModelClassName.equals(
+					"it.mwg.sicilia.login.model.impl.ConfigurazioneImpl")) {
+			return translateOutputConfigurazione(oldModel);
+		}
+		else if (oldModelClassName.endsWith("Clp")) {
+			try {
+				ClassLoader classLoader = ClpSerializer.class.getClassLoader();
+
+				Method getClpSerializerClassMethod = oldModelClass.getMethod(
+						"getClpSerializerClass");
+
+				Class<?> oldClpSerializerClass = (Class<?>)getClpSerializerClassMethod.invoke(oldModel);
+
+				Class<?> newClpSerializerClass = classLoader.loadClass(oldClpSerializerClass.getName());
+
+				Method translateOutputMethod = newClpSerializerClass.getMethod("translateOutput",
+						BaseModel.class);
+
+				Class<?> oldModelModelClass = oldModel.getModelClass();
+
+				Method getRemoteModelMethod = oldModelClass.getMethod("get" +
+						oldModelModelClass.getSimpleName() + "RemoteModel");
+
+				Object oldRemoteModel = getRemoteModelMethod.invoke(oldModel);
+
+				BaseModel<?> newModel = (BaseModel<?>)translateOutputMethod.invoke(null,
+						oldRemoteModel);
+
+				return newModel;
+			}
+			catch (Throwable t) {
+				if (_log.isInfoEnabled()) {
+					_log.info("Unable to translate " + oldModelClassName, t);
+				}
+			}
+		}
+
+		return oldModel;
+	}
+
+	public static Object translateOutput(List<Object> oldList) {
+		List<Object> newList = new ArrayList<Object>(oldList.size());
+
+		for (int i = 0; i < oldList.size(); i++) {
+			Object curObj = oldList.get(i);
+
+			newList.add(translateOutput(curObj));
+		}
+
+		return newList;
+	}
+
+	public static Object translateOutput(Object obj) {
+		if (obj instanceof BaseModel<?>) {
+			return translateOutput((BaseModel<?>)obj);
+		}
+		else if (obj instanceof List<?>) {
+			return translateOutput((List<Object>)obj);
+		}
+		else {
+			return obj;
+		}
+	}
+
+	public static Throwable translateThrowable(Throwable throwable) {
+		if (_useReflectionToTranslateThrowable) {
+			try {
+				UnsyncByteArrayOutputStream unsyncByteArrayOutputStream = new UnsyncByteArrayOutputStream();
+				ObjectOutputStream objectOutputStream = new ObjectOutputStream(unsyncByteArrayOutputStream);
+
+				objectOutputStream.writeObject(throwable);
+
+				objectOutputStream.flush();
+				objectOutputStream.close();
+
+				UnsyncByteArrayInputStream unsyncByteArrayInputStream = new UnsyncByteArrayInputStream(unsyncByteArrayOutputStream.unsafeGetByteArray(),
+						0, unsyncByteArrayOutputStream.size());
+
+				Thread currentThread = Thread.currentThread();
+
+				ClassLoader contextClassLoader = currentThread.getContextClassLoader();
+
+				ObjectInputStream objectInputStream = new ClassLoaderObjectInputStream(unsyncByteArrayInputStream,
+						contextClassLoader);
+
+				throwable = (Throwable)objectInputStream.readObject();
+
+				objectInputStream.close();
+
+				return throwable;
+			}
+			catch (SecurityException se) {
+				if (_log.isInfoEnabled()) {
+					_log.info("Do not use reflection to translate throwable");
+				}
+
+				_useReflectionToTranslateThrowable = false;
+			}
+			catch (Throwable throwable2) {
+				_log.error(throwable2, throwable2);
+
+				return throwable2;
+			}
+		}
+
+		Class<?> clazz = throwable.getClass();
+
+		String className = clazz.getName();
+
+		if (className.equals(PortalException.class.getName())) {
+			return new PortalException();
+		}
+
+		if (className.equals(SystemException.class.getName())) {
+			return new SystemException();
+		}
+
+		if (className.equals(
+					"it.mwg.sicilia.login.NoSuchConfigurazioneException")) {
+			return new it.mwg.sicilia.login.NoSuchConfigurazioneException();
+		}
+
+		return throwable;
+	}
+
+	public static Object translateOutputConfigurazione(BaseModel<?> oldModel) {
+		ConfigurazioneClp newModel = new ConfigurazioneClp();
+
+		newModel.setModelAttributes(oldModel.getModelAttributes());
+
+		newModel.setConfigurazioneRemoteModel(oldModel);
+
+		return newModel;
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(ClpSerializer.class);
+	private static String _servletContextName;
+	private static boolean _useReflectionToTranslateThrowable = true;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalService.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalService.java
new file mode 100644
index 0000000..e970f76
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalService.java
@@ -0,0 +1,291 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.search.IndexableType;
+import com.liferay.portal.kernel.transaction.Isolation;
+import com.liferay.portal.kernel.transaction.Propagation;
+import com.liferay.portal.kernel.transaction.Transactional;
+import com.liferay.portal.service.BaseLocalService;
+import com.liferay.portal.service.InvokableLocalService;
+import com.liferay.portal.service.PersistedModelLocalService;
+
+/**
+ * Provides the local service interface for Configurazione. Methods of this
+ * service will not have security checks based on the propagated JAAS
+ * credentials because this service can only be accessed from within the same
+ * VM.
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazioneLocalServiceUtil
+ * @see it.mwg.sicilia.login.service.base.ConfigurazioneLocalServiceBaseImpl
+ * @see it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl
+ * @generated
+ */
+@Transactional(isolation = Isolation.PORTAL, rollbackFor =  {
+	PortalException.class, SystemException.class})
+public interface ConfigurazioneLocalService extends BaseLocalService,
+	InvokableLocalService, PersistedModelLocalService {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this interface directly. Always use {@link ConfigurazioneLocalServiceUtil} to access the configurazione local service. Add custom service methods to {@link it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface.
+	 */
+
+	/**
+	* Adds the configurazione to the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was added
+	* @throws SystemException if a system exception occurred
+	*/
+	@com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX)
+	public it.mwg.sicilia.login.model.Configurazione addConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Creates a new configurazione with the primary key. Does not add the configurazione to the database.
+	*
+	* @param configurazioneId the primary key for the new configurazione
+	* @return the new configurazione
+	*/
+	public it.mwg.sicilia.login.model.Configurazione createConfigurazione(
+		long configurazioneId);
+
+	/**
+	* Deletes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione that was removed
+	* @throws PortalException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	@com.liferay.portal.kernel.search.Indexable(type = IndexableType.DELETE)
+	public it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Deletes the configurazione from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was removed
+	* @throws SystemException if a system exception occurred
+	*/
+	@com.liferay.portal.kernel.search.Indexable(type = IndexableType.DELETE)
+	public it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery();
+
+	/**
+	* Performs a dynamic query on the database and returns the matching rows.
+	*
+	* @param dynamicQuery the dynamic query
+	* @return the matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Performs a dynamic query on the database and returns a range of the matching rows.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param dynamicQuery the dynamic query
+	* @param start the lower bound of the range of model instances
+	* @param end the upper bound of the range of model instances (not inclusive)
+	* @return the range of matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end) throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Performs a dynamic query on the database and returns an ordered range of the matching rows.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param dynamicQuery the dynamic query
+	* @param start the lower bound of the range of model instances
+	* @param end the upper bound of the range of model instances (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of rows that match the dynamic query.
+	*
+	* @param dynamicQuery the dynamic query
+	* @return the number of rows that match the dynamic query
+	* @throws SystemException if a system exception occurred
+	*/
+	public long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of rows that match the dynamic query.
+	*
+	* @param dynamicQuery the dynamic query
+	* @param projection the projection to apply to the query
+	* @return the number of rows that match the dynamic query
+	* @throws SystemException if a system exception occurred
+	*/
+	public long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
+		com.liferay.portal.kernel.dao.orm.Projection projection)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public it.mwg.sicilia.login.model.Configurazione fetchConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the configurazione with the primary key.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione
+	* @throws PortalException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public it.mwg.sicilia.login.model.Configurazione getConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
+	@Override
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public com.liferay.portal.model.PersistedModel getPersistedModel(
+		java.io.Serializable primaryKeyObj)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns a range of all the configuraziones.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @return the range of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> getConfiguraziones(
+		int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of configuraziones.
+	*
+	* @return the number of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public int getConfigurazionesCount()
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Updates the configurazione in the database or adds it if it does not yet exist. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was updated
+	* @throws SystemException if a system exception occurred
+	*/
+	@com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX)
+	public it.mwg.sicilia.login.model.Configurazione updateConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the Spring bean ID for this bean.
+	*
+	* @return the Spring bean ID for this bean
+	*/
+	public java.lang.String getBeanIdentifier();
+
+	/**
+	* Sets the Spring bean ID for this bean.
+	*
+	* @param beanIdentifier the Spring bean ID for this bean
+	*/
+	public void setBeanIdentifier(java.lang.String beanIdentifier);
+
+	@Override
+	public java.lang.Object invokeMethod(java.lang.String name,
+		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
+		throws java.lang.Throwable;
+
+	public it.mwg.sicilia.login.model.Configurazione findByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public java.lang.String getApiServer(long companyId);
+
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public java.lang.String getApiServerKey();
+
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public java.lang.String getApiUsername(long companyId);
+
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public java.lang.String getApiUsernameKey();
+
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public java.lang.String getApiPassword(long companyId);
+
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public java.lang.String getApiPasswordKey();
+
+	public void salvaImpostazioni(javax.portlet.ActionRequest request,
+		javax.portlet.ActionResponse response)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException;
+
+	public void set(long companyId, com.liferay.portal.model.User user,
+		java.lang.String nome, java.lang.String valore)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	public void setDefaults(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceClp.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceClp.java
new file mode 100644
index 0000000..aee2260
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceClp.java
@@ -0,0 +1,1037 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service;
+
+import com.liferay.portal.service.InvokableLocalService;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ * @generated
+ */
+public class ConfigurazioneLocalServiceClp implements ConfigurazioneLocalService {
+	public ConfigurazioneLocalServiceClp(
+		InvokableLocalService invokableLocalService) {
+		_invokableLocalService = invokableLocalService;
+
+		_methodName0 = "addConfigurazione";
+
+		_methodParameterTypes0 = new String[] {
+				"it.mwg.sicilia.login.model.Configurazione"
+			};
+
+		_methodName1 = "createConfigurazione";
+
+		_methodParameterTypes1 = new String[] { "long" };
+
+		_methodName2 = "deleteConfigurazione";
+
+		_methodParameterTypes2 = new String[] { "long" };
+
+		_methodName3 = "deleteConfigurazione";
+
+		_methodParameterTypes3 = new String[] {
+				"it.mwg.sicilia.login.model.Configurazione"
+			};
+
+		_methodName4 = "dynamicQuery";
+
+		_methodParameterTypes4 = new String[] {  };
+
+		_methodName5 = "dynamicQuery";
+
+		_methodParameterTypes5 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery"
+			};
+
+		_methodName6 = "dynamicQuery";
+
+		_methodParameterTypes6 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery", "int", "int"
+			};
+
+		_methodName7 = "dynamicQuery";
+
+		_methodParameterTypes7 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery", "int", "int",
+				"com.liferay.portal.kernel.util.OrderByComparator"
+			};
+
+		_methodName8 = "dynamicQueryCount";
+
+		_methodParameterTypes8 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery"
+			};
+
+		_methodName9 = "dynamicQueryCount";
+
+		_methodParameterTypes9 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery",
+				"com.liferay.portal.kernel.dao.orm.Projection"
+			};
+
+		_methodName10 = "fetchConfigurazione";
+
+		_methodParameterTypes10 = new String[] { "long" };
+
+		_methodName11 = "getConfigurazione";
+
+		_methodParameterTypes11 = new String[] { "long" };
+
+		_methodName12 = "getPersistedModel";
+
+		_methodParameterTypes12 = new String[] { "java.io.Serializable" };
+
+		_methodName13 = "getConfiguraziones";
+
+		_methodParameterTypes13 = new String[] { "int", "int" };
+
+		_methodName14 = "getConfigurazionesCount";
+
+		_methodParameterTypes14 = new String[] {  };
+
+		_methodName15 = "updateConfigurazione";
+
+		_methodParameterTypes15 = new String[] {
+				"it.mwg.sicilia.login.model.Configurazione"
+			};
+
+		_methodName16 = "getBeanIdentifier";
+
+		_methodParameterTypes16 = new String[] {  };
+
+		_methodName17 = "setBeanIdentifier";
+
+		_methodParameterTypes17 = new String[] { "java.lang.String" };
+
+		_methodName19 = "findByCompanyId_Nome";
+
+		_methodParameterTypes19 = new String[] { "long", "java.lang.String" };
+
+		_methodName20 = "getApiServer";
+
+		_methodParameterTypes20 = new String[] { "long" };
+
+		_methodName21 = "getApiServerKey";
+
+		_methodParameterTypes21 = new String[] {  };
+
+		_methodName22 = "getApiUsername";
+
+		_methodParameterTypes22 = new String[] { "long" };
+
+		_methodName23 = "getApiUsernameKey";
+
+		_methodParameterTypes23 = new String[] {  };
+
+		_methodName24 = "getApiPassword";
+
+		_methodParameterTypes24 = new String[] { "long" };
+
+		_methodName25 = "getApiPasswordKey";
+
+		_methodParameterTypes25 = new String[] {  };
+
+		_methodName26 = "salvaImpostazioni";
+
+		_methodParameterTypes26 = new String[] {
+				"javax.portlet.ActionRequest", "javax.portlet.ActionResponse"
+			};
+
+		_methodName27 = "set";
+
+		_methodParameterTypes27 = new String[] {
+				"long", "com.liferay.portal.model.User", "java.lang.String",
+				"java.lang.String"
+			};
+
+		_methodName28 = "setDefaults";
+
+		_methodParameterTypes28 = new String[] { "long" };
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione addConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName0,
+					_methodParameterTypes0,
+					new Object[] { ClpSerializer.translateInput(configurazione) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione createConfigurazione(
+		long configurazioneId) {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName1,
+					_methodParameterTypes1, new Object[] { configurazioneId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName2,
+					_methodParameterTypes2, new Object[] { configurazioneId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.PortalException) {
+				throw (com.liferay.portal.kernel.exception.PortalException)t;
+			}
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName3,
+					_methodParameterTypes3,
+					new Object[] { ClpSerializer.translateInput(configurazione) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName4,
+					_methodParameterTypes4, new Object[] {  });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (com.liferay.portal.kernel.dao.orm.DynamicQuery)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName5,
+					_methodParameterTypes5,
+					new Object[] { ClpSerializer.translateInput(dynamicQuery) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.util.List)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end) throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName6,
+					_methodParameterTypes6,
+					new Object[] {
+						ClpSerializer.translateInput(dynamicQuery),
+						
+					start,
+						
+					end
+					});
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.util.List)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName7,
+					_methodParameterTypes7,
+					new Object[] {
+						ClpSerializer.translateInput(dynamicQuery),
+						
+					start,
+						
+					end,
+						
+					ClpSerializer.translateInput(orderByComparator)
+					});
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.util.List)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName8,
+					_methodParameterTypes8,
+					new Object[] { ClpSerializer.translateInput(dynamicQuery) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return ((Long)returnObj).longValue();
+	}
+
+	@Override
+	public long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
+		com.liferay.portal.kernel.dao.orm.Projection projection)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName9,
+					_methodParameterTypes9,
+					new Object[] {
+						ClpSerializer.translateInput(dynamicQuery),
+						
+					ClpSerializer.translateInput(projection)
+					});
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return ((Long)returnObj).longValue();
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione fetchConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName10,
+					_methodParameterTypes10, new Object[] { configurazioneId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione getConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName11,
+					_methodParameterTypes11, new Object[] { configurazioneId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.PortalException) {
+				throw (com.liferay.portal.kernel.exception.PortalException)t;
+			}
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public com.liferay.portal.model.PersistedModel getPersistedModel(
+		java.io.Serializable primaryKeyObj)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName12,
+					_methodParameterTypes12,
+					new Object[] { ClpSerializer.translateInput(primaryKeyObj) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.PortalException) {
+				throw (com.liferay.portal.kernel.exception.PortalException)t;
+			}
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (com.liferay.portal.model.PersistedModel)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> getConfiguraziones(
+		int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName13,
+					_methodParameterTypes13, new Object[] { start, end });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.util.List<it.mwg.sicilia.login.model.Configurazione>)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public int getConfigurazionesCount()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName14,
+					_methodParameterTypes14, new Object[] {  });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return ((Integer)returnObj).intValue();
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione updateConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName15,
+					_methodParameterTypes15,
+					new Object[] { ClpSerializer.translateInput(configurazione) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.lang.String getBeanIdentifier() {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName16,
+					_methodParameterTypes16, new Object[] {  });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public void setBeanIdentifier(java.lang.String beanIdentifier) {
+		try {
+			_invokableLocalService.invokeMethod(_methodName17,
+				_methodParameterTypes17,
+				new Object[] { ClpSerializer.translateInput(beanIdentifier) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+	}
+
+	@Override
+	public java.lang.Object invokeMethod(java.lang.String name,
+		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
+		throws java.lang.Throwable {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione findByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName19,
+					_methodParameterTypes19,
+					new Object[] { companyId, ClpSerializer.translateInput(nome) });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof it.mwg.sicilia.login.NoSuchConfigurazioneException) {
+				throw (it.mwg.sicilia.login.NoSuchConfigurazioneException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (it.mwg.sicilia.login.model.Configurazione)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.lang.String getApiServer(long companyId) {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName20,
+					_methodParameterTypes20, new Object[] { companyId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.lang.String getApiServerKey() {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName21,
+					_methodParameterTypes21, new Object[] {  });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.lang.String getApiUsername(long companyId) {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName22,
+					_methodParameterTypes22, new Object[] { companyId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.lang.String getApiUsernameKey() {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName23,
+					_methodParameterTypes23, new Object[] {  });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.lang.String getApiPassword(long companyId) {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName24,
+					_methodParameterTypes24, new Object[] { companyId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public java.lang.String getApiPasswordKey() {
+		Object returnObj = null;
+
+		try {
+			returnObj = _invokableLocalService.invokeMethod(_methodName25,
+					_methodParameterTypes25, new Object[] {  });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+
+		return (java.lang.String)ClpSerializer.translateOutput(returnObj);
+	}
+
+	@Override
+	public void salvaImpostazioni(javax.portlet.ActionRequest request,
+		javax.portlet.ActionResponse response)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		try {
+			_invokableLocalService.invokeMethod(_methodName26,
+				_methodParameterTypes26,
+				new Object[] {
+					ClpSerializer.translateInput(request),
+					
+				ClpSerializer.translateInput(response)
+				});
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.PortalException) {
+				throw (com.liferay.portal.kernel.exception.PortalException)t;
+			}
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+	}
+
+	@Override
+	public void set(long companyId, com.liferay.portal.model.User user,
+		java.lang.String nome, java.lang.String valore)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		try {
+			_invokableLocalService.invokeMethod(_methodName27,
+				_methodParameterTypes27,
+				new Object[] {
+					companyId,
+					
+				ClpSerializer.translateInput(user),
+					
+				ClpSerializer.translateInput(nome),
+					
+				ClpSerializer.translateInput(valore)
+				});
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+	}
+
+	@Override
+	public void setDefaults(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		try {
+			_invokableLocalService.invokeMethod(_methodName28,
+				_methodParameterTypes28, new Object[] { companyId });
+		}
+		catch (Throwable t) {
+			t = ClpSerializer.translateThrowable(t);
+
+			if (t instanceof com.liferay.portal.kernel.exception.SystemException) {
+				throw (com.liferay.portal.kernel.exception.SystemException)t;
+			}
+
+			if (t instanceof RuntimeException) {
+				throw (RuntimeException)t;
+			}
+			else {
+				throw new RuntimeException(t.getClass().getName() +
+					" is not a valid exception");
+			}
+		}
+	}
+
+	private InvokableLocalService _invokableLocalService;
+	private String _methodName0;
+	private String[] _methodParameterTypes0;
+	private String _methodName1;
+	private String[] _methodParameterTypes1;
+	private String _methodName2;
+	private String[] _methodParameterTypes2;
+	private String _methodName3;
+	private String[] _methodParameterTypes3;
+	private String _methodName4;
+	private String[] _methodParameterTypes4;
+	private String _methodName5;
+	private String[] _methodParameterTypes5;
+	private String _methodName6;
+	private String[] _methodParameterTypes6;
+	private String _methodName7;
+	private String[] _methodParameterTypes7;
+	private String _methodName8;
+	private String[] _methodParameterTypes8;
+	private String _methodName9;
+	private String[] _methodParameterTypes9;
+	private String _methodName10;
+	private String[] _methodParameterTypes10;
+	private String _methodName11;
+	private String[] _methodParameterTypes11;
+	private String _methodName12;
+	private String[] _methodParameterTypes12;
+	private String _methodName13;
+	private String[] _methodParameterTypes13;
+	private String _methodName14;
+	private String[] _methodParameterTypes14;
+	private String _methodName15;
+	private String[] _methodParameterTypes15;
+	private String _methodName16;
+	private String[] _methodParameterTypes16;
+	private String _methodName17;
+	private String[] _methodParameterTypes17;
+	private String _methodName19;
+	private String[] _methodParameterTypes19;
+	private String _methodName20;
+	private String[] _methodParameterTypes20;
+	private String _methodName21;
+	private String[] _methodParameterTypes21;
+	private String _methodName22;
+	private String[] _methodParameterTypes22;
+	private String _methodName23;
+	private String[] _methodParameterTypes23;
+	private String _methodName24;
+	private String[] _methodParameterTypes24;
+	private String _methodName25;
+	private String[] _methodParameterTypes25;
+	private String _methodName26;
+	private String[] _methodParameterTypes26;
+	private String _methodName27;
+	private String[] _methodParameterTypes27;
+	private String _methodName28;
+	private String[] _methodParameterTypes28;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceUtil.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceUtil.java
new file mode 100644
index 0000000..1967204
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceUtil.java
@@ -0,0 +1,357 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service;
+
+import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
+import com.liferay.portal.kernel.util.ReferenceRegistry;
+import com.liferay.portal.service.InvokableLocalService;
+
+/**
+ * Provides the local service utility for Configurazione. This utility wraps
+ * {@link it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl} and is the
+ * primary access point for service operations in application layer code running
+ * on the local server. Methods of this service will not have security checks
+ * based on the propagated JAAS credentials because this service can only be
+ * accessed from within the same VM.
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazioneLocalService
+ * @see it.mwg.sicilia.login.service.base.ConfigurazioneLocalServiceBaseImpl
+ * @see it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl
+ * @generated
+ */
+public class ConfigurazioneLocalServiceUtil {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify this class directly. Add custom service methods to {@link it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl} and rerun ServiceBuilder to regenerate this class.
+	 */
+
+	/**
+	* Adds the configurazione to the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was added
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione addConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().addConfigurazione(configurazione);
+	}
+
+	/**
+	* Creates a new configurazione with the primary key. Does not add the configurazione to the database.
+	*
+	* @param configurazioneId the primary key for the new configurazione
+	* @return the new configurazione
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione createConfigurazione(
+		long configurazioneId) {
+		return getService().createConfigurazione(configurazioneId);
+	}
+
+	/**
+	* Deletes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione that was removed
+	* @throws PortalException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return getService().deleteConfigurazione(configurazioneId);
+	}
+
+	/**
+	* Deletes the configurazione from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was removed
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().deleteConfigurazione(configurazione);
+	}
+
+	public static com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
+		return getService().dynamicQuery();
+	}
+
+	/**
+	* Performs a dynamic query on the database and returns the matching rows.
+	*
+	* @param dynamicQuery the dynamic query
+	* @return the matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@SuppressWarnings("rawtypes")
+	public static java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().dynamicQuery(dynamicQuery);
+	}
+
+	/**
+	* Performs a dynamic query on the database and returns a range of the matching rows.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param dynamicQuery the dynamic query
+	* @param start the lower bound of the range of model instances
+	* @param end the upper bound of the range of model instances (not inclusive)
+	* @return the range of matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@SuppressWarnings("rawtypes")
+	public static java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end) throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().dynamicQuery(dynamicQuery, start, end);
+	}
+
+	/**
+	* Performs a dynamic query on the database and returns an ordered range of the matching rows.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param dynamicQuery the dynamic query
+	* @param start the lower bound of the range of model instances
+	* @param end the upper bound of the range of model instances (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@SuppressWarnings("rawtypes")
+	public static java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService()
+				   .dynamicQuery(dynamicQuery, start, end, orderByComparator);
+	}
+
+	/**
+	* Returns the number of rows that match the dynamic query.
+	*
+	* @param dynamicQuery the dynamic query
+	* @return the number of rows that match the dynamic query
+	* @throws SystemException if a system exception occurred
+	*/
+	public static long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().dynamicQueryCount(dynamicQuery);
+	}
+
+	/**
+	* Returns the number of rows that match the dynamic query.
+	*
+	* @param dynamicQuery the dynamic query
+	* @param projection the projection to apply to the query
+	* @return the number of rows that match the dynamic query
+	* @throws SystemException if a system exception occurred
+	*/
+	public static long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
+		com.liferay.portal.kernel.dao.orm.Projection projection)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().dynamicQueryCount(dynamicQuery, projection);
+	}
+
+	public static it.mwg.sicilia.login.model.Configurazione fetchConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().fetchConfigurazione(configurazioneId);
+	}
+
+	/**
+	* Returns the configurazione with the primary key.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione
+	* @throws PortalException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione getConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return getService().getConfigurazione(configurazioneId);
+	}
+
+	public static com.liferay.portal.model.PersistedModel getPersistedModel(
+		java.io.Serializable primaryKeyObj)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return getService().getPersistedModel(primaryKeyObj);
+	}
+
+	/**
+	* Returns a range of all the configuraziones.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @return the range of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.mwg.sicilia.login.model.Configurazione> getConfiguraziones(
+		int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().getConfiguraziones(start, end);
+	}
+
+	/**
+	* Returns the number of configuraziones.
+	*
+	* @return the number of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int getConfigurazionesCount()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().getConfigurazionesCount();
+	}
+
+	/**
+	* Updates the configurazione in the database or adds it if it does not yet exist. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was updated
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione updateConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getService().updateConfigurazione(configurazione);
+	}
+
+	/**
+	* Returns the Spring bean ID for this bean.
+	*
+	* @return the Spring bean ID for this bean
+	*/
+	public static java.lang.String getBeanIdentifier() {
+		return getService().getBeanIdentifier();
+	}
+
+	/**
+	* Sets the Spring bean ID for this bean.
+	*
+	* @param beanIdentifier the Spring bean ID for this bean
+	*/
+	public static void setBeanIdentifier(java.lang.String beanIdentifier) {
+		getService().setBeanIdentifier(beanIdentifier);
+	}
+
+	public static java.lang.Object invokeMethod(java.lang.String name,
+		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
+		throws java.lang.Throwable {
+		return getService().invokeMethod(name, parameterTypes, arguments);
+	}
+
+	public static it.mwg.sicilia.login.model.Configurazione findByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getService().findByCompanyId_Nome(companyId, nome);
+	}
+
+	public static java.lang.String getApiServer(long companyId) {
+		return getService().getApiServer(companyId);
+	}
+
+	public static java.lang.String getApiServerKey() {
+		return getService().getApiServerKey();
+	}
+
+	public static java.lang.String getApiUsername(long companyId) {
+		return getService().getApiUsername(companyId);
+	}
+
+	public static java.lang.String getApiUsernameKey() {
+		return getService().getApiUsernameKey();
+	}
+
+	public static java.lang.String getApiPassword(long companyId) {
+		return getService().getApiPassword(companyId);
+	}
+
+	public static java.lang.String getApiPasswordKey() {
+		return getService().getApiPasswordKey();
+	}
+
+	public static void salvaImpostazioni(javax.portlet.ActionRequest request,
+		javax.portlet.ActionResponse response)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		getService().salvaImpostazioni(request, response);
+	}
+
+	public static void set(long companyId, com.liferay.portal.model.User user,
+		java.lang.String nome, java.lang.String valore)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		getService().set(companyId, user, nome, valore);
+	}
+
+	public static void setDefaults(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		getService().setDefaults(companyId);
+	}
+
+	public static void clearService() {
+		_service = null;
+	}
+
+	public static ConfigurazioneLocalService getService() {
+		if (_service == null) {
+			InvokableLocalService invokableLocalService = (InvokableLocalService)PortletBeanLocatorUtil.locate(ClpSerializer.getServletContextName(),
+					ConfigurazioneLocalService.class.getName());
+
+			if (invokableLocalService instanceof ConfigurazioneLocalService) {
+				_service = (ConfigurazioneLocalService)invokableLocalService;
+			}
+			else {
+				_service = new ConfigurazioneLocalServiceClp(invokableLocalService);
+			}
+
+			ReferenceRegistry.registerReference(ConfigurazioneLocalServiceUtil.class,
+				"_service");
+		}
+
+		return _service;
+	}
+
+	/**
+	 * @deprecated As of 6.2.0
+	 */
+	public void setService(ConfigurazioneLocalService service) {
+	}
+
+	private static ConfigurazioneLocalService _service;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceWrapper.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceWrapper.java
new file mode 100644
index 0000000..76565b9
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/ConfigurazioneLocalServiceWrapper.java
@@ -0,0 +1,377 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service;
+
+import com.liferay.portal.service.ServiceWrapper;
+
+/**
+ * Provides a wrapper for {@link ConfigurazioneLocalService}.
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazioneLocalService
+ * @generated
+ */
+public class ConfigurazioneLocalServiceWrapper
+	implements ConfigurazioneLocalService,
+		ServiceWrapper<ConfigurazioneLocalService> {
+	public ConfigurazioneLocalServiceWrapper(
+		ConfigurazioneLocalService configurazioneLocalService) {
+		_configurazioneLocalService = configurazioneLocalService;
+	}
+
+	/**
+	* Adds the configurazione to the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was added
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione addConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.addConfigurazione(configurazione);
+	}
+
+	/**
+	* Creates a new configurazione with the primary key. Does not add the configurazione to the database.
+	*
+	* @param configurazioneId the primary key for the new configurazione
+	* @return the new configurazione
+	*/
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione createConfigurazione(
+		long configurazioneId) {
+		return _configurazioneLocalService.createConfigurazione(configurazioneId);
+	}
+
+	/**
+	* Deletes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione that was removed
+	* @throws PortalException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.deleteConfigurazione(configurazioneId);
+	}
+
+	/**
+	* Deletes the configurazione from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was removed
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione deleteConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.deleteConfigurazione(configurazione);
+	}
+
+	@Override
+	public com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery() {
+		return _configurazioneLocalService.dynamicQuery();
+	}
+
+	/**
+	* Performs a dynamic query on the database and returns the matching rows.
+	*
+	* @param dynamicQuery the dynamic query
+	* @return the matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.dynamicQuery(dynamicQuery);
+	}
+
+	/**
+	* Performs a dynamic query on the database and returns a range of the matching rows.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param dynamicQuery the dynamic query
+	* @param start the lower bound of the range of model instances
+	* @param end the upper bound of the range of model instances (not inclusive)
+	* @return the range of matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end) throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.dynamicQuery(dynamicQuery, start, end);
+	}
+
+	/**
+	* Performs a dynamic query on the database and returns an ordered range of the matching rows.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param dynamicQuery the dynamic query
+	* @param start the lower bound of the range of model instances
+	* @param end the upper bound of the range of model instances (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching rows
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	@SuppressWarnings("rawtypes")
+	public java.util.List dynamicQuery(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery, int start,
+		int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.dynamicQuery(dynamicQuery, start,
+			end, orderByComparator);
+	}
+
+	/**
+	* Returns the number of rows that match the dynamic query.
+	*
+	* @param dynamicQuery the dynamic query
+	* @return the number of rows that match the dynamic query
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.dynamicQueryCount(dynamicQuery);
+	}
+
+	/**
+	* Returns the number of rows that match the dynamic query.
+	*
+	* @param dynamicQuery the dynamic query
+	* @param projection the projection to apply to the query
+	* @return the number of rows that match the dynamic query
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public long dynamicQueryCount(
+		com.liferay.portal.kernel.dao.orm.DynamicQuery dynamicQuery,
+		com.liferay.portal.kernel.dao.orm.Projection projection)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.dynamicQueryCount(dynamicQuery,
+			projection);
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione fetchConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.fetchConfigurazione(configurazioneId);
+	}
+
+	/**
+	* Returns the configurazione with the primary key.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione
+	* @throws PortalException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione getConfigurazione(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.getConfigurazione(configurazioneId);
+	}
+
+	@Override
+	public com.liferay.portal.model.PersistedModel getPersistedModel(
+		java.io.Serializable primaryKeyObj)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.getPersistedModel(primaryKeyObj);
+	}
+
+	/**
+	* Returns a range of all the configuraziones.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @return the range of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> getConfiguraziones(
+		int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.getConfiguraziones(start, end);
+	}
+
+	/**
+	* Returns the number of configuraziones.
+	*
+	* @return the number of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public int getConfigurazionesCount()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.getConfigurazionesCount();
+	}
+
+	/**
+	* Updates the configurazione in the database or adds it if it does not yet exist. Also notifies the appropriate model listeners.
+	*
+	* @param configurazione the configurazione
+	* @return the configurazione that was updated
+	* @throws SystemException if a system exception occurred
+	*/
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione updateConfigurazione(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return _configurazioneLocalService.updateConfigurazione(configurazione);
+	}
+
+	/**
+	* Returns the Spring bean ID for this bean.
+	*
+	* @return the Spring bean ID for this bean
+	*/
+	@Override
+	public java.lang.String getBeanIdentifier() {
+		return _configurazioneLocalService.getBeanIdentifier();
+	}
+
+	/**
+	* Sets the Spring bean ID for this bean.
+	*
+	* @param beanIdentifier the Spring bean ID for this bean
+	*/
+	@Override
+	public void setBeanIdentifier(java.lang.String beanIdentifier) {
+		_configurazioneLocalService.setBeanIdentifier(beanIdentifier);
+	}
+
+	@Override
+	public java.lang.Object invokeMethod(java.lang.String name,
+		java.lang.String[] parameterTypes, java.lang.Object[] arguments)
+		throws java.lang.Throwable {
+		return _configurazioneLocalService.invokeMethod(name, parameterTypes,
+			arguments);
+	}
+
+	@Override
+	public it.mwg.sicilia.login.model.Configurazione findByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return _configurazioneLocalService.findByCompanyId_Nome(companyId, nome);
+	}
+
+	@Override
+	public java.lang.String getApiServer(long companyId) {
+		return _configurazioneLocalService.getApiServer(companyId);
+	}
+
+	@Override
+	public java.lang.String getApiServerKey() {
+		return _configurazioneLocalService.getApiServerKey();
+	}
+
+	@Override
+	public java.lang.String getApiUsername(long companyId) {
+		return _configurazioneLocalService.getApiUsername(companyId);
+	}
+
+	@Override
+	public java.lang.String getApiUsernameKey() {
+		return _configurazioneLocalService.getApiUsernameKey();
+	}
+
+	@Override
+	public java.lang.String getApiPassword(long companyId) {
+		return _configurazioneLocalService.getApiPassword(companyId);
+	}
+
+	@Override
+	public java.lang.String getApiPasswordKey() {
+		return _configurazioneLocalService.getApiPasswordKey();
+	}
+
+	@Override
+	public void salvaImpostazioni(javax.portlet.ActionRequest request,
+		javax.portlet.ActionResponse response)
+		throws com.liferay.portal.kernel.exception.PortalException,
+			com.liferay.portal.kernel.exception.SystemException {
+		_configurazioneLocalService.salvaImpostazioni(request, response);
+	}
+
+	@Override
+	public void set(long companyId, com.liferay.portal.model.User user,
+		java.lang.String nome, java.lang.String valore)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		_configurazioneLocalService.set(companyId, user, nome, valore);
+	}
+
+	@Override
+	public void setDefaults(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		_configurazioneLocalService.setDefaults(companyId);
+	}
+
+	/**
+	 * @deprecated As of 6.1.0, replaced by {@link #getWrappedService}
+	 */
+	public ConfigurazioneLocalService getWrappedConfigurazioneLocalService() {
+		return _configurazioneLocalService;
+	}
+
+	/**
+	 * @deprecated As of 6.1.0, replaced by {@link #setWrappedService}
+	 */
+	public void setWrappedConfigurazioneLocalService(
+		ConfigurazioneLocalService configurazioneLocalService) {
+		_configurazioneLocalService = configurazioneLocalService;
+	}
+
+	@Override
+	public ConfigurazioneLocalService getWrappedService() {
+		return _configurazioneLocalService;
+	}
+
+	@Override
+	public void setWrappedService(
+		ConfigurazioneLocalService configurazioneLocalService) {
+		_configurazioneLocalService = configurazioneLocalService;
+	}
+
+	private ConfigurazioneLocalService _configurazioneLocalService;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/messaging/ClpMessageListener.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/messaging/ClpMessageListener.java
new file mode 100644
index 0000000..15329af
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/messaging/ClpMessageListener.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service.messaging;
+
+import com.liferay.portal.kernel.messaging.BaseMessageListener;
+import com.liferay.portal.kernel.messaging.Message;
+
+import it.mwg.sicilia.login.service.ClpSerializer;
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ */
+public class ClpMessageListener extends BaseMessageListener {
+	public static String getServletContextName() {
+		return ClpSerializer.getServletContextName();
+	}
+
+	@Override
+	protected void doReceive(Message message) throws Exception {
+		String command = message.getString("command");
+		String servletContextName = message.getString("servletContextName");
+
+		if (command.equals("undeploy") &&
+				servletContextName.equals(getServletContextName())) {
+			ConfigurazioneLocalServiceUtil.clearService();
+		}
+	}
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazioneActionableDynamicQuery.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazioneActionableDynamicQuery.java
new file mode 100644
index 0000000..9ee2b18
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazioneActionableDynamicQuery.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service.persistence;
+
+import com.liferay.portal.kernel.dao.orm.BaseActionableDynamicQuery;
+import com.liferay.portal.kernel.exception.SystemException;
+
+import it.mwg.sicilia.login.model.Configurazione;
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ * @generated
+ */
+public abstract class ConfigurazioneActionableDynamicQuery
+	extends BaseActionableDynamicQuery {
+	public ConfigurazioneActionableDynamicQuery() throws SystemException {
+		setBaseLocalService(ConfigurazioneLocalServiceUtil.getService());
+		setClass(Configurazione.class);
+
+		setClassLoader(it.mwg.sicilia.login.service.ClpSerializer.class.getClassLoader());
+
+		setPrimaryKeyPropertyName("configurazioneId");
+	}
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazionePersistence.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazionePersistence.java
new file mode 100644
index 0000000..047ca95
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazionePersistence.java
@@ -0,0 +1,366 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service.persistence;
+
+import com.liferay.portal.service.persistence.BasePersistence;
+
+import it.mwg.sicilia.login.model.Configurazione;
+
+/**
+ * The persistence interface for the configurazione service.
+ *
+ * <p>
+ * Caching information and settings can be found in <code>portal.properties</code>
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazionePersistenceImpl
+ * @see ConfigurazioneUtil
+ * @generated
+ */
+public interface ConfigurazionePersistence extends BasePersistence<Configurazione> {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this interface directly. Always use {@link ConfigurazioneUtil} to access the configurazione persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this interface.
+	 */
+
+	/**
+	* Returns all the configuraziones where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @return the matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> findByCompanyId(
+		long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns a range of all the configuraziones where companyId = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param companyId the company ID
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @return the range of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> findByCompanyId(
+		long companyId, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns an ordered range of all the configuraziones where companyId = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param companyId the company ID
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> findByCompanyId(
+		long companyId, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the first configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione findByCompanyId_First(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	/**
+	* Returns the first configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_First(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the last configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione findByCompanyId_Last(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	/**
+	* Returns the last configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_Last(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the configuraziones before and after the current configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param configurazioneId the primary key of the current configurazione
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the previous, current, and next configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione[] findByCompanyId_PrevAndNext(
+		long configurazioneId, long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	/**
+	* Removes all the configuraziones where companyId = &#63; from the database.
+	*
+	* @param companyId the company ID
+	* @throws SystemException if a system exception occurred
+	*/
+	public void removeByCompanyId(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of configuraziones where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @return the number of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public int countByCompanyId(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the configurazione where companyId = &#63; and nome = &#63; or throws a {@link it.mwg.sicilia.login.NoSuchConfigurazioneException} if it could not be found.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the matching configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione findByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	/**
+	* Returns the configurazione where companyId = &#63; and nome = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the configurazione where companyId = &#63; and nome = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @param retrieveFromCache whether to use the finder cache
+	* @return the matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_Nome(
+		long companyId, java.lang.String nome, boolean retrieveFromCache)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Removes the configurazione where companyId = &#63; and nome = &#63; from the database.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the configurazione that was removed
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione removeByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	/**
+	* Returns the number of configuraziones where companyId = &#63; and nome = &#63;.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the number of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public int countByCompanyId_Nome(long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Caches the configurazione in the entity cache if it is enabled.
+	*
+	* @param configurazione the configurazione
+	*/
+	public void cacheResult(
+		it.mwg.sicilia.login.model.Configurazione configurazione);
+
+	/**
+	* Caches the configuraziones in the entity cache if it is enabled.
+	*
+	* @param configuraziones the configuraziones
+	*/
+	public void cacheResult(
+		java.util.List<it.mwg.sicilia.login.model.Configurazione> configuraziones);
+
+	/**
+	* Creates a new configurazione with the primary key. Does not add the configurazione to the database.
+	*
+	* @param configurazioneId the primary key for the new configurazione
+	* @return the new configurazione
+	*/
+	public it.mwg.sicilia.login.model.Configurazione create(
+		long configurazioneId);
+
+	/**
+	* Removes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione that was removed
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione remove(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	public it.mwg.sicilia.login.model.Configurazione updateImpl(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the configurazione with the primary key or throws a {@link it.mwg.sicilia.login.NoSuchConfigurazioneException} if it could not be found.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione findByPrimaryKey(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException;
+
+	/**
+	* Returns the configurazione with the primary key or returns <code>null</code> if it could not be found.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione, or <code>null</code> if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public it.mwg.sicilia.login.model.Configurazione fetchByPrimaryKey(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns all the configuraziones.
+	*
+	* @return the configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> findAll()
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns a range of all the configuraziones.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @return the range of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> findAll(
+		int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns an ordered range of all the configuraziones.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public java.util.List<it.mwg.sicilia.login.model.Configurazione> findAll(
+		int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Removes all the configuraziones from the database.
+	*
+	* @throws SystemException if a system exception occurred
+	*/
+	public void removeAll()
+		throws com.liferay.portal.kernel.exception.SystemException;
+
+	/**
+	* Returns the number of configuraziones.
+	*
+	* @return the number of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public int countAll()
+		throws com.liferay.portal.kernel.exception.SystemException;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazioneUtil.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazioneUtil.java
new file mode 100644
index 0000000..9493617
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/service/it/mwg/sicilia/login/service/persistence/ConfigurazioneUtil.java
@@ -0,0 +1,522 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service.persistence;
+
+import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
+import com.liferay.portal.kernel.dao.orm.DynamicQuery;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.util.OrderByComparator;
+import com.liferay.portal.kernel.util.ReferenceRegistry;
+import com.liferay.portal.service.ServiceContext;
+
+import it.mwg.sicilia.login.model.Configurazione;
+
+import java.util.List;
+
+/**
+ * The persistence utility for the configurazione service. This utility wraps {@link ConfigurazionePersistenceImpl} and provides direct access to the database for CRUD operations. This utility should only be used by the service layer, as it must operate within a transaction. Never access this utility in a JSP, controller, model, or other front-end class.
+ *
+ * <p>
+ * Caching information and settings can be found in <code>portal.properties</code>
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazionePersistence
+ * @see ConfigurazionePersistenceImpl
+ * @generated
+ */
+public class ConfigurazioneUtil {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify this class directly. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
+	 */
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#clearCache()
+	 */
+	public static void clearCache() {
+		getPersistence().clearCache();
+	}
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#clearCache(com.liferay.portal.model.BaseModel)
+	 */
+	public static void clearCache(Configurazione configurazione) {
+		getPersistence().clearCache(configurazione);
+	}
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#countWithDynamicQuery(DynamicQuery)
+	 */
+	public static long countWithDynamicQuery(DynamicQuery dynamicQuery)
+		throws SystemException {
+		return getPersistence().countWithDynamicQuery(dynamicQuery);
+	}
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#findWithDynamicQuery(DynamicQuery)
+	 */
+	public static List<Configurazione> findWithDynamicQuery(
+		DynamicQuery dynamicQuery) throws SystemException {
+		return getPersistence().findWithDynamicQuery(dynamicQuery);
+	}
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#findWithDynamicQuery(DynamicQuery, int, int)
+	 */
+	public static List<Configurazione> findWithDynamicQuery(
+		DynamicQuery dynamicQuery, int start, int end)
+		throws SystemException {
+		return getPersistence().findWithDynamicQuery(dynamicQuery, start, end);
+	}
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#findWithDynamicQuery(DynamicQuery, int, int, OrderByComparator)
+	 */
+	public static List<Configurazione> findWithDynamicQuery(
+		DynamicQuery dynamicQuery, int start, int end,
+		OrderByComparator orderByComparator) throws SystemException {
+		return getPersistence()
+				   .findWithDynamicQuery(dynamicQuery, start, end,
+			orderByComparator);
+	}
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#update(com.liferay.portal.model.BaseModel)
+	 */
+	public static Configurazione update(Configurazione configurazione)
+		throws SystemException {
+		return getPersistence().update(configurazione);
+	}
+
+	/**
+	 * @see com.liferay.portal.service.persistence.BasePersistence#update(com.liferay.portal.model.BaseModel, ServiceContext)
+	 */
+	public static Configurazione update(Configurazione configurazione,
+		ServiceContext serviceContext) throws SystemException {
+		return getPersistence().update(configurazione, serviceContext);
+	}
+
+	/**
+	* Returns all the configuraziones where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @return the matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.mwg.sicilia.login.model.Configurazione> findByCompanyId(
+		long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().findByCompanyId(companyId);
+	}
+
+	/**
+	* Returns a range of all the configuraziones where companyId = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param companyId the company ID
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @return the range of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.mwg.sicilia.login.model.Configurazione> findByCompanyId(
+		long companyId, int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().findByCompanyId(companyId, start, end);
+	}
+
+	/**
+	* Returns an ordered range of all the configuraziones where companyId = &#63;.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param companyId the company ID
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.mwg.sicilia.login.model.Configurazione> findByCompanyId(
+		long companyId, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .findByCompanyId(companyId, start, end, orderByComparator);
+	}
+
+	/**
+	* Returns the first configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione findByCompanyId_First(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getPersistence()
+				   .findByCompanyId_First(companyId, orderByComparator);
+	}
+
+	/**
+	* Returns the first configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the first matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_First(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .fetchByCompanyId_First(companyId, orderByComparator);
+	}
+
+	/**
+	* Returns the last configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione findByCompanyId_Last(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getPersistence()
+				   .findByCompanyId_Last(companyId, orderByComparator);
+	}
+
+	/**
+	* Returns the last configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the last matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_Last(
+		long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .fetchByCompanyId_Last(companyId, orderByComparator);
+	}
+
+	/**
+	* Returns the configuraziones before and after the current configurazione in the ordered set where companyId = &#63;.
+	*
+	* @param configurazioneId the primary key of the current configurazione
+	* @param companyId the company ID
+	* @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	* @return the previous, current, and next configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione[] findByCompanyId_PrevAndNext(
+		long configurazioneId, long companyId,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getPersistence()
+				   .findByCompanyId_PrevAndNext(configurazioneId, companyId,
+			orderByComparator);
+	}
+
+	/**
+	* Removes all the configuraziones where companyId = &#63; from the database.
+	*
+	* @param companyId the company ID
+	* @throws SystemException if a system exception occurred
+	*/
+	public static void removeByCompanyId(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		getPersistence().removeByCompanyId(companyId);
+	}
+
+	/**
+	* Returns the number of configuraziones where companyId = &#63;.
+	*
+	* @param companyId the company ID
+	* @return the number of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int countByCompanyId(long companyId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().countByCompanyId(companyId);
+	}
+
+	/**
+	* Returns the configurazione where companyId = &#63; and nome = &#63; or throws a {@link it.mwg.sicilia.login.NoSuchConfigurazioneException} if it could not be found.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the matching configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione findByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getPersistence().findByCompanyId_Nome(companyId, nome);
+	}
+
+	/**
+	* Returns the configurazione where companyId = &#63; and nome = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().fetchByCompanyId_Nome(companyId, nome);
+	}
+
+	/**
+	* Returns the configurazione where companyId = &#63; and nome = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @param retrieveFromCache whether to use the finder cache
+	* @return the matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione fetchByCompanyId_Nome(
+		long companyId, java.lang.String nome, boolean retrieveFromCache)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence()
+				   .fetchByCompanyId_Nome(companyId, nome, retrieveFromCache);
+	}
+
+	/**
+	* Removes the configurazione where companyId = &#63; and nome = &#63; from the database.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the configurazione that was removed
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione removeByCompanyId_Nome(
+		long companyId, java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getPersistence().removeByCompanyId_Nome(companyId, nome);
+	}
+
+	/**
+	* Returns the number of configuraziones where companyId = &#63; and nome = &#63;.
+	*
+	* @param companyId the company ID
+	* @param nome the nome
+	* @return the number of matching configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int countByCompanyId_Nome(long companyId,
+		java.lang.String nome)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().countByCompanyId_Nome(companyId, nome);
+	}
+
+	/**
+	* Caches the configurazione in the entity cache if it is enabled.
+	*
+	* @param configurazione the configurazione
+	*/
+	public static void cacheResult(
+		it.mwg.sicilia.login.model.Configurazione configurazione) {
+		getPersistence().cacheResult(configurazione);
+	}
+
+	/**
+	* Caches the configuraziones in the entity cache if it is enabled.
+	*
+	* @param configuraziones the configuraziones
+	*/
+	public static void cacheResult(
+		java.util.List<it.mwg.sicilia.login.model.Configurazione> configuraziones) {
+		getPersistence().cacheResult(configuraziones);
+	}
+
+	/**
+	* Creates a new configurazione with the primary key. Does not add the configurazione to the database.
+	*
+	* @param configurazioneId the primary key for the new configurazione
+	* @return the new configurazione
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione create(
+		long configurazioneId) {
+		return getPersistence().create(configurazioneId);
+	}
+
+	/**
+	* Removes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione that was removed
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione remove(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getPersistence().remove(configurazioneId);
+	}
+
+	public static it.mwg.sicilia.login.model.Configurazione updateImpl(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().updateImpl(configurazione);
+	}
+
+	/**
+	* Returns the configurazione with the primary key or throws a {@link it.mwg.sicilia.login.NoSuchConfigurazioneException} if it could not be found.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione
+	* @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione findByPrimaryKey(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException,
+			it.mwg.sicilia.login.NoSuchConfigurazioneException {
+		return getPersistence().findByPrimaryKey(configurazioneId);
+	}
+
+	/**
+	* Returns the configurazione with the primary key or returns <code>null</code> if it could not be found.
+	*
+	* @param configurazioneId the primary key of the configurazione
+	* @return the configurazione, or <code>null</code> if a configurazione with the primary key could not be found
+	* @throws SystemException if a system exception occurred
+	*/
+	public static it.mwg.sicilia.login.model.Configurazione fetchByPrimaryKey(
+		long configurazioneId)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().fetchByPrimaryKey(configurazioneId);
+	}
+
+	/**
+	* Returns all the configuraziones.
+	*
+	* @return the configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.mwg.sicilia.login.model.Configurazione> findAll()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().findAll();
+	}
+
+	/**
+	* Returns a range of all the configuraziones.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @return the range of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.mwg.sicilia.login.model.Configurazione> findAll(
+		int start, int end)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().findAll(start, end);
+	}
+
+	/**
+	* Returns an ordered range of all the configuraziones.
+	*
+	* <p>
+	* Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	* </p>
+	*
+	* @param start the lower bound of the range of configuraziones
+	* @param end the upper bound of the range of configuraziones (not inclusive)
+	* @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	* @return the ordered range of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static java.util.List<it.mwg.sicilia.login.model.Configurazione> findAll(
+		int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator orderByComparator)
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().findAll(start, end, orderByComparator);
+	}
+
+	/**
+	* Removes all the configuraziones from the database.
+	*
+	* @throws SystemException if a system exception occurred
+	*/
+	public static void removeAll()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		getPersistence().removeAll();
+	}
+
+	/**
+	* Returns the number of configuraziones.
+	*
+	* @return the number of configuraziones
+	* @throws SystemException if a system exception occurred
+	*/
+	public static int countAll()
+		throws com.liferay.portal.kernel.exception.SystemException {
+		return getPersistence().countAll();
+	}
+
+	public static ConfigurazionePersistence getPersistence() {
+		if (_persistence == null) {
+			_persistence = (ConfigurazionePersistence)PortletBeanLocatorUtil.locate(it.mwg.sicilia.login.service.ClpSerializer.getServletContextName(),
+					ConfigurazionePersistence.class.getName());
+
+			ReferenceRegistry.registerReference(ConfigurazioneUtil.class,
+				"_persistence");
+		}
+
+		return _persistence;
+	}
+
+	/**
+	 * @deprecated As of 6.2.0
+	 */
+	public void setPersistence(ConfigurazionePersistence persistence) {
+	}
+
+	private static ConfigurazionePersistence _persistence;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/indexes.properties b/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/indexes.properties
new file mode 100644
index 0000000..5bf4125
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/indexes.properties
@@ -0,0 +1,2 @@
+IX_B5FCFCE0=sicilia_login_Configurazione.CompanyId
+IX_9A236DAD=sicilia_login_Configurazione.CompanyId_Nome
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/indexes.sql b/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/indexes.sql
new file mode 100644
index 0000000..a0f740c
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/indexes.sql
@@ -0,0 +1,2 @@
+create index IX_B5FCFCE0 on sicilia_login_Configurazione (companyId);
+create unique index IX_9A236DAD on sicilia_login_Configurazione (companyId, nome);
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/sequences.sql b/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/sequences.sql
new file mode 100644
index 0000000..e69de29
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/tables.sql b/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/tables.sql
new file mode 100644
index 0000000..c7346c1
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/sql/tables.sql
@@ -0,0 +1,10 @@
+create table sicilia_login_Configurazione (
+	configurazioneId LONG not null primary key,
+	nome VARCHAR(75) null,
+	valore VARCHAR(75) null,
+	companyId LONG,
+	userId LONG,
+	userName VARCHAR(75) null,
+	createDate DATE null,
+	modifiedDate DATE null
+);
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/base-spring.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/base-spring.xml
new file mode 100644
index 0000000..8e5edba
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/base-spring.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+
+<beans
+	default-destroy-method="destroy"
+	default-init-method="afterPropertiesSet"
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+	<bean class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.spring.aop.ServiceBeanAutoProxyCreator" />
+		<constructor-arg>
+			<map>
+				<entry key="beanMatcher">
+					<bean class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+						<constructor-arg value="com.liferay.portal.spring.aop.ServiceBeanMatcher" />
+					</bean>
+				</entry>
+				<entry key="methodInterceptor" value-ref="serviceAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.spring.bean.BeanReferenceAnnotationBeanPostProcessor" />
+	</bean>
+	<bean class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.spring.context.PortletBeanFactoryCleaner" />
+	</bean>
+	<bean id="portletClassLoader" class="com.liferay.portal.kernel.portlet.PortletClassLoaderUtil" factory-method="getClassLoader" />
+	<bean id="servletContextName" class="com.liferay.portal.kernel.portlet.PortletClassLoaderUtil" factory-method="getServletContextName" />
+	<bean id="basePersistence" abstract="true">
+		<property name="dataSource" ref="liferayDataSource" />
+		<property name="sessionFactory" ref="liferaySessionFactory" />
+	</bean>
+	<bean id="serviceAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.spring.aop.SkipAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="nextMethodInterceptor" value-ref="accessControlAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="accessControlAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.security.ac.AccessControlAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="accessControlAdvisor">
+					<bean class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+						<constructor-arg value="com.liferay.portal.security.ac.AccessControlAdvisorImpl" />
+					</bean>
+				</entry>
+				<entry key="nextMethodInterceptor" value-ref="portalResiliencyAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="portalResiliencyAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.resiliency.service.PortalResiliencyAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="nextMethodInterceptor" value-ref="serviceMonitorAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="serviceMonitorAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.monitoring.statistics.service.ServiceMonitorAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="nextMethodInterceptor" value-ref="asyncAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="asyncAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.messaging.async.AsyncAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="defaultDestinationName" value="liferay/async_service" />
+				<entry key="nextMethodInterceptor" value-ref="threadLocalCacheAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="threadLocalCacheAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.cache.ThreadLocalCacheAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="nextMethodInterceptor" value-ref="bufferedIncrementAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="bufferedIncrementAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.increment.BufferedIncrementAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="nextMethodInterceptor" value-ref="indexableAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="indexableAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.search.IndexableAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="nextMethodInterceptor" value-ref="systemEventAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="systemEventAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.systemevent.SystemEventAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="nextMethodInterceptor" value-ref="transactionAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="transactionAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.spring.transaction.TransactionInterceptorFactoryBean" />
+		<constructor-arg>
+			<map>
+				<entry key="platformTransactionManager" value-ref="liferayTransactionManager" />
+				<entry key="transactionAttributeSource" value-ref="transactionAttributeSource" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="transactionAttributeSource" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.spring.transaction.AnnotationTransactionAttributeSource" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/cluster-spring.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/cluster-spring.xml
new file mode 100644
index 0000000..cd5219b
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/cluster-spring.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<beans
+	default-destroy-method="destroy"
+	default-init-method="afterPropertiesSet"
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+>
+	<bean class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.cluster.ClusterableChainableMethodAdviceInjector" />
+		<constructor-arg>
+			<map>
+				<entry key="parentChainableMethodAdvice" value-ref="serviceAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/hibernate-spring.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/hibernate-spring.xml
new file mode 100644
index 0000000..27564a2
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/hibernate-spring.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<beans
+	default-destroy-method="destroy"
+	default-init-method="afterPropertiesSet"
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+	<bean id="liferayHibernateSessionFactory" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.spring.hibernate.PortletHibernateConfiguration" />
+		<constructor-arg>
+			<map>
+				<entry key="dataSource" value-ref="liferayDataSource" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="liferaySessionFactory" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.dao.orm.hibernate.PortletSessionFactoryImpl" />
+		<constructor-arg>
+			<map>
+				<entry key="dataSource" value-ref="liferayDataSource" />
+				<entry key="sessionFactoryClassLoader" value-ref="portletClassLoader" />
+				<entry key="sessionFactoryImplementor" value-ref="liferayHibernateSessionFactory" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<bean id="liferayTransactionManager" class="com.liferay.portal.kernel.util.InfrastructureUtil" factory-method="getTransactionManager" />
+</beans>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/infrastructure-spring.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/infrastructure-spring.xml
new file mode 100644
index 0000000..380d697
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/infrastructure-spring.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<beans
+	default-destroy-method="destroy"
+	default-init-method="afterPropertiesSet"
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+	<bean id="liferayDataSource" class="com.liferay.portal.kernel.util.InfrastructureUtil" factory-method="getDataSource" />
+</beans>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml
new file mode 100644
index 0000000..b6d494e
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping default-lazy="false" auto-import="false">
+	<import class="it.mwg.sicilia.login.model.Configurazione" />
+	<class name="it.mwg.sicilia.login.model.impl.ConfigurazioneImpl" table="sicilia_login_Configurazione">
+		<cache usage="read-write" />
+		<id name="configurazioneId" type="long">
+			<generator class="assigned" />
+		</id>
+		<property name="nome" type="com.liferay.portal.dao.orm.hibernate.StringType" />
+		<property name="valore" type="com.liferay.portal.dao.orm.hibernate.StringType" />
+		<property name="companyId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
+		<property name="userId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
+		<property name="userName" type="com.liferay.portal.dao.orm.hibernate.StringType" />
+		<property name="createDate" type="org.hibernate.type.TimestampType" />
+		<property name="modifiedDate" type="org.hibernate.type.TimestampType" />
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml
new file mode 100644
index 0000000..8404d4a
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<model-hints>
+	<model name="it.mwg.sicilia.login.model.Configurazione">
+		<field name="configurazioneId" type="long" />
+		<field name="nome" type="String" />
+		<field name="valore" type="String" />
+		<field name="companyId" type="long" />
+		<field name="userId" type="long" />
+		<field name="userName" type="String" />
+		<field name="createDate" type="Date" />
+		<field name="modifiedDate" type="Date" />
+	</model>
+</model-hints>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml
new file mode 100644
index 0000000..af52e84
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
+	<persistence-unit-metadata>
+		<xml-mapping-metadata-complete/>
+		<persistence-unit-defaults>
+			<access>PROPERTY</access>
+		</persistence-unit-defaults>
+	</persistence-unit-metadata>
+	<mapped-superclass class="it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl">
+		<attributes>
+			<id name="configurazioneId" />
+			<basic name="nome" />
+			<basic name="valore" />
+			<basic name="companyId" />
+			<basic name="userId" />
+			<basic name="userName" />
+			<basic name="createDate">
+				<temporal>TIMESTAMP</temporal>
+			</basic>
+			<basic name="modifiedDate">
+				<temporal>TIMESTAMP</temporal>
+			</basic>
+			<transient name="modelAttributes" />
+			<transient name="primaryKey" />
+			<transient name="primaryKeyObj" />
+			<transient name="userUuid" />
+		</attributes>
+	</mapped-superclass>
+	<entity class="it.mwg.sicilia.login.model.impl.ConfigurazioneImpl" name="Configurazione">
+		<table name="sicilia_login_Configurazione" />
+		<attributes />
+	</entity>
+</entity-mappings>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-spring.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-spring.xml
new file mode 100644
index 0000000..ff280ca
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/portlet-spring.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" default-destroy-method="destroy" default-init-method="afterPropertiesSet" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	<bean id="it.mwg.sicilia.login.service.ConfigurazioneLocalService" class="it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl" />
+	<bean id="it.mwg.sicilia.login.service.persistence.ConfigurazionePersistence" class="it.mwg.sicilia.login.service.persistence.ConfigurazionePersistenceImpl" parent="basePersistence" />
+</beans>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/shard-data-source-spring.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/shard-data-source-spring.xml
new file mode 100644
index 0000000..fe293f4
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/META-INF/shard-data-source-spring.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<beans
+	default-destroy-method="destroy"
+	default-init-method="afterPropertiesSet"
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+	<bean id="com.liferay.portal.dao.shard.advice.ShardAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.dao.shard.advice.ShardAdvice" />
+	</bean>
+	<bean id="com.liferay.portal.dao.shard.advice.ShardPersistenceAdvice" class="com.liferay.portal.kernel.spring.util.SpringFactoryUtil" factory-method="newBean">
+		<constructor-arg value="com.liferay.portal.dao.shard.advice.ShardPersistenceAdvice" />
+		<constructor-arg>
+			<map>
+				<entry key="shardAdvice" value-ref="com.liferay.portal.dao.shard.advice.ShardAdvice" />
+			</map>
+		</constructor-arg>
+	</bean>
+	<aop:config proxy-target-class="false">
+		<aop:advisor advice-ref="com.liferay.portal.dao.shard.advice.ShardPersistenceAdvice" pointcut="bean(*Persistence) || bean(*Finder)" />
+	</aop:config>
+</beans>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/content/Language.properties b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/content/Language.properties
new file mode 100644
index 0000000..026a397
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/content/Language.properties
@@ -0,0 +1,2 @@
+login-server = URL del server di login
+username-without-password = Per modificare il nome utente è necessario specificare anche la password
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/UserNameWithoutPasswordException.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/UserNameWithoutPasswordException.java
new file mode 100644
index 0000000..423c40c
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/UserNameWithoutPasswordException.java
@@ -0,0 +1,26 @@
+package it.mwg.sicilia.login;
+
+import com.liferay.portal.kernel.exception.SystemException;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ */
+@SuppressWarnings("serial")
+public class UserNameWithoutPasswordException extends SystemException {
+
+	public UserNameWithoutPasswordException() {
+		super();
+	}
+
+	public UserNameWithoutPasswordException(String msg) {
+		super(msg);
+	}
+
+	public UserNameWithoutPasswordException(Throwable cause) {
+		super(cause);
+	}
+
+	public UserNameWithoutPasswordException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+}
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneBaseImpl.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneBaseImpl.java
new file mode 100644
index 0000000..900b245
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneBaseImpl.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model.impl;
+
+import com.liferay.portal.kernel.exception.SystemException;
+
+import it.mwg.sicilia.login.model.Configurazione;
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+/**
+ * The extended model base implementation for the Configurazione service. Represents a row in the &quot;sicilia_login_Configurazione&quot; database table, with each column mapped to a property of this class.
+ *
+ * <p>
+ * This class exists only as a container for the default extended model level methods generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ConfigurazioneImpl}.
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazioneImpl
+ * @see it.mwg.sicilia.login.model.Configurazione
+ * @generated
+ */
+public abstract class ConfigurazioneBaseImpl extends ConfigurazioneModelImpl
+	implements Configurazione {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this class directly. All methods that expect a configurazione model instance should use the {@link Configurazione} interface instead.
+	 */
+	@Override
+	public void persist() throws SystemException {
+		if (this.isNew()) {
+			ConfigurazioneLocalServiceUtil.addConfigurazione(this);
+		}
+		else {
+			ConfigurazioneLocalServiceUtil.updateConfigurazione(this);
+		}
+	}
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneCacheModel.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneCacheModel.java
new file mode 100644
index 0000000..44d9d32
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneCacheModel.java
@@ -0,0 +1,166 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model.impl;
+
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.model.CacheModel;
+
+import it.mwg.sicilia.login.model.Configurazione;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import java.util.Date;
+
+/**
+ * The cache model class for representing Configurazione in entity cache.
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see Configurazione
+ * @generated
+ */
+public class ConfigurazioneCacheModel implements CacheModel<Configurazione>,
+	Externalizable {
+	@Override
+	public String toString() {
+		StringBundler sb = new StringBundler(17);
+
+		sb.append("{configurazioneId=");
+		sb.append(configurazioneId);
+		sb.append(", nome=");
+		sb.append(nome);
+		sb.append(", valore=");
+		sb.append(valore);
+		sb.append(", companyId=");
+		sb.append(companyId);
+		sb.append(", userId=");
+		sb.append(userId);
+		sb.append(", userName=");
+		sb.append(userName);
+		sb.append(", createDate=");
+		sb.append(createDate);
+		sb.append(", modifiedDate=");
+		sb.append(modifiedDate);
+		sb.append("}");
+
+		return sb.toString();
+	}
+
+	@Override
+	public Configurazione toEntityModel() {
+		ConfigurazioneImpl configurazioneImpl = new ConfigurazioneImpl();
+
+		configurazioneImpl.setConfigurazioneId(configurazioneId);
+
+		if (nome == null) {
+			configurazioneImpl.setNome(StringPool.BLANK);
+		}
+		else {
+			configurazioneImpl.setNome(nome);
+		}
+
+		if (valore == null) {
+			configurazioneImpl.setValore(StringPool.BLANK);
+		}
+		else {
+			configurazioneImpl.setValore(valore);
+		}
+
+		configurazioneImpl.setCompanyId(companyId);
+		configurazioneImpl.setUserId(userId);
+
+		if (userName == null) {
+			configurazioneImpl.setUserName(StringPool.BLANK);
+		}
+		else {
+			configurazioneImpl.setUserName(userName);
+		}
+
+		if (createDate == Long.MIN_VALUE) {
+			configurazioneImpl.setCreateDate(null);
+		}
+		else {
+			configurazioneImpl.setCreateDate(new Date(createDate));
+		}
+
+		if (modifiedDate == Long.MIN_VALUE) {
+			configurazioneImpl.setModifiedDate(null);
+		}
+		else {
+			configurazioneImpl.setModifiedDate(new Date(modifiedDate));
+		}
+
+		configurazioneImpl.resetOriginalValues();
+
+		return configurazioneImpl;
+	}
+
+	@Override
+	public void readExternal(ObjectInput objectInput) throws IOException {
+		configurazioneId = objectInput.readLong();
+		nome = objectInput.readUTF();
+		valore = objectInput.readUTF();
+		companyId = objectInput.readLong();
+		userId = objectInput.readLong();
+		userName = objectInput.readUTF();
+		createDate = objectInput.readLong();
+		modifiedDate = objectInput.readLong();
+	}
+
+	@Override
+	public void writeExternal(ObjectOutput objectOutput)
+		throws IOException {
+		objectOutput.writeLong(configurazioneId);
+
+		if (nome == null) {
+			objectOutput.writeUTF(StringPool.BLANK);
+		}
+		else {
+			objectOutput.writeUTF(nome);
+		}
+
+		if (valore == null) {
+			objectOutput.writeUTF(StringPool.BLANK);
+		}
+		else {
+			objectOutput.writeUTF(valore);
+		}
+
+		objectOutput.writeLong(companyId);
+		objectOutput.writeLong(userId);
+
+		if (userName == null) {
+			objectOutput.writeUTF(StringPool.BLANK);
+		}
+		else {
+			objectOutput.writeUTF(userName);
+		}
+
+		objectOutput.writeLong(createDate);
+		objectOutput.writeLong(modifiedDate);
+	}
+
+	public long configurazioneId;
+	public String nome;
+	public String valore;
+	public long companyId;
+	public long userId;
+	public String userName;
+	public long createDate;
+	public long modifiedDate;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneImpl.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneImpl.java
new file mode 100644
index 0000000..707d933
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneImpl.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model.impl;
+
+/**
+ * The extended model implementation for the Configurazione service. Represents a row in the &quot;sicilia_login_Configurazione&quot; database table, with each column mapped to a property of this class.
+ *
+ * <p>
+ * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.mwg.sicilia.login.model.Configurazione} interface.
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ */
+public class ConfigurazioneImpl extends ConfigurazioneBaseImpl {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never reference this class directly. All methods that expect a configurazione model instance should use the {@link it.mwg.sicilia.login.model.Configurazione} interface instead.
+	 */
+	public ConfigurazioneImpl() {
+	}
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneModelImpl.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneModelImpl.java
new file mode 100644
index 0000000..dc31640
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/model/impl/ConfigurazioneModelImpl.java
@@ -0,0 +1,566 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.model.impl;
+
+import com.liferay.portal.kernel.bean.AutoEscapeBeanHandler;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.ProxyUtil;
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.model.CacheModel;
+import com.liferay.portal.model.impl.BaseModelImpl;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.util.PortalUtil;
+
+import com.liferay.portlet.expando.model.ExpandoBridge;
+import com.liferay.portlet.expando.util.ExpandoBridgeFactoryUtil;
+
+import it.mwg.sicilia.login.model.Configurazione;
+import it.mwg.sicilia.login.model.ConfigurazioneModel;
+
+import java.io.Serializable;
+
+import java.sql.Types;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The base model implementation for the Configurazione service. Represents a row in the &quot;sicilia_login_Configurazione&quot; database table, with each column mapped to a property of this class.
+ *
+ * <p>
+ * This implementation and its corresponding interface {@link it.mwg.sicilia.login.model.ConfigurazioneModel} exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in {@link ConfigurazioneImpl}.
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazioneImpl
+ * @see it.mwg.sicilia.login.model.Configurazione
+ * @see it.mwg.sicilia.login.model.ConfigurazioneModel
+ * @generated
+ */
+public class ConfigurazioneModelImpl extends BaseModelImpl<Configurazione>
+	implements ConfigurazioneModel {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this class directly. All methods that expect a configurazione model instance should use the {@link it.mwg.sicilia.login.model.Configurazione} interface instead.
+	 */
+	public static final String TABLE_NAME = "sicilia_login_Configurazione";
+	public static final Object[][] TABLE_COLUMNS = {
+			{ "configurazioneId", Types.BIGINT },
+			{ "nome", Types.VARCHAR },
+			{ "valore", Types.VARCHAR },
+			{ "companyId", Types.BIGINT },
+			{ "userId", Types.BIGINT },
+			{ "userName", Types.VARCHAR },
+			{ "createDate", Types.TIMESTAMP },
+			{ "modifiedDate", Types.TIMESTAMP }
+		};
+	public static final String TABLE_SQL_CREATE = "create table sicilia_login_Configurazione (configurazioneId LONG not null primary key,nome VARCHAR(75) null,valore VARCHAR(75) null,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null)";
+	public static final String TABLE_SQL_DROP = "drop table sicilia_login_Configurazione";
+	public static final String ORDER_BY_JPQL = " ORDER BY configurazione.configurazioneId ASC";
+	public static final String ORDER_BY_SQL = " ORDER BY sicilia_login_Configurazione.configurazioneId ASC";
+	public static final String DATA_SOURCE = "liferayDataSource";
+	public static final String SESSION_FACTORY = "liferaySessionFactory";
+	public static final String TX_MANAGER = "liferayTransactionManager";
+	public static final boolean ENTITY_CACHE_ENABLED = GetterUtil.getBoolean(com.liferay.util.service.ServiceProps.get(
+				"value.object.entity.cache.enabled.it.mwg.sicilia.login.model.Configurazione"),
+			true);
+	public static final boolean FINDER_CACHE_ENABLED = GetterUtil.getBoolean(com.liferay.util.service.ServiceProps.get(
+				"value.object.finder.cache.enabled.it.mwg.sicilia.login.model.Configurazione"),
+			true);
+	public static final boolean COLUMN_BITMASK_ENABLED = GetterUtil.getBoolean(com.liferay.util.service.ServiceProps.get(
+				"value.object.column.bitmask.enabled.it.mwg.sicilia.login.model.Configurazione"),
+			true);
+	public static long COMPANYID_COLUMN_BITMASK = 1L;
+	public static long NOME_COLUMN_BITMASK = 2L;
+	public static long CONFIGURAZIONEID_COLUMN_BITMASK = 4L;
+	public static final long LOCK_EXPIRATION_TIME = GetterUtil.getLong(com.liferay.util.service.ServiceProps.get(
+				"lock.expiration.time.it.mwg.sicilia.login.model.Configurazione"));
+
+	public ConfigurazioneModelImpl() {
+	}
+
+	@Override
+	public long getPrimaryKey() {
+		return _configurazioneId;
+	}
+
+	@Override
+	public void setPrimaryKey(long primaryKey) {
+		setConfigurazioneId(primaryKey);
+	}
+
+	@Override
+	public Serializable getPrimaryKeyObj() {
+		return _configurazioneId;
+	}
+
+	@Override
+	public void setPrimaryKeyObj(Serializable primaryKeyObj) {
+		setPrimaryKey(((Long)primaryKeyObj).longValue());
+	}
+
+	@Override
+	public Class<?> getModelClass() {
+		return Configurazione.class;
+	}
+
+	@Override
+	public String getModelClassName() {
+		return Configurazione.class.getName();
+	}
+
+	@Override
+	public Map<String, Object> getModelAttributes() {
+		Map<String, Object> attributes = new HashMap<String, Object>();
+
+		attributes.put("configurazioneId", getConfigurazioneId());
+		attributes.put("nome", getNome());
+		attributes.put("valore", getValore());
+		attributes.put("companyId", getCompanyId());
+		attributes.put("userId", getUserId());
+		attributes.put("userName", getUserName());
+		attributes.put("createDate", getCreateDate());
+		attributes.put("modifiedDate", getModifiedDate());
+
+		return attributes;
+	}
+
+	@Override
+	public void setModelAttributes(Map<String, Object> attributes) {
+		Long configurazioneId = (Long)attributes.get("configurazioneId");
+
+		if (configurazioneId != null) {
+			setConfigurazioneId(configurazioneId);
+		}
+
+		String nome = (String)attributes.get("nome");
+
+		if (nome != null) {
+			setNome(nome);
+		}
+
+		String valore = (String)attributes.get("valore");
+
+		if (valore != null) {
+			setValore(valore);
+		}
+
+		Long companyId = (Long)attributes.get("companyId");
+
+		if (companyId != null) {
+			setCompanyId(companyId);
+		}
+
+		Long userId = (Long)attributes.get("userId");
+
+		if (userId != null) {
+			setUserId(userId);
+		}
+
+		String userName = (String)attributes.get("userName");
+
+		if (userName != null) {
+			setUserName(userName);
+		}
+
+		Date createDate = (Date)attributes.get("createDate");
+
+		if (createDate != null) {
+			setCreateDate(createDate);
+		}
+
+		Date modifiedDate = (Date)attributes.get("modifiedDate");
+
+		if (modifiedDate != null) {
+			setModifiedDate(modifiedDate);
+		}
+	}
+
+	@Override
+	public long getConfigurazioneId() {
+		return _configurazioneId;
+	}
+
+	@Override
+	public void setConfigurazioneId(long configurazioneId) {
+		_configurazioneId = configurazioneId;
+	}
+
+	@Override
+	public String getNome() {
+		if (_nome == null) {
+			return StringPool.BLANK;
+		}
+		else {
+			return _nome;
+		}
+	}
+
+	@Override
+	public void setNome(String nome) {
+		_columnBitmask |= NOME_COLUMN_BITMASK;
+
+		if (_originalNome == null) {
+			_originalNome = _nome;
+		}
+
+		_nome = nome;
+	}
+
+	public String getOriginalNome() {
+		return GetterUtil.getString(_originalNome);
+	}
+
+	@Override
+	public String getValore() {
+		if (_valore == null) {
+			return StringPool.BLANK;
+		}
+		else {
+			return _valore;
+		}
+	}
+
+	@Override
+	public void setValore(String valore) {
+		_valore = valore;
+	}
+
+	@Override
+	public long getCompanyId() {
+		return _companyId;
+	}
+
+	@Override
+	public void setCompanyId(long companyId) {
+		_columnBitmask |= COMPANYID_COLUMN_BITMASK;
+
+		if (!_setOriginalCompanyId) {
+			_setOriginalCompanyId = true;
+
+			_originalCompanyId = _companyId;
+		}
+
+		_companyId = companyId;
+	}
+
+	public long getOriginalCompanyId() {
+		return _originalCompanyId;
+	}
+
+	@Override
+	public long getUserId() {
+		return _userId;
+	}
+
+	@Override
+	public void setUserId(long userId) {
+		_userId = userId;
+	}
+
+	@Override
+	public String getUserUuid() throws SystemException {
+		return PortalUtil.getUserValue(getUserId(), "uuid", _userUuid);
+	}
+
+	@Override
+	public void setUserUuid(String userUuid) {
+		_userUuid = userUuid;
+	}
+
+	@Override
+	public String getUserName() {
+		if (_userName == null) {
+			return StringPool.BLANK;
+		}
+		else {
+			return _userName;
+		}
+	}
+
+	@Override
+	public void setUserName(String userName) {
+		_userName = userName;
+	}
+
+	@Override
+	public Date getCreateDate() {
+		return _createDate;
+	}
+
+	@Override
+	public void setCreateDate(Date createDate) {
+		_createDate = createDate;
+	}
+
+	@Override
+	public Date getModifiedDate() {
+		return _modifiedDate;
+	}
+
+	@Override
+	public void setModifiedDate(Date modifiedDate) {
+		_modifiedDate = modifiedDate;
+	}
+
+	public long getColumnBitmask() {
+		return _columnBitmask;
+	}
+
+	@Override
+	public ExpandoBridge getExpandoBridge() {
+		return ExpandoBridgeFactoryUtil.getExpandoBridge(getCompanyId(),
+			Configurazione.class.getName(), getPrimaryKey());
+	}
+
+	@Override
+	public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
+		ExpandoBridge expandoBridge = getExpandoBridge();
+
+		expandoBridge.setAttributes(serviceContext);
+	}
+
+	@Override
+	public Configurazione toEscapedModel() {
+		if (_escapedModel == null) {
+			_escapedModel = (Configurazione)ProxyUtil.newProxyInstance(_classLoader,
+					_escapedModelInterfaces, new AutoEscapeBeanHandler(this));
+		}
+
+		return _escapedModel;
+	}
+
+	@Override
+	public Object clone() {
+		ConfigurazioneImpl configurazioneImpl = new ConfigurazioneImpl();
+
+		configurazioneImpl.setConfigurazioneId(getConfigurazioneId());
+		configurazioneImpl.setNome(getNome());
+		configurazioneImpl.setValore(getValore());
+		configurazioneImpl.setCompanyId(getCompanyId());
+		configurazioneImpl.setUserId(getUserId());
+		configurazioneImpl.setUserName(getUserName());
+		configurazioneImpl.setCreateDate(getCreateDate());
+		configurazioneImpl.setModifiedDate(getModifiedDate());
+
+		configurazioneImpl.resetOriginalValues();
+
+		return configurazioneImpl;
+	}
+
+	@Override
+	public int compareTo(Configurazione configurazione) {
+		long primaryKey = configurazione.getPrimaryKey();
+
+		if (getPrimaryKey() < primaryKey) {
+			return -1;
+		}
+		else if (getPrimaryKey() > primaryKey) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+
+		if (!(obj instanceof Configurazione)) {
+			return false;
+		}
+
+		Configurazione configurazione = (Configurazione)obj;
+
+		long primaryKey = configurazione.getPrimaryKey();
+
+		if (getPrimaryKey() == primaryKey) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	@Override
+	public int hashCode() {
+		return (int)getPrimaryKey();
+	}
+
+	@Override
+	public void resetOriginalValues() {
+		ConfigurazioneModelImpl configurazioneModelImpl = this;
+
+		configurazioneModelImpl._originalNome = configurazioneModelImpl._nome;
+
+		configurazioneModelImpl._originalCompanyId = configurazioneModelImpl._companyId;
+
+		configurazioneModelImpl._setOriginalCompanyId = false;
+
+		configurazioneModelImpl._columnBitmask = 0;
+	}
+
+	@Override
+	public CacheModel<Configurazione> toCacheModel() {
+		ConfigurazioneCacheModel configurazioneCacheModel = new ConfigurazioneCacheModel();
+
+		configurazioneCacheModel.configurazioneId = getConfigurazioneId();
+
+		configurazioneCacheModel.nome = getNome();
+
+		String nome = configurazioneCacheModel.nome;
+
+		if ((nome != null) && (nome.length() == 0)) {
+			configurazioneCacheModel.nome = null;
+		}
+
+		configurazioneCacheModel.valore = getValore();
+
+		String valore = configurazioneCacheModel.valore;
+
+		if ((valore != null) && (valore.length() == 0)) {
+			configurazioneCacheModel.valore = null;
+		}
+
+		configurazioneCacheModel.companyId = getCompanyId();
+
+		configurazioneCacheModel.userId = getUserId();
+
+		configurazioneCacheModel.userName = getUserName();
+
+		String userName = configurazioneCacheModel.userName;
+
+		if ((userName != null) && (userName.length() == 0)) {
+			configurazioneCacheModel.userName = null;
+		}
+
+		Date createDate = getCreateDate();
+
+		if (createDate != null) {
+			configurazioneCacheModel.createDate = createDate.getTime();
+		}
+		else {
+			configurazioneCacheModel.createDate = Long.MIN_VALUE;
+		}
+
+		Date modifiedDate = getModifiedDate();
+
+		if (modifiedDate != null) {
+			configurazioneCacheModel.modifiedDate = modifiedDate.getTime();
+		}
+		else {
+			configurazioneCacheModel.modifiedDate = Long.MIN_VALUE;
+		}
+
+		return configurazioneCacheModel;
+	}
+
+	@Override
+	public String toString() {
+		StringBundler sb = new StringBundler(17);
+
+		sb.append("{configurazioneId=");
+		sb.append(getConfigurazioneId());
+		sb.append(", nome=");
+		sb.append(getNome());
+		sb.append(", valore=");
+		sb.append(getValore());
+		sb.append(", companyId=");
+		sb.append(getCompanyId());
+		sb.append(", userId=");
+		sb.append(getUserId());
+		sb.append(", userName=");
+		sb.append(getUserName());
+		sb.append(", createDate=");
+		sb.append(getCreateDate());
+		sb.append(", modifiedDate=");
+		sb.append(getModifiedDate());
+		sb.append("}");
+
+		return sb.toString();
+	}
+
+	@Override
+	public String toXmlString() {
+		StringBundler sb = new StringBundler(28);
+
+		sb.append("<model><model-name>");
+		sb.append("it.mwg.sicilia.login.model.Configurazione");
+		sb.append("</model-name>");
+
+		sb.append(
+			"<column><column-name>configurazioneId</column-name><column-value><![CDATA[");
+		sb.append(getConfigurazioneId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>nome</column-name><column-value><![CDATA[");
+		sb.append(getNome());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>valore</column-name><column-value><![CDATA[");
+		sb.append(getValore());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>companyId</column-name><column-value><![CDATA[");
+		sb.append(getCompanyId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>userId</column-name><column-value><![CDATA[");
+		sb.append(getUserId());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>userName</column-name><column-value><![CDATA[");
+		sb.append(getUserName());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>createDate</column-name><column-value><![CDATA[");
+		sb.append(getCreateDate());
+		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>modifiedDate</column-name><column-value><![CDATA[");
+		sb.append(getModifiedDate());
+		sb.append("]]></column-value></column>");
+
+		sb.append("</model>");
+
+		return sb.toString();
+	}
+
+	private static ClassLoader _classLoader = Configurazione.class.getClassLoader();
+	private static Class<?>[] _escapedModelInterfaces = new Class[] {
+			Configurazione.class
+		};
+	private long _configurazioneId;
+	private String _nome;
+	private String _originalNome;
+	private String _valore;
+	private long _companyId;
+	private long _originalCompanyId;
+	private boolean _setOriginalCompanyId;
+	private long _userId;
+	private String _userUuid;
+	private String _userName;
+	private Date _createDate;
+	private Date _modifiedDate;
+	private long _columnBitmask;
+	private Configurazione _escapedModel;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/portlet/ConfigurazioneLogin.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/portlet/ConfigurazioneLogin.java
new file mode 100644
index 0000000..a8eb61e
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/portlet/ConfigurazioneLogin.java
@@ -0,0 +1,19 @@
+package it.mwg.sicilia.login.portlet;
+
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.util.bridges.mvc.MVCPortlet;
+
+public class ConfigurazioneLogin extends MVCPortlet {
+
+	public void salvaImpostazioni(ActionRequest request, ActionResponse response) throws PortalException,
+			SystemException {
+
+		ConfigurazioneLocalServiceUtil.salvaImpostazioni(request, response);
+	}
+}
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/base/ConfigurazioneLocalServiceBaseImpl.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/base/ConfigurazioneLocalServiceBaseImpl.java
new file mode 100644
index 0000000..6eaab13
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/base/ConfigurazioneLocalServiceBaseImpl.java
@@ -0,0 +1,514 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service.base;
+
+import com.liferay.portal.kernel.bean.BeanReference;
+import com.liferay.portal.kernel.bean.IdentifiableBean;
+import com.liferay.portal.kernel.dao.jdbc.SqlUpdate;
+import com.liferay.portal.kernel.dao.jdbc.SqlUpdateFactoryUtil;
+import com.liferay.portal.kernel.dao.orm.DynamicQuery;
+import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil;
+import com.liferay.portal.kernel.dao.orm.Projection;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.search.Indexable;
+import com.liferay.portal.kernel.search.IndexableType;
+import com.liferay.portal.kernel.util.OrderByComparator;
+import com.liferay.portal.model.PersistedModel;
+import com.liferay.portal.service.BaseLocalServiceImpl;
+import com.liferay.portal.service.PersistedModelLocalServiceRegistryUtil;
+import com.liferay.portal.service.persistence.UserPersistence;
+
+import it.mwg.sicilia.login.model.Configurazione;
+import it.mwg.sicilia.login.service.ConfigurazioneLocalService;
+import it.mwg.sicilia.login.service.persistence.ConfigurazionePersistence;
+
+import java.io.Serializable;
+
+import java.util.List;
+
+import javax.sql.DataSource;
+
+/**
+ * Provides the base implementation for the configurazione local service.
+ *
+ * <p>
+ * This implementation exists only as a container for the default service methods generated by ServiceBuilder. All custom service methods should be put in {@link it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl}.
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see it.mwg.sicilia.login.service.impl.ConfigurazioneLocalServiceImpl
+ * @see it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil
+ * @generated
+ */
+public abstract class ConfigurazioneLocalServiceBaseImpl
+	extends BaseLocalServiceImpl implements ConfigurazioneLocalService,
+		IdentifiableBean {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this class directly. Always use {@link it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil} to access the configurazione local service.
+	 */
+
+	/**
+	 * Adds the configurazione to the database. Also notifies the appropriate model listeners.
+	 *
+	 * @param configurazione the configurazione
+	 * @return the configurazione that was added
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Indexable(type = IndexableType.REINDEX)
+	@Override
+	public Configurazione addConfigurazione(Configurazione configurazione)
+		throws SystemException {
+		configurazione.setNew(true);
+
+		return configurazionePersistence.update(configurazione);
+	}
+
+	/**
+	 * Creates a new configurazione with the primary key. Does not add the configurazione to the database.
+	 *
+	 * @param configurazioneId the primary key for the new configurazione
+	 * @return the new configurazione
+	 */
+	@Override
+	public Configurazione createConfigurazione(long configurazioneId) {
+		return configurazionePersistence.create(configurazioneId);
+	}
+
+	/**
+	 * Deletes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	 *
+	 * @param configurazioneId the primary key of the configurazione
+	 * @return the configurazione that was removed
+	 * @throws PortalException if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Indexable(type = IndexableType.DELETE)
+	@Override
+	public Configurazione deleteConfigurazione(long configurazioneId)
+		throws PortalException, SystemException {
+		return configurazionePersistence.remove(configurazioneId);
+	}
+
+	/**
+	 * Deletes the configurazione from the database. Also notifies the appropriate model listeners.
+	 *
+	 * @param configurazione the configurazione
+	 * @return the configurazione that was removed
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Indexable(type = IndexableType.DELETE)
+	@Override
+	public Configurazione deleteConfigurazione(Configurazione configurazione)
+		throws SystemException {
+		return configurazionePersistence.remove(configurazione);
+	}
+
+	@Override
+	public DynamicQuery dynamicQuery() {
+		Class<?> clazz = getClass();
+
+		return DynamicQueryFactoryUtil.forClass(Configurazione.class,
+			clazz.getClassLoader());
+	}
+
+	/**
+	 * Performs a dynamic query on the database and returns the matching rows.
+	 *
+	 * @param dynamicQuery the dynamic query
+	 * @return the matching rows
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	public List dynamicQuery(DynamicQuery dynamicQuery)
+		throws SystemException {
+		return configurazionePersistence.findWithDynamicQuery(dynamicQuery);
+	}
+
+	/**
+	 * Performs a dynamic query on the database and returns a range of the matching rows.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param dynamicQuery the dynamic query
+	 * @param start the lower bound of the range of model instances
+	 * @param end the upper bound of the range of model instances (not inclusive)
+	 * @return the range of matching rows
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	public List dynamicQuery(DynamicQuery dynamicQuery, int start, int end)
+		throws SystemException {
+		return configurazionePersistence.findWithDynamicQuery(dynamicQuery,
+			start, end);
+	}
+
+	/**
+	 * Performs a dynamic query on the database and returns an ordered range of the matching rows.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param dynamicQuery the dynamic query
+	 * @param start the lower bound of the range of model instances
+	 * @param end the upper bound of the range of model instances (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @return the ordered range of matching rows
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	public List dynamicQuery(DynamicQuery dynamicQuery, int start, int end,
+		OrderByComparator orderByComparator) throws SystemException {
+		return configurazionePersistence.findWithDynamicQuery(dynamicQuery,
+			start, end, orderByComparator);
+	}
+
+	/**
+	 * Returns the number of rows that match the dynamic query.
+	 *
+	 * @param dynamicQuery the dynamic query
+	 * @return the number of rows that match the dynamic query
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public long dynamicQueryCount(DynamicQuery dynamicQuery)
+		throws SystemException {
+		return configurazionePersistence.countWithDynamicQuery(dynamicQuery);
+	}
+
+	/**
+	 * Returns the number of rows that match the dynamic query.
+	 *
+	 * @param dynamicQuery the dynamic query
+	 * @param projection the projection to apply to the query
+	 * @return the number of rows that match the dynamic query
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public long dynamicQueryCount(DynamicQuery dynamicQuery,
+		Projection projection) throws SystemException {
+		return configurazionePersistence.countWithDynamicQuery(dynamicQuery,
+			projection);
+	}
+
+	@Override
+	public Configurazione fetchConfigurazione(long configurazioneId)
+		throws SystemException {
+		return configurazionePersistence.fetchByPrimaryKey(configurazioneId);
+	}
+
+	/**
+	 * Returns the configurazione with the primary key.
+	 *
+	 * @param configurazioneId the primary key of the configurazione
+	 * @return the configurazione
+	 * @throws PortalException if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione getConfigurazione(long configurazioneId)
+		throws PortalException, SystemException {
+		return configurazionePersistence.findByPrimaryKey(configurazioneId);
+	}
+
+	@Override
+	public PersistedModel getPersistedModel(Serializable primaryKeyObj)
+		throws PortalException, SystemException {
+		return configurazionePersistence.findByPrimaryKey(primaryKeyObj);
+	}
+
+	/**
+	 * Returns a range of all the configuraziones.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param start the lower bound of the range of configuraziones
+	 * @param end the upper bound of the range of configuraziones (not inclusive)
+	 * @return the range of configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public List<Configurazione> getConfiguraziones(int start, int end)
+		throws SystemException {
+		return configurazionePersistence.findAll(start, end);
+	}
+
+	/**
+	 * Returns the number of configuraziones.
+	 *
+	 * @return the number of configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public int getConfigurazionesCount() throws SystemException {
+		return configurazionePersistence.countAll();
+	}
+
+	/**
+	 * Updates the configurazione in the database or adds it if it does not yet exist. Also notifies the appropriate model listeners.
+	 *
+	 * @param configurazione the configurazione
+	 * @return the configurazione that was updated
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Indexable(type = IndexableType.REINDEX)
+	@Override
+	public Configurazione updateConfigurazione(Configurazione configurazione)
+		throws SystemException {
+		return configurazionePersistence.update(configurazione);
+	}
+
+	/**
+	 * Returns the configurazione local service.
+	 *
+	 * @return the configurazione local service
+	 */
+	public it.mwg.sicilia.login.service.ConfigurazioneLocalService getConfigurazioneLocalService() {
+		return configurazioneLocalService;
+	}
+
+	/**
+	 * Sets the configurazione local service.
+	 *
+	 * @param configurazioneLocalService the configurazione local service
+	 */
+	public void setConfigurazioneLocalService(
+		it.mwg.sicilia.login.service.ConfigurazioneLocalService configurazioneLocalService) {
+		this.configurazioneLocalService = configurazioneLocalService;
+	}
+
+	/**
+	 * Returns the configurazione persistence.
+	 *
+	 * @return the configurazione persistence
+	 */
+	public ConfigurazionePersistence getConfigurazionePersistence() {
+		return configurazionePersistence;
+	}
+
+	/**
+	 * Sets the configurazione persistence.
+	 *
+	 * @param configurazionePersistence the configurazione persistence
+	 */
+	public void setConfigurazionePersistence(
+		ConfigurazionePersistence configurazionePersistence) {
+		this.configurazionePersistence = configurazionePersistence;
+	}
+
+	/**
+	 * Returns the counter local service.
+	 *
+	 * @return the counter local service
+	 */
+	public com.liferay.counter.service.CounterLocalService getCounterLocalService() {
+		return counterLocalService;
+	}
+
+	/**
+	 * Sets the counter local service.
+	 *
+	 * @param counterLocalService the counter local service
+	 */
+	public void setCounterLocalService(
+		com.liferay.counter.service.CounterLocalService counterLocalService) {
+		this.counterLocalService = counterLocalService;
+	}
+
+	/**
+	 * Returns the resource local service.
+	 *
+	 * @return the resource local service
+	 */
+	public com.liferay.portal.service.ResourceLocalService getResourceLocalService() {
+		return resourceLocalService;
+	}
+
+	/**
+	 * Sets the resource local service.
+	 *
+	 * @param resourceLocalService the resource local service
+	 */
+	public void setResourceLocalService(
+		com.liferay.portal.service.ResourceLocalService resourceLocalService) {
+		this.resourceLocalService = resourceLocalService;
+	}
+
+	/**
+	 * Returns the user local service.
+	 *
+	 * @return the user local service
+	 */
+	public com.liferay.portal.service.UserLocalService getUserLocalService() {
+		return userLocalService;
+	}
+
+	/**
+	 * Sets the user local service.
+	 *
+	 * @param userLocalService the user local service
+	 */
+	public void setUserLocalService(
+		com.liferay.portal.service.UserLocalService userLocalService) {
+		this.userLocalService = userLocalService;
+	}
+
+	/**
+	 * Returns the user remote service.
+	 *
+	 * @return the user remote service
+	 */
+	public com.liferay.portal.service.UserService getUserService() {
+		return userService;
+	}
+
+	/**
+	 * Sets the user remote service.
+	 *
+	 * @param userService the user remote service
+	 */
+	public void setUserService(
+		com.liferay.portal.service.UserService userService) {
+		this.userService = userService;
+	}
+
+	/**
+	 * Returns the user persistence.
+	 *
+	 * @return the user persistence
+	 */
+	public UserPersistence getUserPersistence() {
+		return userPersistence;
+	}
+
+	/**
+	 * Sets the user persistence.
+	 *
+	 * @param userPersistence the user persistence
+	 */
+	public void setUserPersistence(UserPersistence userPersistence) {
+		this.userPersistence = userPersistence;
+	}
+
+	public void afterPropertiesSet() {
+		Class<?> clazz = getClass();
+
+		_classLoader = clazz.getClassLoader();
+
+		PersistedModelLocalServiceRegistryUtil.register("it.mwg.sicilia.login.model.Configurazione",
+			configurazioneLocalService);
+	}
+
+	public void destroy() {
+		PersistedModelLocalServiceRegistryUtil.unregister(
+			"it.mwg.sicilia.login.model.Configurazione");
+	}
+
+	/**
+	 * Returns the Spring bean ID for this bean.
+	 *
+	 * @return the Spring bean ID for this bean
+	 */
+	@Override
+	public String getBeanIdentifier() {
+		return _beanIdentifier;
+	}
+
+	/**
+	 * Sets the Spring bean ID for this bean.
+	 *
+	 * @param beanIdentifier the Spring bean ID for this bean
+	 */
+	@Override
+	public void setBeanIdentifier(String beanIdentifier) {
+		_beanIdentifier = beanIdentifier;
+	}
+
+	@Override
+	public Object invokeMethod(String name, String[] parameterTypes,
+		Object[] arguments) throws Throwable {
+		Thread currentThread = Thread.currentThread();
+
+		ClassLoader contextClassLoader = currentThread.getContextClassLoader();
+
+		if (contextClassLoader != _classLoader) {
+			currentThread.setContextClassLoader(_classLoader);
+		}
+
+		try {
+			return _clpInvoker.invokeMethod(name, parameterTypes, arguments);
+		}
+		finally {
+			if (contextClassLoader != _classLoader) {
+				currentThread.setContextClassLoader(contextClassLoader);
+			}
+		}
+	}
+
+	protected Class<?> getModelClass() {
+		return Configurazione.class;
+	}
+
+	protected String getModelClassName() {
+		return Configurazione.class.getName();
+	}
+
+	/**
+	 * Performs an SQL query.
+	 *
+	 * @param sql the sql query
+	 */
+	protected void runSQL(String sql) throws SystemException {
+		try {
+			DataSource dataSource = configurazionePersistence.getDataSource();
+
+			SqlUpdate sqlUpdate = SqlUpdateFactoryUtil.getSqlUpdate(dataSource,
+					sql, new int[0]);
+
+			sqlUpdate.update();
+		}
+		catch (Exception e) {
+			throw new SystemException(e);
+		}
+	}
+
+	@BeanReference(type = it.mwg.sicilia.login.service.ConfigurazioneLocalService.class)
+	protected it.mwg.sicilia.login.service.ConfigurazioneLocalService configurazioneLocalService;
+	@BeanReference(type = ConfigurazionePersistence.class)
+	protected ConfigurazionePersistence configurazionePersistence;
+	@BeanReference(type = com.liferay.counter.service.CounterLocalService.class)
+	protected com.liferay.counter.service.CounterLocalService counterLocalService;
+	@BeanReference(type = com.liferay.portal.service.ResourceLocalService.class)
+	protected com.liferay.portal.service.ResourceLocalService resourceLocalService;
+	@BeanReference(type = com.liferay.portal.service.UserLocalService.class)
+	protected com.liferay.portal.service.UserLocalService userLocalService;
+	@BeanReference(type = com.liferay.portal.service.UserService.class)
+	protected com.liferay.portal.service.UserService userService;
+	@BeanReference(type = UserPersistence.class)
+	protected UserPersistence userPersistence;
+	private String _beanIdentifier;
+	private ClassLoader _classLoader;
+	private ConfigurazioneLocalServiceClpInvoker _clpInvoker = new ConfigurazioneLocalServiceClpInvoker();
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/base/ConfigurazioneLocalServiceClpInvoker.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/base/ConfigurazioneLocalServiceClpInvoker.java
new file mode 100644
index 0000000..ec23772
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/base/ConfigurazioneLocalServiceClpInvoker.java
@@ -0,0 +1,383 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service.base;
+
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+import java.util.Arrays;
+
+/**
+ * @author Manifattura Web Group s.r.l.
+ * @generated
+ */
+public class ConfigurazioneLocalServiceClpInvoker {
+	public ConfigurazioneLocalServiceClpInvoker() {
+		_methodName0 = "addConfigurazione";
+
+		_methodParameterTypes0 = new String[] {
+				"it.mwg.sicilia.login.model.Configurazione"
+			};
+
+		_methodName1 = "createConfigurazione";
+
+		_methodParameterTypes1 = new String[] { "long" };
+
+		_methodName2 = "deleteConfigurazione";
+
+		_methodParameterTypes2 = new String[] { "long" };
+
+		_methodName3 = "deleteConfigurazione";
+
+		_methodParameterTypes3 = new String[] {
+				"it.mwg.sicilia.login.model.Configurazione"
+			};
+
+		_methodName4 = "dynamicQuery";
+
+		_methodParameterTypes4 = new String[] {  };
+
+		_methodName5 = "dynamicQuery";
+
+		_methodParameterTypes5 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery"
+			};
+
+		_methodName6 = "dynamicQuery";
+
+		_methodParameterTypes6 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery", "int", "int"
+			};
+
+		_methodName7 = "dynamicQuery";
+
+		_methodParameterTypes7 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery", "int", "int",
+				"com.liferay.portal.kernel.util.OrderByComparator"
+			};
+
+		_methodName8 = "dynamicQueryCount";
+
+		_methodParameterTypes8 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery"
+			};
+
+		_methodName9 = "dynamicQueryCount";
+
+		_methodParameterTypes9 = new String[] {
+				"com.liferay.portal.kernel.dao.orm.DynamicQuery",
+				"com.liferay.portal.kernel.dao.orm.Projection"
+			};
+
+		_methodName10 = "fetchConfigurazione";
+
+		_methodParameterTypes10 = new String[] { "long" };
+
+		_methodName11 = "getConfigurazione";
+
+		_methodParameterTypes11 = new String[] { "long" };
+
+		_methodName12 = "getPersistedModel";
+
+		_methodParameterTypes12 = new String[] { "java.io.Serializable" };
+
+		_methodName13 = "getConfiguraziones";
+
+		_methodParameterTypes13 = new String[] { "int", "int" };
+
+		_methodName14 = "getConfigurazionesCount";
+
+		_methodParameterTypes14 = new String[] {  };
+
+		_methodName15 = "updateConfigurazione";
+
+		_methodParameterTypes15 = new String[] {
+				"it.mwg.sicilia.login.model.Configurazione"
+			};
+
+		_methodName32 = "getBeanIdentifier";
+
+		_methodParameterTypes32 = new String[] {  };
+
+		_methodName33 = "setBeanIdentifier";
+
+		_methodParameterTypes33 = new String[] { "java.lang.String" };
+
+		_methodName38 = "findByCompanyId_Nome";
+
+		_methodParameterTypes38 = new String[] { "long", "java.lang.String" };
+
+		_methodName40 = "getApiServer";
+
+		_methodParameterTypes40 = new String[] { "long" };
+
+		_methodName41 = "getApiServerKey";
+
+		_methodParameterTypes41 = new String[] {  };
+
+		_methodName42 = "getApiUsername";
+
+		_methodParameterTypes42 = new String[] { "long" };
+
+		_methodName43 = "getApiUsernameKey";
+
+		_methodParameterTypes43 = new String[] {  };
+
+		_methodName44 = "getApiPassword";
+
+		_methodParameterTypes44 = new String[] { "long" };
+
+		_methodName45 = "getApiPasswordKey";
+
+		_methodParameterTypes45 = new String[] {  };
+
+		_methodName46 = "salvaImpostazioni";
+
+		_methodParameterTypes46 = new String[] {
+				"javax.portlet.ActionRequest", "javax.portlet.ActionResponse"
+			};
+
+		_methodName47 = "set";
+
+		_methodParameterTypes47 = new String[] {
+				"long", "com.liferay.portal.model.User", "java.lang.String",
+				"java.lang.String"
+			};
+
+		_methodName48 = "setDefaults";
+
+		_methodParameterTypes48 = new String[] { "long" };
+	}
+
+	public Object invokeMethod(String name, String[] parameterTypes,
+		Object[] arguments) throws Throwable {
+		if (_methodName0.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes0, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.addConfigurazione((it.mwg.sicilia.login.model.Configurazione)arguments[0]);
+		}
+
+		if (_methodName1.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes1, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.createConfigurazione(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName2.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes2, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.deleteConfigurazione(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName3.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes3, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.deleteConfigurazione((it.mwg.sicilia.login.model.Configurazione)arguments[0]);
+		}
+
+		if (_methodName4.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes4, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.dynamicQuery();
+		}
+
+		if (_methodName5.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes5, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.dynamicQuery((com.liferay.portal.kernel.dao.orm.DynamicQuery)arguments[0]);
+		}
+
+		if (_methodName6.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes6, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.dynamicQuery((com.liferay.portal.kernel.dao.orm.DynamicQuery)arguments[0],
+				((Integer)arguments[1]).intValue(),
+				((Integer)arguments[2]).intValue());
+		}
+
+		if (_methodName7.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes7, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.dynamicQuery((com.liferay.portal.kernel.dao.orm.DynamicQuery)arguments[0],
+				((Integer)arguments[1]).intValue(),
+				((Integer)arguments[2]).intValue(),
+				(com.liferay.portal.kernel.util.OrderByComparator)arguments[3]);
+		}
+
+		if (_methodName8.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes8, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.dynamicQueryCount((com.liferay.portal.kernel.dao.orm.DynamicQuery)arguments[0]);
+		}
+
+		if (_methodName9.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes9, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.dynamicQueryCount((com.liferay.portal.kernel.dao.orm.DynamicQuery)arguments[0],
+				(com.liferay.portal.kernel.dao.orm.Projection)arguments[1]);
+		}
+
+		if (_methodName10.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes10, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.fetchConfigurazione(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName11.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes11, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getConfigurazione(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName12.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes12, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getPersistedModel((java.io.Serializable)arguments[0]);
+		}
+
+		if (_methodName13.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes13, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getConfiguraziones(((Integer)arguments[0]).intValue(),
+				((Integer)arguments[1]).intValue());
+		}
+
+		if (_methodName14.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes14, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getConfigurazionesCount();
+		}
+
+		if (_methodName15.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes15, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.updateConfigurazione((it.mwg.sicilia.login.model.Configurazione)arguments[0]);
+		}
+
+		if (_methodName32.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes32, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getBeanIdentifier();
+		}
+
+		if (_methodName33.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes33, parameterTypes)) {
+			ConfigurazioneLocalServiceUtil.setBeanIdentifier((java.lang.String)arguments[0]);
+
+			return null;
+		}
+
+		if (_methodName38.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes38, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.findByCompanyId_Nome(((Long)arguments[0]).longValue(),
+				(java.lang.String)arguments[1]);
+		}
+
+		if (_methodName40.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes40, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getApiServer(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName41.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes41, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getApiServerKey();
+		}
+
+		if (_methodName42.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes42, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getApiUsername(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName43.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes43, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getApiUsernameKey();
+		}
+
+		if (_methodName44.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes44, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getApiPassword(((Long)arguments[0]).longValue());
+		}
+
+		if (_methodName45.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes45, parameterTypes)) {
+			return ConfigurazioneLocalServiceUtil.getApiPasswordKey();
+		}
+
+		if (_methodName46.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes46, parameterTypes)) {
+			ConfigurazioneLocalServiceUtil.salvaImpostazioni((javax.portlet.ActionRequest)arguments[0],
+				(javax.portlet.ActionResponse)arguments[1]);
+
+			return null;
+		}
+
+		if (_methodName47.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes47, parameterTypes)) {
+			ConfigurazioneLocalServiceUtil.set(((Long)arguments[0]).longValue(),
+				(com.liferay.portal.model.User)arguments[1],
+				(java.lang.String)arguments[2], (java.lang.String)arguments[3]);
+
+			return null;
+		}
+
+		if (_methodName48.equals(name) &&
+				Arrays.deepEquals(_methodParameterTypes48, parameterTypes)) {
+			ConfigurazioneLocalServiceUtil.setDefaults(((Long)arguments[0]).longValue());
+
+			return null;
+		}
+
+		throw new UnsupportedOperationException();
+	}
+
+	private String _methodName0;
+	private String[] _methodParameterTypes0;
+	private String _methodName1;
+	private String[] _methodParameterTypes1;
+	private String _methodName2;
+	private String[] _methodParameterTypes2;
+	private String _methodName3;
+	private String[] _methodParameterTypes3;
+	private String _methodName4;
+	private String[] _methodParameterTypes4;
+	private String _methodName5;
+	private String[] _methodParameterTypes5;
+	private String _methodName6;
+	private String[] _methodParameterTypes6;
+	private String _methodName7;
+	private String[] _methodParameterTypes7;
+	private String _methodName8;
+	private String[] _methodParameterTypes8;
+	private String _methodName9;
+	private String[] _methodParameterTypes9;
+	private String _methodName10;
+	private String[] _methodParameterTypes10;
+	private String _methodName11;
+	private String[] _methodParameterTypes11;
+	private String _methodName12;
+	private String[] _methodParameterTypes12;
+	private String _methodName13;
+	private String[] _methodParameterTypes13;
+	private String _methodName14;
+	private String[] _methodParameterTypes14;
+	private String _methodName15;
+	private String[] _methodParameterTypes15;
+	private String _methodName32;
+	private String[] _methodParameterTypes32;
+	private String _methodName33;
+	private String[] _methodParameterTypes33;
+	private String _methodName38;
+	private String[] _methodParameterTypes38;
+	private String _methodName40;
+	private String[] _methodParameterTypes40;
+	private String _methodName41;
+	private String[] _methodParameterTypes41;
+	private String _methodName42;
+	private String[] _methodParameterTypes42;
+	private String _methodName43;
+	private String[] _methodParameterTypes43;
+	private String _methodName44;
+	private String[] _methodParameterTypes44;
+	private String _methodName45;
+	private String[] _methodParameterTypes45;
+	private String _methodName46;
+	private String[] _methodParameterTypes46;
+	private String _methodName47;
+	private String[] _methodParameterTypes47;
+	private String _methodName48;
+	private String[] _methodParameterTypes48;
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/impl/ConfigurazioneLocalServiceImpl.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/impl/ConfigurazioneLocalServiceImpl.java
new file mode 100644
index 0000000..c5af7c4
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/impl/ConfigurazioneLocalServiceImpl.java
@@ -0,0 +1,173 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved. This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in
+ * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ */
+
+package it.mwg.sicilia.login.service.impl;
+
+import it.mwg.sicilia.login.NoSuchConfigurazioneException;
+import it.mwg.sicilia.login.model.Configurazione;
+import it.mwg.sicilia.login.service.base.ConfigurazioneLocalServiceBaseImpl;
+
+import java.util.Date;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+import com.liferay.counter.service.CounterLocalServiceUtil;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.servlet.SessionErrors;
+import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.User;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.ServiceContextFactory;
+import com.liferay.portal.service.UserLocalServiceUtil;
+
+/**
+ * The implementation of the configurazione local service.
+ * <p>
+ * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
+ * their definitions into the {@link it.mwg.sicilia.login.service.ConfigurazioneLocalService} interface.
+ * <p>
+ * This is a local service. Methods of this service will not have security checks based on the propagated JAAS
+ * credentials because this service can only be accessed from within the same VM.
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see it.mwg.sicilia.login.service.base.ConfigurazioneLocalServiceBaseImpl
+ * @see it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil
+ */
+public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBaseImpl {
+	/*
+	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+	 * it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil} to access the configurazione local service.
+	 */
+
+	private static final String API_SERVER = "loginServer";
+	private static final String API_USERNAME = "username";
+	private static final String API_PASSWORD = "password";
+
+	private static final String DEFAULT_API_SERVER = "https://autenticazione.lavoripubblici.sicilia.it/";
+
+	@Override
+	public Configurazione findByCompanyId_Nome(long companyId, String nome) throws NoSuchConfigurazioneException,
+			SystemException {
+
+		return configurazionePersistence.findByCompanyId_Nome(companyId, nome);
+	}
+
+	private String get(long companyId, String nome) {
+
+		Configurazione configurazione;
+		try {
+			configurazione = configurazionePersistence.findByCompanyId_Nome(companyId, nome);
+		} catch (NoSuchConfigurazioneException | SystemException e) {
+			return null;
+		}
+		return configurazione.getValore();
+	}
+
+	@Override
+	public String getApiServer(long companyId) {
+
+		return get(companyId, API_SERVER);
+	}
+
+	@Override
+	public String getApiServerKey() {
+
+		return API_SERVER;
+	}
+
+	@Override
+	public String getApiUsername(long companyId) {
+
+		return get(companyId, API_USERNAME);
+	}
+
+	@Override
+	public String getApiUsernameKey() {
+
+		return API_USERNAME;
+	}
+
+	@Override
+	public String getApiPassword(long companyId) {
+
+		return get(companyId, API_PASSWORD);
+	}
+
+	@Override
+	public String getApiPasswordKey() {
+
+		return API_PASSWORD;
+	}
+
+	@Override
+	public void salvaImpostazioni(ActionRequest request, ActionResponse response) throws PortalException,
+			SystemException {
+
+		// 4Tr-D%fO!sli5
+		ServiceContext serviceContext = ServiceContextFactory.getInstance(request);
+		long companyId = serviceContext.getCompanyId();
+		String username = ParamUtil.getString(request, API_USERNAME);
+		String oldUsername = getApiUsername(companyId);
+		String password = ParamUtil.getString(request, API_PASSWORD);
+		if (username.equals(oldUsername) || Validator.isNotNull(password)) {
+			User user = UserLocalServiceUtil.getUser(serviceContext.getUserId());
+			set(companyId, user, API_SERVER, ParamUtil.getString(request, API_SERVER));
+			set(companyId, user, API_USERNAME, username);
+			if (Validator.isNotNull(password)) {
+				set(companyId, user, API_PASSWORD, DigestUtils.sha256Hex(username + password));
+			}
+		} else {
+			SessionErrors.add(request, "username-without-password");
+		}
+	}
+
+	@Override
+	public void set(long companyId, User user, String nome, String valore) throws SystemException {
+
+		Date date = new Date();
+		Configurazione configurazione;
+		try {
+			configurazione = configurazionePersistence.findByCompanyId_Nome(companyId, nome);
+		} catch (NoSuchConfigurazioneException e) {
+			configurazione = configurazionePersistence.create(CounterLocalServiceUtil.increment(Configurazione.class
+					.getName()));
+			configurazione.setNome(nome);
+			configurazione.setCompanyId(companyId);
+			configurazione.setCreateDate(date);
+		}
+		if (!configurazione.getValore().equals(valore)) {
+			configurazione.setValore(valore);
+			configurazione.setModifiedDate(date);
+			if (Validator.isNull(user)) {
+				configurazione.setUserId(0);
+				configurazione.setUserName(StringPool.BLANK);
+			} else {
+				configurazione.setUserId(user.getUserId());
+				configurazione.setUserName(user.getFullName());
+			}
+			configurazione.persist();
+		}
+	}
+
+	@Override
+	public void setDefaults(long companyId) throws SystemException {
+
+		try {
+			configurazionePersistence.findByCompanyId_Nome(companyId, API_SERVER);
+		} catch (NoSuchConfigurazioneException e) {
+			set(companyId, null, API_SERVER, DEFAULT_API_SERVER);
+		}
+	}
+}
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/persistence/ConfigurazionePersistenceImpl.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/persistence/ConfigurazionePersistenceImpl.java
new file mode 100644
index 0000000..537ee3b
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/service/persistence/ConfigurazionePersistenceImpl.java
@@ -0,0 +1,1520 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package it.mwg.sicilia.login.service.persistence;
+
+import com.liferay.portal.kernel.cache.CacheRegistryUtil;
+import com.liferay.portal.kernel.dao.orm.EntityCacheUtil;
+import com.liferay.portal.kernel.dao.orm.FinderCacheUtil;
+import com.liferay.portal.kernel.dao.orm.FinderPath;
+import com.liferay.portal.kernel.dao.orm.Query;
+import com.liferay.portal.kernel.dao.orm.QueryPos;
+import com.liferay.portal.kernel.dao.orm.QueryUtil;
+import com.liferay.portal.kernel.dao.orm.Session;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.InstanceFactory;
+import com.liferay.portal.kernel.util.OrderByComparator;
+import com.liferay.portal.kernel.util.PropsKeys;
+import com.liferay.portal.kernel.util.PropsUtil;
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.kernel.util.UnmodifiableList;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.CacheModel;
+import com.liferay.portal.model.ModelListener;
+import com.liferay.portal.service.persistence.impl.BasePersistenceImpl;
+
+import it.mwg.sicilia.login.NoSuchConfigurazioneException;
+import it.mwg.sicilia.login.model.Configurazione;
+import it.mwg.sicilia.login.model.impl.ConfigurazioneImpl;
+import it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl;
+import it.mwg.sicilia.login.service.persistence.ConfigurazionePersistence;
+
+import java.io.Serializable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * The persistence implementation for the configurazione service.
+ *
+ * <p>
+ * Caching information and settings can be found in <code>portal.properties</code>
+ * </p>
+ *
+ * @author Manifattura Web Group s.r.l.
+ * @see ConfigurazionePersistence
+ * @see ConfigurazioneUtil
+ * @generated
+ */
+public class ConfigurazionePersistenceImpl extends BasePersistenceImpl<Configurazione>
+	implements ConfigurazionePersistence {
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this class directly. Always use {@link ConfigurazioneUtil} to access the configurazione persistence. Modify <code>service.xml</code> and rerun ServiceBuilder to regenerate this class.
+	 */
+	public static final String FINDER_CLASS_NAME_ENTITY = ConfigurazioneImpl.class.getName();
+	public static final String FINDER_CLASS_NAME_LIST_WITH_PAGINATION = FINDER_CLASS_NAME_ENTITY +
+		".List1";
+	public static final String FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION = FINDER_CLASS_NAME_ENTITY +
+		".List2";
+	public static final FinderPath FINDER_PATH_WITH_PAGINATION_FIND_ALL = new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED,
+			ConfigurazioneImpl.class, FINDER_CLASS_NAME_LIST_WITH_PAGINATION,
+			"findAll", new String[0]);
+	public static final FinderPath FINDER_PATH_WITHOUT_PAGINATION_FIND_ALL = new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED,
+			ConfigurazioneImpl.class,
+			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "findAll", new String[0]);
+	public static final FinderPath FINDER_PATH_COUNT_ALL = new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED, Long.class,
+			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countAll", new String[0]);
+	public static final FinderPath FINDER_PATH_WITH_PAGINATION_FIND_BY_COMPANYID =
+		new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED,
+			ConfigurazioneImpl.class, FINDER_CLASS_NAME_LIST_WITH_PAGINATION,
+			"findByCompanyId",
+			new String[] {
+				Long.class.getName(),
+				
+			Integer.class.getName(), Integer.class.getName(),
+				OrderByComparator.class.getName()
+			});
+	public static final FinderPath FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_COMPANYID =
+		new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED,
+			ConfigurazioneImpl.class,
+			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "findByCompanyId",
+			new String[] { Long.class.getName() },
+			ConfigurazioneModelImpl.COMPANYID_COLUMN_BITMASK);
+	public static final FinderPath FINDER_PATH_COUNT_BY_COMPANYID = new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED, Long.class,
+			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByCompanyId",
+			new String[] { Long.class.getName() });
+
+	/**
+	 * Returns all the configuraziones where companyId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @return the matching configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public List<Configurazione> findByCompanyId(long companyId)
+		throws SystemException {
+		return findByCompanyId(companyId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
+			null);
+	}
+
+	/**
+	 * Returns a range of all the configuraziones where companyId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param start the lower bound of the range of configuraziones
+	 * @param end the upper bound of the range of configuraziones (not inclusive)
+	 * @return the range of matching configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public List<Configurazione> findByCompanyId(long companyId, int start,
+		int end) throws SystemException {
+		return findByCompanyId(companyId, start, end, null);
+	}
+
+	/**
+	 * Returns an ordered range of all the configuraziones where companyId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param start the lower bound of the range of configuraziones
+	 * @param end the upper bound of the range of configuraziones (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @return the ordered range of matching configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public List<Configurazione> findByCompanyId(long companyId, int start,
+		int end, OrderByComparator orderByComparator) throws SystemException {
+		boolean pagination = true;
+		FinderPath finderPath = null;
+		Object[] finderArgs = null;
+
+		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
+				(orderByComparator == null)) {
+			pagination = false;
+			finderPath = FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_COMPANYID;
+			finderArgs = new Object[] { companyId };
+		}
+		else {
+			finderPath = FINDER_PATH_WITH_PAGINATION_FIND_BY_COMPANYID;
+			finderArgs = new Object[] { companyId, start, end, orderByComparator };
+		}
+
+		List<Configurazione> list = (List<Configurazione>)FinderCacheUtil.getResult(finderPath,
+				finderArgs, this);
+
+		if ((list != null) && !list.isEmpty()) {
+			for (Configurazione configurazione : list) {
+				if ((companyId != configurazione.getCompanyId())) {
+					list = null;
+
+					break;
+				}
+			}
+		}
+
+		if (list == null) {
+			StringBundler query = null;
+
+			if (orderByComparator != null) {
+				query = new StringBundler(3 +
+						(orderByComparator.getOrderByFields().length * 3));
+			}
+			else {
+				query = new StringBundler(3);
+			}
+
+			query.append(_SQL_SELECT_CONFIGURAZIONE_WHERE);
+
+			query.append(_FINDER_COLUMN_COMPANYID_COMPANYID_2);
+
+			if (orderByComparator != null) {
+				appendOrderByComparator(query, _ORDER_BY_ENTITY_ALIAS,
+					orderByComparator);
+			}
+			else
+			 if (pagination) {
+				query.append(ConfigurazioneModelImpl.ORDER_BY_JPQL);
+			}
+
+			String sql = query.toString();
+
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(sql);
+
+				QueryPos qPos = QueryPos.getInstance(q);
+
+				qPos.add(companyId);
+
+				if (!pagination) {
+					list = (List<Configurazione>)QueryUtil.list(q,
+							getDialect(), start, end, false);
+
+					Collections.sort(list);
+
+					list = new UnmodifiableList<Configurazione>(list);
+				}
+				else {
+					list = (List<Configurazione>)QueryUtil.list(q,
+							getDialect(), start, end);
+				}
+
+				cacheResult(list);
+
+				FinderCacheUtil.putResult(finderPath, finderArgs, list);
+			}
+			catch (Exception e) {
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return list;
+	}
+
+	/**
+	 * Returns the first configurazione in the ordered set where companyId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching configurazione
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione findByCompanyId_First(long companyId,
+		OrderByComparator orderByComparator)
+		throws NoSuchConfigurazioneException, SystemException {
+		Configurazione configurazione = fetchByCompanyId_First(companyId,
+				orderByComparator);
+
+		if (configurazione != null) {
+			return configurazione;
+		}
+
+		StringBundler msg = new StringBundler(4);
+
+		msg.append(_NO_SUCH_ENTITY_WITH_KEY);
+
+		msg.append("companyId=");
+		msg.append(companyId);
+
+		msg.append(StringPool.CLOSE_CURLY_BRACE);
+
+		throw new NoSuchConfigurazioneException(msg.toString());
+	}
+
+	/**
+	 * Returns the first configurazione in the ordered set where companyId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione fetchByCompanyId_First(long companyId,
+		OrderByComparator orderByComparator) throws SystemException {
+		List<Configurazione> list = findByCompanyId(companyId, 0, 1,
+				orderByComparator);
+
+		if (!list.isEmpty()) {
+			return list.get(0);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns the last configurazione in the ordered set where companyId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching configurazione
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione findByCompanyId_Last(long companyId,
+		OrderByComparator orderByComparator)
+		throws NoSuchConfigurazioneException, SystemException {
+		Configurazione configurazione = fetchByCompanyId_Last(companyId,
+				orderByComparator);
+
+		if (configurazione != null) {
+			return configurazione;
+		}
+
+		StringBundler msg = new StringBundler(4);
+
+		msg.append(_NO_SUCH_ENTITY_WITH_KEY);
+
+		msg.append("companyId=");
+		msg.append(companyId);
+
+		msg.append(StringPool.CLOSE_CURLY_BRACE);
+
+		throw new NoSuchConfigurazioneException(msg.toString());
+	}
+
+	/**
+	 * Returns the last configurazione in the ordered set where companyId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione fetchByCompanyId_Last(long companyId,
+		OrderByComparator orderByComparator) throws SystemException {
+		int count = countByCompanyId(companyId);
+
+		if (count == 0) {
+			return null;
+		}
+
+		List<Configurazione> list = findByCompanyId(companyId, count - 1,
+				count, orderByComparator);
+
+		if (!list.isEmpty()) {
+			return list.get(0);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns the configuraziones before and after the current configurazione in the ordered set where companyId = &#63;.
+	 *
+	 * @param configurazioneId the primary key of the current configurazione
+	 * @param companyId the company ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the previous, current, and next configurazione
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione[] findByCompanyId_PrevAndNext(long configurazioneId,
+		long companyId, OrderByComparator orderByComparator)
+		throws NoSuchConfigurazioneException, SystemException {
+		Configurazione configurazione = findByPrimaryKey(configurazioneId);
+
+		Session session = null;
+
+		try {
+			session = openSession();
+
+			Configurazione[] array = new ConfigurazioneImpl[3];
+
+			array[0] = getByCompanyId_PrevAndNext(session, configurazione,
+					companyId, orderByComparator, true);
+
+			array[1] = configurazione;
+
+			array[2] = getByCompanyId_PrevAndNext(session, configurazione,
+					companyId, orderByComparator, false);
+
+			return array;
+		}
+		catch (Exception e) {
+			throw processException(e);
+		}
+		finally {
+			closeSession(session);
+		}
+	}
+
+	protected Configurazione getByCompanyId_PrevAndNext(Session session,
+		Configurazione configurazione, long companyId,
+		OrderByComparator orderByComparator, boolean previous) {
+		StringBundler query = null;
+
+		if (orderByComparator != null) {
+			query = new StringBundler(6 +
+					(orderByComparator.getOrderByFields().length * 6));
+		}
+		else {
+			query = new StringBundler(3);
+		}
+
+		query.append(_SQL_SELECT_CONFIGURAZIONE_WHERE);
+
+		query.append(_FINDER_COLUMN_COMPANYID_COMPANYID_2);
+
+		if (orderByComparator != null) {
+			String[] orderByConditionFields = orderByComparator.getOrderByConditionFields();
+
+			if (orderByConditionFields.length > 0) {
+				query.append(WHERE_AND);
+			}
+
+			for (int i = 0; i < orderByConditionFields.length; i++) {
+				query.append(_ORDER_BY_ENTITY_ALIAS);
+				query.append(orderByConditionFields[i]);
+
+				if ((i + 1) < orderByConditionFields.length) {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(WHERE_GREATER_THAN_HAS_NEXT);
+					}
+					else {
+						query.append(WHERE_LESSER_THAN_HAS_NEXT);
+					}
+				}
+				else {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(WHERE_GREATER_THAN);
+					}
+					else {
+						query.append(WHERE_LESSER_THAN);
+					}
+				}
+			}
+
+			query.append(ORDER_BY_CLAUSE);
+
+			String[] orderByFields = orderByComparator.getOrderByFields();
+
+			for (int i = 0; i < orderByFields.length; i++) {
+				query.append(_ORDER_BY_ENTITY_ALIAS);
+				query.append(orderByFields[i]);
+
+				if ((i + 1) < orderByFields.length) {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(ORDER_BY_ASC_HAS_NEXT);
+					}
+					else {
+						query.append(ORDER_BY_DESC_HAS_NEXT);
+					}
+				}
+				else {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(ORDER_BY_ASC);
+					}
+					else {
+						query.append(ORDER_BY_DESC);
+					}
+				}
+			}
+		}
+		else {
+			query.append(ConfigurazioneModelImpl.ORDER_BY_JPQL);
+		}
+
+		String sql = query.toString();
+
+		Query q = session.createQuery(sql);
+
+		q.setFirstResult(0);
+		q.setMaxResults(2);
+
+		QueryPos qPos = QueryPos.getInstance(q);
+
+		qPos.add(companyId);
+
+		if (orderByComparator != null) {
+			Object[] values = orderByComparator.getOrderByConditionValues(configurazione);
+
+			for (Object value : values) {
+				qPos.add(value);
+			}
+		}
+
+		List<Configurazione> list = q.list();
+
+		if (list.size() == 2) {
+			return list.get(1);
+		}
+		else {
+			return null;
+		}
+	}
+
+	/**
+	 * Removes all the configuraziones where companyId = &#63; from the database.
+	 *
+	 * @param companyId the company ID
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public void removeByCompanyId(long companyId) throws SystemException {
+		for (Configurazione configurazione : findByCompanyId(companyId,
+				QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) {
+			remove(configurazione);
+		}
+	}
+
+	/**
+	 * Returns the number of configuraziones where companyId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @return the number of matching configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public int countByCompanyId(long companyId) throws SystemException {
+		FinderPath finderPath = FINDER_PATH_COUNT_BY_COMPANYID;
+
+		Object[] finderArgs = new Object[] { companyId };
+
+		Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs,
+				this);
+
+		if (count == null) {
+			StringBundler query = new StringBundler(2);
+
+			query.append(_SQL_COUNT_CONFIGURAZIONE_WHERE);
+
+			query.append(_FINDER_COLUMN_COMPANYID_COMPANYID_2);
+
+			String sql = query.toString();
+
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(sql);
+
+				QueryPos qPos = QueryPos.getInstance(q);
+
+				qPos.add(companyId);
+
+				count = (Long)q.uniqueResult();
+
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
+			}
+			catch (Exception e) {
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return count.intValue();
+	}
+
+	private static final String _FINDER_COLUMN_COMPANYID_COMPANYID_2 = "configurazione.companyId = ?";
+	public static final FinderPath FINDER_PATH_FETCH_BY_COMPANYID_NOME = new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED,
+			ConfigurazioneImpl.class, FINDER_CLASS_NAME_ENTITY,
+			"fetchByCompanyId_Nome",
+			new String[] { Long.class.getName(), String.class.getName() },
+			ConfigurazioneModelImpl.COMPANYID_COLUMN_BITMASK |
+			ConfigurazioneModelImpl.NOME_COLUMN_BITMASK);
+	public static final FinderPath FINDER_PATH_COUNT_BY_COMPANYID_NOME = new FinderPath(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneModelImpl.FINDER_CACHE_ENABLED, Long.class,
+			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByCompanyId_Nome",
+			new String[] { Long.class.getName(), String.class.getName() });
+
+	/**
+	 * Returns the configurazione where companyId = &#63; and nome = &#63; or throws a {@link it.mwg.sicilia.login.NoSuchConfigurazioneException} if it could not be found.
+	 *
+	 * @param companyId the company ID
+	 * @param nome the nome
+	 * @return the matching configurazione
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a matching configurazione could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione findByCompanyId_Nome(long companyId, String nome)
+		throws NoSuchConfigurazioneException, SystemException {
+		Configurazione configurazione = fetchByCompanyId_Nome(companyId, nome);
+
+		if (configurazione == null) {
+			StringBundler msg = new StringBundler(6);
+
+			msg.append(_NO_SUCH_ENTITY_WITH_KEY);
+
+			msg.append("companyId=");
+			msg.append(companyId);
+
+			msg.append(", nome=");
+			msg.append(nome);
+
+			msg.append(StringPool.CLOSE_CURLY_BRACE);
+
+			if (_log.isWarnEnabled()) {
+				_log.warn(msg.toString());
+			}
+
+			throw new NoSuchConfigurazioneException(msg.toString());
+		}
+
+		return configurazione;
+	}
+
+	/**
+	 * Returns the configurazione where companyId = &#63; and nome = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
+	 *
+	 * @param companyId the company ID
+	 * @param nome the nome
+	 * @return the matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione fetchByCompanyId_Nome(long companyId, String nome)
+		throws SystemException {
+		return fetchByCompanyId_Nome(companyId, nome, true);
+	}
+
+	/**
+	 * Returns the configurazione where companyId = &#63; and nome = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
+	 *
+	 * @param companyId the company ID
+	 * @param nome the nome
+	 * @param retrieveFromCache whether to use the finder cache
+	 * @return the matching configurazione, or <code>null</code> if a matching configurazione could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione fetchByCompanyId_Nome(long companyId, String nome,
+		boolean retrieveFromCache) throws SystemException {
+		Object[] finderArgs = new Object[] { companyId, nome };
+
+		Object result = null;
+
+		if (retrieveFromCache) {
+			result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+					finderArgs, this);
+		}
+
+		if (result instanceof Configurazione) {
+			Configurazione configurazione = (Configurazione)result;
+
+			if ((companyId != configurazione.getCompanyId()) ||
+					!Validator.equals(nome, configurazione.getNome())) {
+				result = null;
+			}
+		}
+
+		if (result == null) {
+			StringBundler query = new StringBundler(4);
+
+			query.append(_SQL_SELECT_CONFIGURAZIONE_WHERE);
+
+			query.append(_FINDER_COLUMN_COMPANYID_NOME_COMPANYID_2);
+
+			boolean bindNome = false;
+
+			if (nome == null) {
+				query.append(_FINDER_COLUMN_COMPANYID_NOME_NOME_1);
+			}
+			else if (nome.equals(StringPool.BLANK)) {
+				query.append(_FINDER_COLUMN_COMPANYID_NOME_NOME_3);
+			}
+			else {
+				bindNome = true;
+
+				query.append(_FINDER_COLUMN_COMPANYID_NOME_NOME_2);
+			}
+
+			String sql = query.toString();
+
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(sql);
+
+				QueryPos qPos = QueryPos.getInstance(q);
+
+				qPos.add(companyId);
+
+				if (bindNome) {
+					qPos.add(nome);
+				}
+
+				List<Configurazione> list = q.list();
+
+				if (list.isEmpty()) {
+					FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+						finderArgs, list);
+				}
+				else {
+					Configurazione configurazione = list.get(0);
+
+					result = configurazione;
+
+					cacheResult(configurazione);
+
+					if ((configurazione.getCompanyId() != companyId) ||
+							(configurazione.getNome() == null) ||
+							!configurazione.getNome().equals(nome)) {
+						FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+							finderArgs, configurazione);
+					}
+				}
+			}
+			catch (Exception e) {
+				FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+					finderArgs);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		if (result instanceof List<?>) {
+			return null;
+		}
+		else {
+			return (Configurazione)result;
+		}
+	}
+
+	/**
+	 * Removes the configurazione where companyId = &#63; and nome = &#63; from the database.
+	 *
+	 * @param companyId the company ID
+	 * @param nome the nome
+	 * @return the configurazione that was removed
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione removeByCompanyId_Nome(long companyId, String nome)
+		throws NoSuchConfigurazioneException, SystemException {
+		Configurazione configurazione = findByCompanyId_Nome(companyId, nome);
+
+		return remove(configurazione);
+	}
+
+	/**
+	 * Returns the number of configuraziones where companyId = &#63; and nome = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param nome the nome
+	 * @return the number of matching configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public int countByCompanyId_Nome(long companyId, String nome)
+		throws SystemException {
+		FinderPath finderPath = FINDER_PATH_COUNT_BY_COMPANYID_NOME;
+
+		Object[] finderArgs = new Object[] { companyId, nome };
+
+		Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs,
+				this);
+
+		if (count == null) {
+			StringBundler query = new StringBundler(3);
+
+			query.append(_SQL_COUNT_CONFIGURAZIONE_WHERE);
+
+			query.append(_FINDER_COLUMN_COMPANYID_NOME_COMPANYID_2);
+
+			boolean bindNome = false;
+
+			if (nome == null) {
+				query.append(_FINDER_COLUMN_COMPANYID_NOME_NOME_1);
+			}
+			else if (nome.equals(StringPool.BLANK)) {
+				query.append(_FINDER_COLUMN_COMPANYID_NOME_NOME_3);
+			}
+			else {
+				bindNome = true;
+
+				query.append(_FINDER_COLUMN_COMPANYID_NOME_NOME_2);
+			}
+
+			String sql = query.toString();
+
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(sql);
+
+				QueryPos qPos = QueryPos.getInstance(q);
+
+				qPos.add(companyId);
+
+				if (bindNome) {
+					qPos.add(nome);
+				}
+
+				count = (Long)q.uniqueResult();
+
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
+			}
+			catch (Exception e) {
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return count.intValue();
+	}
+
+	private static final String _FINDER_COLUMN_COMPANYID_NOME_COMPANYID_2 = "configurazione.companyId = ? AND ";
+	private static final String _FINDER_COLUMN_COMPANYID_NOME_NOME_1 = "configurazione.nome IS NULL";
+	private static final String _FINDER_COLUMN_COMPANYID_NOME_NOME_2 = "configurazione.nome = ?";
+	private static final String _FINDER_COLUMN_COMPANYID_NOME_NOME_3 = "(configurazione.nome IS NULL OR configurazione.nome = '')";
+
+	public ConfigurazionePersistenceImpl() {
+		setModelClass(Configurazione.class);
+	}
+
+	/**
+	 * Caches the configurazione in the entity cache if it is enabled.
+	 *
+	 * @param configurazione the configurazione
+	 */
+	@Override
+	public void cacheResult(Configurazione configurazione) {
+		EntityCacheUtil.putResult(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneImpl.class, configurazione.getPrimaryKey(),
+			configurazione);
+
+		FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+			new Object[] { configurazione.getCompanyId(), configurazione.getNome() },
+			configurazione);
+
+		configurazione.resetOriginalValues();
+	}
+
+	/**
+	 * Caches the configuraziones in the entity cache if it is enabled.
+	 *
+	 * @param configuraziones the configuraziones
+	 */
+	@Override
+	public void cacheResult(List<Configurazione> configuraziones) {
+		for (Configurazione configurazione : configuraziones) {
+			if (EntityCacheUtil.getResult(
+						ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+						ConfigurazioneImpl.class, configurazione.getPrimaryKey()) == null) {
+				cacheResult(configurazione);
+			}
+			else {
+				configurazione.resetOriginalValues();
+			}
+		}
+	}
+
+	/**
+	 * Clears the cache for all configuraziones.
+	 *
+	 * <p>
+	 * The {@link com.liferay.portal.kernel.dao.orm.EntityCache} and {@link com.liferay.portal.kernel.dao.orm.FinderCache} are both cleared by this method.
+	 * </p>
+	 */
+	@Override
+	public void clearCache() {
+		if (_HIBERNATE_CACHE_USE_SECOND_LEVEL_CACHE) {
+			CacheRegistryUtil.clear(ConfigurazioneImpl.class.getName());
+		}
+
+		EntityCacheUtil.clearCache(ConfigurazioneImpl.class.getName());
+
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_ENTITY);
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
+	}
+
+	/**
+	 * Clears the cache for the configurazione.
+	 *
+	 * <p>
+	 * The {@link com.liferay.portal.kernel.dao.orm.EntityCache} and {@link com.liferay.portal.kernel.dao.orm.FinderCache} are both cleared by this method.
+	 * </p>
+	 */
+	@Override
+	public void clearCache(Configurazione configurazione) {
+		EntityCacheUtil.removeResult(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneImpl.class, configurazione.getPrimaryKey());
+
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
+
+		clearUniqueFindersCache(configurazione);
+	}
+
+	@Override
+	public void clearCache(List<Configurazione> configuraziones) {
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
+
+		for (Configurazione configurazione : configuraziones) {
+			EntityCacheUtil.removeResult(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+				ConfigurazioneImpl.class, configurazione.getPrimaryKey());
+
+			clearUniqueFindersCache(configurazione);
+		}
+	}
+
+	protected void cacheUniqueFindersCache(Configurazione configurazione) {
+		if (configurazione.isNew()) {
+			Object[] args = new Object[] {
+					configurazione.getCompanyId(), configurazione.getNome()
+				};
+
+			FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_COMPANYID_NOME,
+				args, Long.valueOf(1));
+			FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+				args, configurazione);
+		}
+		else {
+			ConfigurazioneModelImpl configurazioneModelImpl = (ConfigurazioneModelImpl)configurazione;
+
+			if ((configurazioneModelImpl.getColumnBitmask() &
+					FINDER_PATH_FETCH_BY_COMPANYID_NOME.getColumnBitmask()) != 0) {
+				Object[] args = new Object[] {
+						configurazione.getCompanyId(), configurazione.getNome()
+					};
+
+				FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_COMPANYID_NOME,
+					args, Long.valueOf(1));
+				FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+					args, configurazione);
+			}
+		}
+	}
+
+	protected void clearUniqueFindersCache(Configurazione configurazione) {
+		ConfigurazioneModelImpl configurazioneModelImpl = (ConfigurazioneModelImpl)configurazione;
+
+		Object[] args = new Object[] {
+				configurazione.getCompanyId(), configurazione.getNome()
+			};
+
+		FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_COMPANYID_NOME, args);
+		FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME, args);
+
+		if ((configurazioneModelImpl.getColumnBitmask() &
+				FINDER_PATH_FETCH_BY_COMPANYID_NOME.getColumnBitmask()) != 0) {
+			args = new Object[] {
+					configurazioneModelImpl.getOriginalCompanyId(),
+					configurazioneModelImpl.getOriginalNome()
+				};
+
+			FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_COMPANYID_NOME,
+				args);
+			FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_COMPANYID_NOME,
+				args);
+		}
+	}
+
+	/**
+	 * Creates a new configurazione with the primary key. Does not add the configurazione to the database.
+	 *
+	 * @param configurazioneId the primary key for the new configurazione
+	 * @return the new configurazione
+	 */
+	@Override
+	public Configurazione create(long configurazioneId) {
+		Configurazione configurazione = new ConfigurazioneImpl();
+
+		configurazione.setNew(true);
+		configurazione.setPrimaryKey(configurazioneId);
+
+		return configurazione;
+	}
+
+	/**
+	 * Removes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	 *
+	 * @param configurazioneId the primary key of the configurazione
+	 * @return the configurazione that was removed
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione remove(long configurazioneId)
+		throws NoSuchConfigurazioneException, SystemException {
+		return remove((Serializable)configurazioneId);
+	}
+
+	/**
+	 * Removes the configurazione with the primary key from the database. Also notifies the appropriate model listeners.
+	 *
+	 * @param primaryKey the primary key of the configurazione
+	 * @return the configurazione that was removed
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione remove(Serializable primaryKey)
+		throws NoSuchConfigurazioneException, SystemException {
+		Session session = null;
+
+		try {
+			session = openSession();
+
+			Configurazione configurazione = (Configurazione)session.get(ConfigurazioneImpl.class,
+					primaryKey);
+
+			if (configurazione == null) {
+				if (_log.isWarnEnabled()) {
+					_log.warn(_NO_SUCH_ENTITY_WITH_PRIMARY_KEY + primaryKey);
+				}
+
+				throw new NoSuchConfigurazioneException(_NO_SUCH_ENTITY_WITH_PRIMARY_KEY +
+					primaryKey);
+			}
+
+			return remove(configurazione);
+		}
+		catch (NoSuchConfigurazioneException nsee) {
+			throw nsee;
+		}
+		catch (Exception e) {
+			throw processException(e);
+		}
+		finally {
+			closeSession(session);
+		}
+	}
+
+	@Override
+	protected Configurazione removeImpl(Configurazione configurazione)
+		throws SystemException {
+		configurazione = toUnwrappedModel(configurazione);
+
+		Session session = null;
+
+		try {
+			session = openSession();
+
+			if (!session.contains(configurazione)) {
+				configurazione = (Configurazione)session.get(ConfigurazioneImpl.class,
+						configurazione.getPrimaryKeyObj());
+			}
+
+			if (configurazione != null) {
+				session.delete(configurazione);
+			}
+		}
+		catch (Exception e) {
+			throw processException(e);
+		}
+		finally {
+			closeSession(session);
+		}
+
+		if (configurazione != null) {
+			clearCache(configurazione);
+		}
+
+		return configurazione;
+	}
+
+	@Override
+	public Configurazione updateImpl(
+		it.mwg.sicilia.login.model.Configurazione configurazione)
+		throws SystemException {
+		configurazione = toUnwrappedModel(configurazione);
+
+		boolean isNew = configurazione.isNew();
+
+		ConfigurazioneModelImpl configurazioneModelImpl = (ConfigurazioneModelImpl)configurazione;
+
+		Session session = null;
+
+		try {
+			session = openSession();
+
+			if (configurazione.isNew()) {
+				session.save(configurazione);
+
+				configurazione.setNew(false);
+			}
+			else {
+				session.merge(configurazione);
+			}
+		}
+		catch (Exception e) {
+			throw processException(e);
+		}
+		finally {
+			closeSession(session);
+		}
+
+		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
+
+		if (isNew || !ConfigurazioneModelImpl.COLUMN_BITMASK_ENABLED) {
+			FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
+		}
+
+		else {
+			if ((configurazioneModelImpl.getColumnBitmask() &
+					FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_COMPANYID.getColumnBitmask()) != 0) {
+				Object[] args = new Object[] {
+						configurazioneModelImpl.getOriginalCompanyId()
+					};
+
+				FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_COMPANYID,
+					args);
+				FinderCacheUtil.removeResult(FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_COMPANYID,
+					args);
+
+				args = new Object[] { configurazioneModelImpl.getCompanyId() };
+
+				FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_COMPANYID,
+					args);
+				FinderCacheUtil.removeResult(FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_COMPANYID,
+					args);
+			}
+		}
+
+		EntityCacheUtil.putResult(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+			ConfigurazioneImpl.class, configurazione.getPrimaryKey(),
+			configurazione);
+
+		clearUniqueFindersCache(configurazione);
+		cacheUniqueFindersCache(configurazione);
+
+		return configurazione;
+	}
+
+	protected Configurazione toUnwrappedModel(Configurazione configurazione) {
+		if (configurazione instanceof ConfigurazioneImpl) {
+			return configurazione;
+		}
+
+		ConfigurazioneImpl configurazioneImpl = new ConfigurazioneImpl();
+
+		configurazioneImpl.setNew(configurazione.isNew());
+		configurazioneImpl.setPrimaryKey(configurazione.getPrimaryKey());
+
+		configurazioneImpl.setConfigurazioneId(configurazione.getConfigurazioneId());
+		configurazioneImpl.setNome(configurazione.getNome());
+		configurazioneImpl.setValore(configurazione.getValore());
+		configurazioneImpl.setCompanyId(configurazione.getCompanyId());
+		configurazioneImpl.setUserId(configurazione.getUserId());
+		configurazioneImpl.setUserName(configurazione.getUserName());
+		configurazioneImpl.setCreateDate(configurazione.getCreateDate());
+		configurazioneImpl.setModifiedDate(configurazione.getModifiedDate());
+
+		return configurazioneImpl;
+	}
+
+	/**
+	 * Returns the configurazione with the primary key or throws a {@link com.liferay.portal.NoSuchModelException} if it could not be found.
+	 *
+	 * @param primaryKey the primary key of the configurazione
+	 * @return the configurazione
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione findByPrimaryKey(Serializable primaryKey)
+		throws NoSuchConfigurazioneException, SystemException {
+		Configurazione configurazione = fetchByPrimaryKey(primaryKey);
+
+		if (configurazione == null) {
+			if (_log.isWarnEnabled()) {
+				_log.warn(_NO_SUCH_ENTITY_WITH_PRIMARY_KEY + primaryKey);
+			}
+
+			throw new NoSuchConfigurazioneException(_NO_SUCH_ENTITY_WITH_PRIMARY_KEY +
+				primaryKey);
+		}
+
+		return configurazione;
+	}
+
+	/**
+	 * Returns the configurazione with the primary key or throws a {@link it.mwg.sicilia.login.NoSuchConfigurazioneException} if it could not be found.
+	 *
+	 * @param configurazioneId the primary key of the configurazione
+	 * @return the configurazione
+	 * @throws it.mwg.sicilia.login.NoSuchConfigurazioneException if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione findByPrimaryKey(long configurazioneId)
+		throws NoSuchConfigurazioneException, SystemException {
+		return findByPrimaryKey((Serializable)configurazioneId);
+	}
+
+	/**
+	 * Returns the configurazione with the primary key or returns <code>null</code> if it could not be found.
+	 *
+	 * @param primaryKey the primary key of the configurazione
+	 * @return the configurazione, or <code>null</code> if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione fetchByPrimaryKey(Serializable primaryKey)
+		throws SystemException {
+		Configurazione configurazione = (Configurazione)EntityCacheUtil.getResult(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+				ConfigurazioneImpl.class, primaryKey);
+
+		if (configurazione == _nullConfigurazione) {
+			return null;
+		}
+
+		if (configurazione == null) {
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				configurazione = (Configurazione)session.get(ConfigurazioneImpl.class,
+						primaryKey);
+
+				if (configurazione != null) {
+					cacheResult(configurazione);
+				}
+				else {
+					EntityCacheUtil.putResult(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+						ConfigurazioneImpl.class, primaryKey,
+						_nullConfigurazione);
+				}
+			}
+			catch (Exception e) {
+				EntityCacheUtil.removeResult(ConfigurazioneModelImpl.ENTITY_CACHE_ENABLED,
+					ConfigurazioneImpl.class, primaryKey);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return configurazione;
+	}
+
+	/**
+	 * Returns the configurazione with the primary key or returns <code>null</code> if it could not be found.
+	 *
+	 * @param configurazioneId the primary key of the configurazione
+	 * @return the configurazione, or <code>null</code> if a configurazione with the primary key could not be found
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public Configurazione fetchByPrimaryKey(long configurazioneId)
+		throws SystemException {
+		return fetchByPrimaryKey((Serializable)configurazioneId);
+	}
+
+	/**
+	 * Returns all the configuraziones.
+	 *
+	 * @return the configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public List<Configurazione> findAll() throws SystemException {
+		return findAll(QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+	}
+
+	/**
+	 * Returns a range of all the configuraziones.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param start the lower bound of the range of configuraziones
+	 * @param end the upper bound of the range of configuraziones (not inclusive)
+	 * @return the range of configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public List<Configurazione> findAll(int start, int end)
+		throws SystemException {
+		return findAll(start, end, null);
+	}
+
+	/**
+	 * Returns an ordered range of all the configuraziones.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.mwg.sicilia.login.model.impl.ConfigurazioneModelImpl}. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param start the lower bound of the range of configuraziones
+	 * @param end the upper bound of the range of configuraziones (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @return the ordered range of configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public List<Configurazione> findAll(int start, int end,
+		OrderByComparator orderByComparator) throws SystemException {
+		boolean pagination = true;
+		FinderPath finderPath = null;
+		Object[] finderArgs = null;
+
+		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
+				(orderByComparator == null)) {
+			pagination = false;
+			finderPath = FINDER_PATH_WITHOUT_PAGINATION_FIND_ALL;
+			finderArgs = FINDER_ARGS_EMPTY;
+		}
+		else {
+			finderPath = FINDER_PATH_WITH_PAGINATION_FIND_ALL;
+			finderArgs = new Object[] { start, end, orderByComparator };
+		}
+
+		List<Configurazione> list = (List<Configurazione>)FinderCacheUtil.getResult(finderPath,
+				finderArgs, this);
+
+		if (list == null) {
+			StringBundler query = null;
+			String sql = null;
+
+			if (orderByComparator != null) {
+				query = new StringBundler(2 +
+						(orderByComparator.getOrderByFields().length * 3));
+
+				query.append(_SQL_SELECT_CONFIGURAZIONE);
+
+				appendOrderByComparator(query, _ORDER_BY_ENTITY_ALIAS,
+					orderByComparator);
+
+				sql = query.toString();
+			}
+			else {
+				sql = _SQL_SELECT_CONFIGURAZIONE;
+
+				if (pagination) {
+					sql = sql.concat(ConfigurazioneModelImpl.ORDER_BY_JPQL);
+				}
+			}
+
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(sql);
+
+				if (!pagination) {
+					list = (List<Configurazione>)QueryUtil.list(q,
+							getDialect(), start, end, false);
+
+					Collections.sort(list);
+
+					list = new UnmodifiableList<Configurazione>(list);
+				}
+				else {
+					list = (List<Configurazione>)QueryUtil.list(q,
+							getDialect(), start, end);
+				}
+
+				cacheResult(list);
+
+				FinderCacheUtil.putResult(finderPath, finderArgs, list);
+			}
+			catch (Exception e) {
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return list;
+	}
+
+	/**
+	 * Removes all the configuraziones from the database.
+	 *
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public void removeAll() throws SystemException {
+		for (Configurazione configurazione : findAll()) {
+			remove(configurazione);
+		}
+	}
+
+	/**
+	 * Returns the number of configuraziones.
+	 *
+	 * @return the number of configuraziones
+	 * @throws SystemException if a system exception occurred
+	 */
+	@Override
+	public int countAll() throws SystemException {
+		Long count = (Long)FinderCacheUtil.getResult(FINDER_PATH_COUNT_ALL,
+				FINDER_ARGS_EMPTY, this);
+
+		if (count == null) {
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(_SQL_COUNT_CONFIGURAZIONE);
+
+				count = (Long)q.uniqueResult();
+
+				FinderCacheUtil.putResult(FINDER_PATH_COUNT_ALL,
+					FINDER_ARGS_EMPTY, count);
+			}
+			catch (Exception e) {
+				FinderCacheUtil.removeResult(FINDER_PATH_COUNT_ALL,
+					FINDER_ARGS_EMPTY);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return count.intValue();
+	}
+
+	/**
+	 * Initializes the configurazione persistence.
+	 */
+	public void afterPropertiesSet() {
+		String[] listenerClassNames = StringUtil.split(GetterUtil.getString(
+					com.liferay.util.service.ServiceProps.get(
+						"value.object.listener.it.mwg.sicilia.login.model.Configurazione")));
+
+		if (listenerClassNames.length > 0) {
+			try {
+				List<ModelListener<Configurazione>> listenersList = new ArrayList<ModelListener<Configurazione>>();
+
+				for (String listenerClassName : listenerClassNames) {
+					listenersList.add((ModelListener<Configurazione>)InstanceFactory.newInstance(
+							getClassLoader(), listenerClassName));
+				}
+
+				listeners = listenersList.toArray(new ModelListener[listenersList.size()]);
+			}
+			catch (Exception e) {
+				_log.error(e);
+			}
+		}
+	}
+
+	public void destroy() {
+		EntityCacheUtil.removeCache(ConfigurazioneImpl.class.getName());
+		FinderCacheUtil.removeCache(FINDER_CLASS_NAME_ENTITY);
+		FinderCacheUtil.removeCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
+		FinderCacheUtil.removeCache(FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
+	}
+
+	private static final String _SQL_SELECT_CONFIGURAZIONE = "SELECT configurazione FROM Configurazione configurazione";
+	private static final String _SQL_SELECT_CONFIGURAZIONE_WHERE = "SELECT configurazione FROM Configurazione configurazione WHERE ";
+	private static final String _SQL_COUNT_CONFIGURAZIONE = "SELECT COUNT(configurazione) FROM Configurazione configurazione";
+	private static final String _SQL_COUNT_CONFIGURAZIONE_WHERE = "SELECT COUNT(configurazione) FROM Configurazione configurazione WHERE ";
+	private static final String _ORDER_BY_ENTITY_ALIAS = "configurazione.";
+	private static final String _NO_SUCH_ENTITY_WITH_PRIMARY_KEY = "No Configurazione exists with the primary key ";
+	private static final String _NO_SUCH_ENTITY_WITH_KEY = "No Configurazione exists with the key {";
+	private static final boolean _HIBERNATE_CACHE_USE_SECOND_LEVEL_CACHE = GetterUtil.getBoolean(PropsUtil.get(
+				PropsKeys.HIBERNATE_CACHE_USE_SECOND_LEVEL_CACHE));
+	private static Log _log = LogFactoryUtil.getLog(ConfigurazionePersistenceImpl.class);
+	private static Configurazione _nullConfigurazione = new ConfigurazioneImpl() {
+			@Override
+			public Object clone() {
+				return this;
+			}
+
+			@Override
+			public CacheModel<Configurazione> toCacheModel() {
+				return _nullConfigurazioneCacheModel;
+			}
+		};
+
+	private static CacheModel<Configurazione> _nullConfigurazioneCacheModel = new CacheModel<Configurazione>() {
+			@Override
+			public Configurazione toEntityModel() {
+				return _nullConfigurazione;
+			}
+		};
+}
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/startup/SetDefaultsAction.java b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/startup/SetDefaultsAction.java
new file mode 100644
index 0000000..41fb27e
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/it/mwg/sicilia/login/startup/SetDefaultsAction.java
@@ -0,0 +1,23 @@
+package it.mwg.sicilia.login.startup;
+
+import it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil;
+
+import com.liferay.portal.kernel.events.ActionException;
+import com.liferay.portal.kernel.events.SimpleAction;
+import com.liferay.portal.kernel.exception.SystemException;
+
+public class SetDefaultsAction extends SimpleAction {
+
+	@Override
+	public void run(String[] ids) throws ActionException {
+
+		for (String id : ids) {
+			long companyId = Long.parseLong(id);
+			try {
+				ConfigurazioneLocalServiceUtil.setDefaults(companyId);
+			} catch (SystemException e) {
+				throw new ActionException(e);
+			}
+		}
+	}
+}
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/portal.properties b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/portal.properties
new file mode 100644
index 0000000..daf2b12
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/portal.properties
@@ -0,0 +1 @@
+application.startup.events=it.mwg.sicilia.login.startup.SetDefaultsAction
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/src/service.properties b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/service.properties
new file mode 100644
index 0000000..3448b2e
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/src/service.properties
@@ -0,0 +1,41 @@
+##
+## Properties Override
+##
+
+    #
+    # Specify where to get the overridden properties. Updates should not be made
+    # on this file but on the overridden version of this file.
+    #
+    include-and-override=${base.path}/service-ext.properties
+
+##
+## Build
+##
+
+    build.namespace=sicilia_login
+    build.number=26
+    build.date=1635416156895
+    build.auto.upgrade=true
+
+##
+## Spring
+##
+
+    #
+    # Input a list of comma delimited Spring configurations. These will be
+    # loaded after the bean definitions specified in the
+    # portalContextConfigLocation parameter in web.xml.
+    #
+    spring.configs=\
+        WEB-INF/classes/META-INF/base-spring.xml,\
+        \
+        WEB-INF/classes/META-INF/hibernate-spring.xml,\
+        WEB-INF/classes/META-INF/infrastructure-spring.xml,\
+        \
+        WEB-INF/classes/META-INF/cluster-spring.xml,\
+        \
+        WEB-INF/classes/META-INF/portlet-spring.xml,\
+        \
+        WEB-INF/classes/META-INF/shard-data-source-spring.xml,\
+        \
+        WEB-INF/classes/META-INF/ext-spring.xml
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/aui.tld b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/aui.tld
new file mode 100644
index 0000000..1eeac88
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/aui.tld
@@ -0,0 +1,2568 @@
+<?xml version="1.0"?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
+	<description><![CDATA[Provides the AUI component tags, prefixed with <code>aui:</code>.]]></description>
+	<tlib-version>1.0</tlib-version>
+	<short-name>aui</short-name>
+	<uri>http://alloy.liferay.com/tld/aui</uri>
+	<tag>
+		<description><![CDATA[Deprecated as of 6.2, replaced by aui:button.]]></description>
+		<name>button-item</name>
+		<tag-class>com.liferay.taglib.aui.ButtonItemTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Whether to track the active state of the button.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"false"}-->]]></description>
+			<name>activeState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[The outermost DOM node for the Widget, used for sizing and positioning
+	of a Widget as well as a containing element for any decorator elements used
+	for skinning.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>boundingBox</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[An object map of the CSS class names to use for the different interaction states.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.util.HashMap","required":false}-->]]></description>
+			<name>classNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[A DOM node that is a direct descendant of a Widget's bounding box that
+	houses its content.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>contentBox</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[CSS class to be automatically added to the <code>boundingBox</code>.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Whether to apply the default interaction state to the button<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"true"}-->]]></description>
+			<name>defaultState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Number representing the depth of this Widget relative to
+	the root Widget in the object heirarchy.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Number","required":false,"defaultValue":"-1"}-->]]></description>
+			<name>depth</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Flag indicating whether or not this object
+	has been through the destroy lifecycle phase.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"false"}-->]]></description>
+			<name>destroyed</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Boolean indicating if the Widget should be disabled. The disabled implementation
+	is left to the specific classes extending widget.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"false"}-->]]></description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Boolean indicating if the Widget, or one of its descendants,
+	has focus.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"false"}-->]]></description>
+			<name>focused</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[An event callback to handle when a user interacts with the button.
+	This can either be a function that will be attached on click, or
+	an object map that accepts the following keys:
+	<code>{fn: // The function to execute
+	context: // The context to execute the function in
+	type: // The type of event to listen for (defaults to "click")
+	}</code><!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false,"defaultValue":"false"}-->]]></description>
+			<name>handler</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[String with units, or number, representing the height of the Widget. If a number is provided,
+	the default unit, defined by the Widgets DEF_UNIT, property is used.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>height</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[css class added to hide the <code>boundingBox</code> when
+	<a href="Component.html#config_visible">visible</a> is set to
+	<code>false</code>.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false,"defaultValue":"aui-hide"}-->]]></description>
+			<name>hideClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Whether to track the hover interaction state of the button.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"true"}-->]]></description>
+			<name>hoverState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[The icon to use inside of the button. Possible values are:<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>icon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[DOM Node to display the icon of the ButtonItem. If not
+	specified try to query using HTML_PARSER an element inside
+	boundingBox which matches <code>aui-button-icon</code>.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>iconNode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>buttonitemId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Number representing the Widget's ordinal position in its
+	parent Widget.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Number","required":false,"defaultValue":"0"}-->]]></description>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Flag indicating whether or not this object
+	has been through the init lifecycle phase.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"false"}-->]]></description>
+			<name>initialized</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Text to use inside of the button.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[DOM Node to display the text of the ButtonItem. If not
+	specified try to query using HTML_PARSER an element inside
+	boundingBox which matches <code>aui-button-label</code>.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>labelNode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Retrieves the parent of the Widget in the object hierarchy.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>buttonitemParent</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[If <code>true</code> the render phase will be autimatically invoked
+	preventing the <code>.render()</code> manual call.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false,"defaultValue":"false"}-->]]></description>
+			<name>render</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Flag indicating whether or not this Widget
+	has been through the render lifecycle phase.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"false"}-->]]></description>
+			<name>rendered</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Returns the root Widget in the object hierarchy.  If the
+	ROOT_TYPE property is set, the search for the root Widget will be
+	constrained to parent Widgets of the specified type.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>root</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Number indicating if the Widget is selected.  Possible
+	values are:
+	<dl>
+	<dt>0</dt> <dd>(Default) Not selected</dd>
+	<dt>1</dt> <dd>Fully selected</dd>
+	<dt>2</dt> <dd>Partially selected</dd>
+	</dl><!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Number","required":false,"defaultValue":"0"}-->]]></description>
+			<name>selected</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[The DOM node to parse for configuration values, passed to the Widget's HTML_PARSER definition<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>srcNode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Collection of strings used to label elements of the Widget's UI.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.util.HashMap","required":false}-->]]></description>
+			<name>strings</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Number (between -32767 to 32767) indicating the widget's
+	position in the default tab flow.  The value is used to set the
+	"tabIndex" attribute on the widget's bounding box.  Negative values allow
+	the widget to receive DOM focus programmatically (by calling the focus
+	method), while being removed from the default tab flow.  A value of
+	null removes the "tabIndex" attribute from the widget's bounding box.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Number","required":false,"defaultValue":"0"}-->]]></description>
+			<name>tabIndex</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Text to use as the title attribute of the button.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false}-->]]></description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Button type.<!--{"event":false,"inputType":"java.lang.String","outputType":"java.lang.String","required":false,"defaultValue":"button"}-->]]></description>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Boolean indicating if use of the WAI-ARIA Roles and States should be
+	enabled for the Widget.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"true"}-->]]></description>
+			<name>useARIA</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Boolean indicating weather or not the Widget is visible.<!--{"event":false,"inputType":"boolean","outputType":"boolean","required":false,"defaultValue":"true"}-->]]></description>
+			<name>visible</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[String with units, or number, representing the width of the Widget. If a number is provided,
+	the default unit, defined by the Widgets DEF_UNIT, property is used.<!--{"event":false,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'activeState' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterActiveStateChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'boundingBox' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterBoundingBoxChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'classNames' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterClassNamesChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'contentBox' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterContentBoxChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'cssClass' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterCssClassChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'defaultState' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterDefaultStateChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'depth' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterDepthChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[<p>
+	Lifecycle event for the destroy phase,
+	fired prior to destruction. Invoking the preventDefault
+	method on the event object provided to subscribers will
+	prevent destruction from proceeding.
+	</p>
+	<p>
+	Subscribers to the "after" moment of this event, will be notified
+	after destruction is complete (and as a result cannot prevent
+	destruction).
+	</p><!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterDestroy</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'destroyed' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterDestroyedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'disabled' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterDisabledChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'focused' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterFocusedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'handler' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterHandlerChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'height' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterHeightChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'hideClass' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterHideClassChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'hoverState' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterHoverStateChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'icon' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterIconChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'iconNode' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterIconNodeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'id' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterIdChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'index' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterIndexChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[<p>
+	Lifecycle event for the init phase, fired prior to initialization.
+	Invoking the preventDefault() method on the event object provided
+	to subscribers will prevent initialization from occuring.
+	</p>
+	<p>
+	Subscribers to the "after" momemt of this event, will be notified
+	after initialization of the object is complete (and therefore
+	cannot prevent initialization).
+	</p><!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterInit</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'initialized' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterInitializedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'label' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterLabelChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'labelNode' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterLabelNodeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'parent' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterParentChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'render' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterRenderChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'rendered' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterRenderedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'root' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterRootChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'selected' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterSelectedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'srcNode' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterSrcNodeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'strings' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterStringsChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'tabIndex' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterTabIndexChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'title' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterTitleChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'type' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterTypeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'useARIA' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterUseARIAChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'visible' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterVisibleChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Notification event, which widget implementations can fire, when
+	they change the content of the widget. This event has no default
+	behavior and cannot be prevented, so the "on" or "after"
+	moments are effectively equivalent (with on listeners being invoked before
+	after listeners).<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterContentUpdate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Lifecycle event for the render phase, fired prior to rendering the UI
+	for the widget (prior to invoking the widget's renderer method).
+	<p>
+	Subscribers to the "on" moment of this event, will be notified
+	before the widget is rendered.
+	</p>
+	<p>
+	Subscribers to the "after" moment of this event, will be notified
+	after rendering is complete.
+	</p><!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterRender</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'width' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>afterWidthChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'activeState' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onActiveStateChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'boundingBox' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onBoundingBoxChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'classNames' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onClassNamesChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'contentBox' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onContentBoxChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'cssClass' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onCssClassChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'defaultState' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onDefaultStateChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'depth' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onDepthChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[<p>
+	Lifecycle event for the destroy phase,
+	fired prior to destruction. Invoking the preventDefault
+	method on the event object provided to subscribers will
+	prevent destruction from proceeding.
+	</p>
+	<p>
+	Subscribers to the "after" moment of this event, will be notified
+	after destruction is complete (and as a result cannot prevent
+	destruction).
+	</p><!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onDestroy</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'destroyed' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onDestroyedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'disabled' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onDisabledChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'focused' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onFocusedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'handler' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onHandlerChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'height' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onHeightChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'hideClass' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onHideClassChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'hoverState' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onHoverStateChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'icon' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onIconChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'iconNode' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onIconNodeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'id' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onIdChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'index' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onIndexChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[<p>
+	Lifecycle event for the init phase, fired prior to initialization.
+	Invoking the preventDefault() method on the event object provided
+	to subscribers will prevent initialization from occuring.
+	</p>
+	<p>
+	Subscribers to the "after" momemt of this event, will be notified
+	after initialization of the object is complete (and therefore
+	cannot prevent initialization).
+	</p><!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onInit</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'initialized' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onInitializedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'label' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onLabelChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'labelNode' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onLabelNodeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'parent' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onParentChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'render' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onRenderChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'rendered' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onRenderedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'root' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onRootChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'selected' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onSelectedChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'srcNode' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onSrcNodeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'strings' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onStringsChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'tabIndex' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onTabIndexChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'title' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onTitleChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'type' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onTypeChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'useARIA' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onUseARIAChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'visible' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onVisibleChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Notification event, which widget implementations can fire, when
+	they change the content of the widget. This event has no default
+	behavior and cannot be prevented, so the "on" or "after"
+	moments are effectively equivalent (with on listeners being invoked before
+	after listeners).<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onContentUpdate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Lifecycle event for the render phase, fired prior to rendering the UI
+	for the widget (prior to invoking the widget's renderer method).
+	<p>
+	Subscribers to the "on" moment of this event, will be notified
+	before the widget is rendered.
+	</p>
+	<p>
+	Subscribers to the "after" moment of this event, will be notified
+	after rendering is complete.
+	</p><!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onRender</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Fires when the value for the configuration attribute 'width' is changed. You can listen for the event using the <a href="Attribute.html#method_on">on</a> method if you wish to be notified before the attribute's value has changed, or using the <a href="Event.Target.html#method_after">after</a> method if you wish to be notified after the attribute's value has changed.<!--{"event":true,"inputType":"java.lang.Object","outputType":"java.lang.Object","required":false}-->]]></description>
+			<name>onWidthChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates an anchor (or link) that offers custom configuration and localization.]]></description>
+		<name>a</name>
+		<tag-class>com.liferay.taglib.aui.ATag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a role for assistive technologies to interpret HTML elements that have been used for something other than their intended purpose. For example, the <code>&lt;p&gt;</code> tag could be used for something other than a paragraph.]]></description>
+			<name>ariaRole</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the URL navigated to when the link is clicked.]]></description>
+			<name>href</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text value for the anchor's label.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the language of the anchor component, to assist search engines and web browsers in finding and rendering the anchor appropriately.]]></description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a JavaScript function to be called on a user clicking the anchor.]]></description>
+			<name>onClick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the target window in which the URL is opened. The default value is <code>self</code>. Possible values are <code>blank</code>, <code>self</code>, <code>parent</code>, <code>top</code>, and a unique frame's name.]]></description>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the anchor's title.]]></description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<name>button</name>
+		<tag-class>com.liferay.taglib.aui.ButtonTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component. These styles override the ones set by the <code>primary</code> attribute.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the component is disabled. The default value is <code>false</code>.]]></description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the URL navigated to when the button is clicked.]]></description>
+			<name>href</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the icon to display on the button based on the icon CSS class value given. Possible CSS class values can be found at <a href="http://marcoceppi.github.io/bootstrap-glyphicons/">here</a>.]]></description>
+			<name>icon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the alignment for the button's icon. The default value is <code>left</code>.]]></description>
+			<name>iconAlign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the button's name.]]></description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a function to be called on a user clicking the button.]]></description>
+			<name>onClick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to apply the primary btn CSS styling to the button. If the <code>type</code> attribute is set to <code>submit</code>, this value is set to <code>true</code>. For all other types, the value is set to <code>false</code> by default.]]></description>
+			<name>primary</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the button's type. Possible values are <code>button</code>, <code>submit</code>, <code>cancel</code> and <code>reset</code>. The default value is <code>button</code>.]]></description>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to open a dialog window with the <code>href</code> location when a user clicks the button. The default value is <code>false</code>.]]></description>
+			<name>useDialog</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a button row <code>&lt;div&gt;</code> tag to wrap <code>&lt;aui:button&gt;</code> components and offer additional styling.]]></description>
+		<name>button-row</name>
+		<tag-class>com.liferay.taglib.aui.ButtonRowTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a column to display content in an <code>&lt;aui:row&gt;</code> component.]]></description>
+		<name>col</name>
+		<tag-class>com.liferay.taglib.aui.ColTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>offset</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<name>offsetWidth</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the width of the column in the containing row as a fraction of <code>12</code>. For example, a span of <code>4</code> would result in a column width <code>4/12</code> (or <code>1/3</code>) of the total width of the containing row.]]></description>
+			<name>span</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the width of the column in the containing row as a percentage, overriding the <code>span</code> attribute. The width is then converted to a span expressed as <code>((width/100) x 12)</code>, rounded to the nearest whole number. For example, a width of <code>33</code> would be converted to <code>3.96</code>, which would be rounded up to a span value of <code>4</code>.]]></description>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Deprecated as of 6.2, replaced by <code>aui:col</code>.]]></description>
+		<name>column</name>
+		<tag-class>com.liferay.taglib.aui.ColumnTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets the width of the column in percentage. For example, <code>20</code> would be 20%. The default value is <code>0</code>.]]></description>
+			<name>columnWidth</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the column should be the first column. The default value is <code>false</code>.]]></description>
+			<name>first</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the column is the last column. The default value is <code>false</code>.]]></description>
+			<name>last</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<name>component</name>
+		<tag-class>com.liferay.taglib.aui.ComponentTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>defineVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<name>excludeAttributes</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>javaScriptAttributes</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>module</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>options</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<name>scriptPosition</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>tagPageContext</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>javax.servlet.jsp.JspContext</type>
+		</attribute>
+		<attribute>
+			<name>useJavaScript</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.io.Serializable</type>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a container <code>&lt;div&gt;</code> tag to wrap <code>&lt;aui:row&gt;</code> components and offer additional styling.]]></description>
+		<name>container</name>
+		<tag-class>com.liferay.taglib.aui.ContainerTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the container's size is fixed or is able to span the entire width of the viewport. The default value is <code>true</code>.]]></description>
+			<name>fluid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a <code>&lt;div&gt;</code> tag to wrap form fields and offer additional styling.]]></description>
+		<name>field-wrapper</name>
+		<tag-class>com.liferay.taglib.aui.FieldWrapperTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the wrapper should be the first element of the form. The default value is <code>false</code>.]]></description>
+			<name>first</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets text to display as a help tooltip on mouse over of the component's help icon.]]></description>
+			<name>helpMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to make this field inline with the next element. The default value is <code>false</code>.]]></description>
+			<name>inlineField</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Aligns the label's text. Possible values are <code>right</code> and <code>left</code>.]]></description>
+			<name>inlineLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text value for the wrapper's label.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the wrapper should be the last element of the form. The default value is <code>false</code>.]]></description>
+			<name>last</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the field wrapper's name.]]></description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to mark the wrapped fields as required.]]></description>
+			<name>required</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a <code>&lt;div&gt;</code> tag to group related form elements and offer additional styling.]]></description>
+		<name>fieldset</name>
+		<tag-class>com.liferay.taglib.aui.FieldsetTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets whether to display the field set as a column instead of a row.]]></description>
+			<name>column</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets text to display as a help tooltip on mouse over of the component's help icon.]]></description>
+			<name>helpMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text value for the field set's label and renders it as a legend, with a horizontal rule, above the fieldset.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a form that offers additional styling and custom namespacing.]]></description>
+		<name>form</name>
+		<tag-class>com.liferay.taglib.aui.FormTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets where to send the form data when the form is submitted.]]></description>
+			<name>action</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to escape the XML of the form's action URL. The default value is <code>true</code>.]]></description>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to align the form's labels. The default value is <code>false</code>.]]></description>
+			<name>inlineLabels</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets how to send the form data. The default value is <code>post</code>. Possible values are <code>get</code> and <code>post</code>.]]></description>
+			<name>method</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the form's name and ID. The default value is <code>fm</code>.]]></description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a function to be called on submitting the form.]]></description>
+			<name>onSubmit</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a namespace for the form and its elements. This attribute lets you set a namespace value that differs from the default portlet namespace.]]></description>
+			<name>portletNamespace</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to use the default portlet namespace, to avoid name conflicts. The default value is <code>true</code>.]]></description>
+			<name>useNamespace</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a customizable icon that can leverage Bootstrap CSS icon classes.]]></description>
+		<name>icon</name>
+		<tag-class>com.liferay.taglib.aui.IconTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a class to give to the container of the icon, to provide an implementation for the icon. Note that the preferred method of setting the icon's image is via the <code>image</code> attribute.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the image to display for the icon. Values are taken from the suffix of the Bootstrap icon CSS classes. For example, to display the edit icon you would reference the <code>icon-edit</code> CSS class by setting the value <code>edit</code>. If an icon image is referenced for <code>cssClass</code> and <code>image</code>, both icons are shown in the component.]]></description>
+			<name>image</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text to display alongside the icon.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the target window in which the URL is opened. The default value is <code>self</code>. Possible values are <code>blank</code>, <code>self</code>, <code>parent</code>, <code>top</code>, and a unique frame's name.]]></description>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the URL navigated to when the icon is clicked.]]></description>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a configurable input component.]]></description>
+		<name>input</name>
+		<tag-class>com.liferay.taglib.aui.InputTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets whether the input component gets focus by default.]]></description>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the input component autosizes.]]></description>
+			<name>autoSize</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a bean to associate with the input component.]]></description>
+			<name>bean</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to reload the page when the value of the input changes. The default value is <code>false</code>.]]></description>
+			<name>changesContext</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the input is selected. Note that this attribute is only enabled when <code>type</code> is <code>radio</code> or <code>checkbox</code>.]]></description>
+			<name>checked</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the primary key for the instance of the class. The default value is <code>0</code>.]]></description>
+			<name>classPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>long</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<name>dateTogglerCheckboxLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the default language ID for the component.]]></description>
+			<name>defaultLanguageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the component is disabled. The default value is <code>false</code>.]]></description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<name>field</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a variable name to refer to the <code>field</code> of the component.]]></description>
+			<name>fieldParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the input component should be the first element of the form.]]></description>
+			<name>first</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the name of the component's form.]]></description>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets text to display as a help tooltip on mouse over of the component's help icon.]]></description>
+			<name>helpMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling the help message text. The default value is <code>input-group-addon</code>.]]></description>
+			<name>helpTextCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to ignore the value saved from the request object. The default value is <code>false</code>.]]></description>
+			<name>ignoreRequestValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to align the input's field with the next element in the form. The default value is <code>false</code>.]]></description>
+			<name>inlineField</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Aligns the input label's text. Possible values are <code>right</code> and <code>left</code>.]]></description>
+			<name>inlineLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the label for the input component. If not assigned a value, the label is automatically taken from the <code>name</code> attribute's value.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>languageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the component should be the last element of the form.]]></description>
+			<name>last</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to translate the component's text features into the user's language. The default value is <code>false</code>.]]></description>
+			<name>localized</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the maximum value for the input if its <code>type</code> is <code>number</code> or <code>range</code>. Note that the max value is inclusive if the input's <code>type</code> is <code>range</code>.]]></description>
+			<name>max</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the class for the bean object.]]></description>
+			<name>model</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Class</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the minimum value for the input if its <code>type</code> is <code>number</code> or <code>range</code>. Note that the min value is inclusive if the input's <code>type</code> is <code>range</code>.]]></description>
+			<name>min</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<name>multiple</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the component's name.]]></description>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a function to be called when the input's value changes.]]></description>
+			<name>onChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a function to be called on a user clicking the input.]]></description>
+			<name>onClick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets placeholder text for the input's field.]]></description>
+			<name>placeholder</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets text to display before the input.]]></description>
+			<name>prefix</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to mark the input as required.]]></description>
+			<name>required</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the input's field is resizeable, if the input is of type <code>textarea</code>.]]></description>
+			<name>resizable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to show the input's required label, if an input value is required.]]></description>
+			<name>showRequiredLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets text to display after the input.]]></description>
+			<name>suffix</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the input's title.]]></description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the input's type. Possible values are <code>text</code>, <code>hidden</code>, <code>assetCategories</code>, <code>assetTags</code>, <code>textarea</code>, <code>timeZone</code>, <code>password</code>, <code>checkbox</code>, <code>radio</code>, <code>submit</code>, <code>button</code>, <code>color</code>, <code>email</code>, <code>number</code>, <code>range</code>, <code>resource</code>, <code>url</code>, and an empty value. If an empty value or no value is set, the input's type is obtained automatically from the input component's bean.]]></description>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to use the default portlet namespace, to avoid name conflicts. The default value is <code>true</code>.]]></description>
+			<name>useNamespace</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the input's value.]]></description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling the <code>div</code> that wraps the input component.]]></description>
+			<name>wrapperCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Deprecated as of 6.2, with no replacement.]]></description>
+		<name>layout</name>
+		<tag-class>com.liferay.taglib.aui.LayoutTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a configurable model context object that can be used as a model for other components.]]></description>
+		<name>model-context</name>
+		<tag-class>com.liferay.taglib.aui.ModelContextTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets the bean associated with the model object.]]></description>
+			<name>bean</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the default language ID for the component.]]></description>
+			<name>defaultLanguageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the class for the bean object.]]></description>
+			<name>model</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Class</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a navigation wrapper component to hold <code>&lt;nav:item&gt;</code> components for an <code>&lt;aui:nav-bar&gt;</code> component.]]></description>
+		<name>nav</name>
+		<tag-class>com.liferay.taglib.aui.NavTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a name for the navigation component for assistive technologies to interpret.]]></description>
+			<name>ariaLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a role for assistive technologies to interpret HTML elements that have been used for something other than their intended purpose. For example, the <code>&lt;p&gt;</code> tag could be used for something other than a paragraph.]]></description>
+			<name>ariaRole</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>collapsible</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>icon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to use the default portlet namespace, to avoid name conflicts. The default value is <code>true</code>.]]></description>
+			<name>useNamespace</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a navigation bar to house navigation components.]]></description>
+		<name>nav-bar</name>
+		<tag-class>com.liferay.taglib.aui.NavBarTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a search component for an <code>&lt;aui:nav-bar&gt;</code> component.]]></description>
+		<name>nav-bar-search</name>
+		<tag-class>com.liferay.taglib.aui.NavBarSearchTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>file</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the search container for the navigation bar to use.]]></description>
+			<name>searchContainer</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>com.liferay.portal.kernel.dao.search.SearchContainer</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a navigation item for using in an <code>&lt;aui:nav&gt;</code> component.]]></description>
+		<name>nav-item</name>
+		<tag-class>com.liferay.taglib.aui.NavItemTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling the link set in the <code>href</code> attribute.]]></description>
+			<name>anchorCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes for the anchor. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>anchorData</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the instance of the navigation item's link, set in the <code>href</code> attribute.]]></description>
+			<name>anchorId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a name for the navigation item for assistive technologies to interpret.]]></description>
+			<name>ariaLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a role for assistive technologies to interpret HTML elements that have been used for something other than their intended purpose. For example, the <code>&lt;p&gt;</code> tag could be used for something other than a paragraph.]]></description>
+			<name>ariaRole</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the navigation item is a dropdown menu. The default value is <code>false</code>.]]></description>
+			<name>dropdown</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the URL navigated to when the navigation item is clicked.]]></description>
+			<name>href</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling the navigation item's icon.]]></description>
+			<name>iconCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text to display for the navigation item.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>localizeLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the navigation item is selected by default. The default value is <code>false</code>.]]></description>
+			<name>selected</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<name>state</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the navigation item's title.]]></description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>toggle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to open a dialog window with the <code>href</code> location when a user clicks the navigation item. The default value is <code>false</code>.]]></description>
+			<name>useDialog</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to wrap the navigation item's dropdown menu in an unordered list with the <code>drop-down-menu</code> class. The default value is <code>true</code>.]]></description>
+			<name>wrapDropDownMenu</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates an option component for using in an <code>&lt;aui:select&gt;</code> component.]]></description>
+		<name>option</name>
+		<tag-class>com.liferay.taglib.aui.OptionTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", foo&gt;</code> would render as the attribute <code>data-class-name = foo;</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the component is disabled. The default value is <code>false</code>.]]></description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text to display as the option in the select form.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the option is selected when the component loads. The default value is <code>false</code>.]]></description>
+			<name>selected</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the styling for the option component. For example, to align the text to the right you would specify <code>text-align:right;</code>.]]></description>
+			<name>style</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>useModelValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the option's value. If no value is given, the value is taken from the <code>label</code> attribute.]]></description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<name>panel</name>
+		<tag-class>com.liferay.taglib.aui.PanelTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>collapsed</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<name>collapsible</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a row to hold <code>&lt;aui:col&gt;</code> components.]]></description>
+		<name>row</name>
+		<tag-class>com.liferay.taglib.aui.RowTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to assign the <code>row-fluid</code> CSS class to the row. The default value is <code>true</code>. If set to <code>false</code>, the <code>row</code> CSS class is assigned.]]></description>
+			<name>fluid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a script component in which to write JavaScript that facilitates using AlloyUI modules.]]></description>
+		<name>script</name>
+		<tag-class>com.liferay.taglib.aui.ScriptTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets the script's position.]]></description>
+			<name>position</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets AlloyUI modules to be used in the script. Names of multiple modules must be separated by commas.]]></description>
+			<name>use</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a select field (or combo box) for holding <code>&lt;aui:option&gt;</code> components.]]></description>
+		<name>select</name>
+		<tag-class>com.liferay.taglib.aui.SelectTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets the bean associated with the select component.]]></description>
+			<name>bean</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to reload the page when the value of the field changes. The default value is <code>false</code>.]]></description>
+			<name>changesContext</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a CSS class for styling this component.]]></description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Takes a set of data and passes it as HTML data attributes. For example, the <code>HashMap&lt;"class-name", "foo"&gt;</code> would render as the attribute <code>data-class-name = "foo";</code>.]]></description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the component is disabled. The default value is <code>false</code>.]]></description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the component should be the first element of the form. The default value is <code>false</code>.]]></description>
+			<name>first</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets text to display as a help tooltip on mouse over of the component's help icon.]]></description>
+			<name>helpMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>ignoreRequestValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to align the select field with the next element in the form. The default value is <code>false</code>.]]></description>
+			<name>inlineField</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Aligns the label's text. Possible values are <code>right</code> and <code>left</code>.]]></description>
+			<name>inlineLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the select field's label and displays it above the field.]]></description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether the component should be the last element in the form. The default value is <code>false</code>.]]></description>
+			<name>last</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the list type and automatically generates the options. Possible values can be found in <code>ListTypeImpl.java</code>.]]></description>
+			<name>listType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>listTypeFieldName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether multiple options can be selected. If set to <code>true</code>, the select field expands to allow for multiple selections. The default value is <code>false</code>.]]></description>
+			<name>multiple</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the select field's name attribute. Note that this value overrides the <code>label</code> attribute and takes the place of the label.]]></description>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a function to be called when the select field's value changes.]]></description>
+			<name>onChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a function to be called on users clicking the select field.]]></description>
+			<name>onClick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text to display before the select field.]]></description>
+			<name>prefix</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to mark the select field as required. The default value is <code>false</code>.]]></description>
+			<name>required</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to display an empty option as a placeholder. The default value is <code>false</code>.]]></description>
+			<name>showEmptyOption</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to display the required label above the select field. Note that this attribute is only active if the <code>required</code> attribute is set to <code>true</code>. The default value is <code>false</code>.]]></description>
+			<name>showRequiredLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the text to display after the select field.]]></description>
+			<name>suffix</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the select field's title.]]></description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to use the default portlet namespace, to avoid name conflicts. The default value is <code>true</code>.]]></description>
+			<name>useNamespace</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a spacer component that enables JSP 2.1 server-side trimming of white spaces.]]></description>
+		<name>spacer</name>
+		<tag-class>com.liferay.taglib.aui.SpacerTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a UI component for managing translation of associated content.]]></description>
+		<name>translation-manager</name>
+		<tag-class>com.liferay.taglib.aui.TranslationManagerTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets the available locales of translation languages to choose from.]]></description>
+			<name>availableLocales</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Locale[]</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the language ID to which the translation manager defaults when no other translations are available in the user's language.]]></description>
+			<name>defaultLanguageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<name>editingLanguageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to activate the translation manager. The default value is <code>true</code>. If this is set to <code>false</code>, the translation manager will not work entirely.]]></description>
+			<name>initialize</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to make the translation manager read-only for the user. The default value is <code>false</code>.]]></description>
+			<name>readOnly</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a component to validate input fields.]]></description>
+		<name>validator</name>
+		<tag-class>com.liferay.taglib.aui.ValidatorTagImpl</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets whether custom validator rules force a field to be required. The default value is <code>true</code>.]]></description>
+			<name>customValidatorRequired</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets a custom error message to replace the default validation error message.]]></description>
+			<name>errorMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the type of validation for the input field. Possible values are <code>acceptFiles</code>, <code>alpha</code>, <code>alphanum</code>, <code>date</code>, <code>digits</code>, <code>email</code>, <code>equalTo</code>, <code>iri</code>, <code>max</code>, <code>maxLength</code>, <code>min</code>, <code>minLength</code>, <code>number</code>, <code>required</code>, and <code>url</code>.]]></description>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description><![CDATA[Creates a UI component that displays the current status of its associated workflow.]]></description>
+		<name>workflow-status</name>
+		<tag-class>com.liferay.taglib.aui.WorkflowStatusTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description><![CDATA[Sets the bean associated with the workflow status component.]]></description>
+			<name>bean</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Object</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets text to display as a help tooltip on mouse over of the component's help icon.]]></description>
+			<name>helpMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Identifies the component instance.]]></description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the class for the bean object.]]></description>
+			<name>model</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Class</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to show the workflow status icon. The default value is <code>true</code>.]]></description>
+			<name>showIcon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets whether to show the status label. The default value is <code>true</code>.]]></description>
+			<name>showLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the workflow status. Possible values are <code>0</code> (Approved), <code>1</code> (Pending), <code>2</code> (Draft), <code>3</code> (Expired), <code>4</code> (Denied), <code>5</code> (Inactive), <code>6</code> (Incomplete), <code>7</code> (Scheduled), and <code>8</code> (In-Trash). Any other value defaults to status (Any).]]></description>
+			<name>status</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.Integer</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the worflow status message, overriding the existing one.]]></description>
+			<name>statusMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+		<attribute>
+			<description><![CDATA[Sets the version for the workflow status and displays the version in a label next to the workflow status.]]></description>
+			<name>version</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.lang.String</type>
+		</attribute>
+	</tag>
+</taglib>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld
new file mode 100644
index 0000000..7c04664
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-portlet-ext.tld
@@ -0,0 +1,538 @@
+<?xml version="1.0"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+	<tlib-version>1.0</tlib-version>
+	<jsp-version>1.1</jsp-version>
+	<short-name>liferay-portlet</short-name>
+	<uri>http://liferay.com/tld/portlet</uri>
+
+	<!--
+	liferay-portlet:actionURL is similar to portlet:actionURL except it has the
+	additional attributes plid, portletName, anchor, and encrypt.
+
+	Set varImpl to set the PortletURL object. This gives you an object reference
+	to the underlying URL implementation.
+
+	Set plid to the plid of another layout. This allows you to post the URL to
+	another layout.
+
+	Set portletName to the name of a portlet other than the current portlet.
+	This allows you to post the URL to another portlet.
+
+	Set anchor to false if you do not want the page to refresh and anchor to the
+	current portlet.
+
+	Set encrypt to true if you want to encrypt all the parameter values.
+
+	Set doAsUserId to process this URL as if it is accessed by the specified
+	user.
+
+	Set portletConfiguration to true if you want to pass the parameters needed
+	when you are accessing a portlet that is wrapped by the Portlet
+	Configuration portlet.
+	-->
+
+	<tag>
+		<name>actionURL</name>
+		<tag-class>com.liferay.taglib.portlet.ActionURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.ActionURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>allowEmptyParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>anchor</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>copyCurrentRenderParameters</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>doAsGroupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>doAsUserId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>encrypt</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>plid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletConfiguration</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletMode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>refererGroupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>refererPlid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>varImpl</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>icon-back</name>
+		<tag-class>com.liferay.taglib.portletext.IconBackTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-close</name>
+		<tag-class>com.liferay.taglib.portletext.IconCloseTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-configuration</name>
+		<tag-class>com.liferay.taglib.portletext.IconConfigurationTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-edit</name>
+		<tag-class>com.liferay.taglib.portletext.IconEditTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-edit-defaults</name>
+		<tag-class>com.liferay.taglib.portletext.IconEditDefaultsTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-edit-guest</name>
+		<tag-class>com.liferay.taglib.portletext.IconEditGuestTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-export-import</name>
+		<tag-class>com.liferay.taglib.portletext.IconExportImportTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-help</name>
+		<tag-class>com.liferay.taglib.portletext.IconHelpTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-maximize</name>
+		<tag-class>com.liferay.taglib.portletext.IconMaximizeTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-minimize</name>
+		<tag-class>com.liferay.taglib.portletext.IconMinimizeTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-options</name>
+		<tag-class>com.liferay.taglib.portletext.IconOptionsTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-portlet</name>
+		<tag-class>com.liferay.taglib.portletext.IconPortletTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>ariaRole</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portlet</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>icon-portlet-css</name>
+		<tag-class>com.liferay.taglib.portletext.IconPortletCssTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-print</name>
+		<tag-class>com.liferay.taglib.portletext.IconPrintTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>icon-refresh</name>
+		<tag-class>com.liferay.taglib.portletext.IconRefreshTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>param</name>
+		<tag-class>com.liferay.taglib.util.ParamTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>preview</name>
+		<tag-class>com.liferay.taglib.portletext.PreviewTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>portletName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>queryString</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showBorders</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<!--
+	liferay-portlet:renderURL is similar to portlet:renderURL except it has the
+	additional attributes plid, portletName, anchor, and encrypt.
+
+	Set varImpl to set the PortletURL object. This gives you an object reference
+	to the underlying URL implementation.
+
+	Set plid to the plid of another layout. This allows you to post the URL to
+	another layout.
+
+	Set portletName to the name of a portlet other than the current portlet.
+	This allows you to post the URL to another portlet.
+
+	Set anchor to false if you do not want the page to refresh and anchor to the
+	current portlet.
+
+	Set encrypt to true if you want to encrypt all the parameter values.
+
+	Set doAsUserId to process this URL as if it is accessed by the specified
+	user.
+
+	Set portletConfiguration to true if you want to pass the parameters needed
+	when you are accessing a portlet that is wrapped by the Portlet
+	Configuration portlet.
+	-->
+
+	<tag>
+		<name>renderURL</name>
+		<tag-class>com.liferay.taglib.portlet.RenderURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.RenderURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>allowEmptyParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>anchor</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>copyCurrentRenderParameters</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>doAsGroupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>doAsUserId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>encrypt</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>plid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletConfiguration</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletMode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>refererGroupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>refererPlid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>varImpl</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>renderURLParams</name>
+		<tag-class>com.liferay.taglib.portlet.RenderURLParamsTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>varImpl</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+
+	<!--
+	liferay-portlet:resourceURL is similar to portlet:resourceURL except it has
+	the additional attributes plid, portletName, anchor, and encrypt.
+
+	Set varImpl to set the PortletURL object. This gives you an object reference
+	to the underlying URL implementation.
+
+	Set plid to the plid of another layout. This allows you to post the URL to
+	another layout.
+
+	Set portletName to the name of a portlet other than the current portlet.
+	This allows you to post the URL to another portlet.
+
+	Set anchor to false if you do not want the page to refresh and anchor to the
+	current portlet.
+
+	Set encrypt to true if you want to encrypt all the parameter values.
+
+	Set doAsUserId to process this URL as if it is accessed by the specified
+	user.
+
+	Set portletConfiguration to true if you want to pass the parameters needed
+	when you are accessing a portlet that is wrapped by the Portlet
+	Configuration portlet.
+	-->
+
+	<tag>
+		<name>resourceURL</name>
+		<tag-class>com.liferay.taglib.portlet.ResourceURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.ResourceURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>anchor</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>copyCurrentRenderParameters</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>doAsGroupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>doAsUserId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>encrypt</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>plid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletConfiguration</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletMode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>refererGroupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>refererPlid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>varImpl</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>runtime</name>
+		<tag-class>com.liferay.taglib.portletext.RuntimeTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>defaultPreferences</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>queryString</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+</taglib>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-portlet.tld b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-portlet.tld
new file mode 100644
index 0000000..a7cd2fd
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-portlet.tld
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+	<tlib-version>1.0</tlib-version>
+	<jsp-version>1.1</jsp-version>
+	<short-name>portlet</short-name>
+	<uri>http://java.sun.com/portlet</uri>
+	<tag>
+		<name>actionURL</name>
+		<tag-class>com.liferay.taglib.portlet.ActionURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.ActionURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>copyCurrentRenderParameters</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletMode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>defineObjects</name>
+		<tag-class>com.liferay.taglib.portlet.DefineObjectsTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.DefineObjectsTei</tei-class>
+		<body-content>empty</body-content>
+	</tag>
+	<tag>
+		<name>namespace</name>
+		<tag-class>com.liferay.taglib.portlet.NamespaceTag</tag-class>
+		<body-content>empty</body-content>
+	</tag>
+	<tag>
+		<name>param</name>
+		<tag-class>com.liferay.taglib.util.ParamTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>property</name>
+		<tag-class>com.liferay.taglib.util.PropertyTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>renderURL</name>
+		<tag-class>com.liferay.taglib.portlet.RenderURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.RenderURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>copyCurrentRenderParameters</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletMode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>resourceURL</name>
+		<tag-class>com.liferay.taglib.portlet.ResourceURLTag</tag-class>
+		<tei-class>com.liferay.taglib.portlet.ResourceURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>cacheability</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>secure</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+</taglib>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-security.tld b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-security.tld
new file mode 100644
index 0000000..f8e6f6d
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-security.tld
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+	<tlib-version>1.0</tlib-version>
+	<jsp-version>1.1</jsp-version>
+	<short-name>liferay-security</short-name>
+	<uri>http://liferay.com/tld/security</uri>
+	<tag>
+		<name>doAsURL</name>
+		<tag-class>com.liferay.taglib.security.DoAsURLTag</tag-class>
+		<tei-class>com.liferay.taglib.security.DoAsURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>doAsUserId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>encrypt</name>
+		<tag-class>com.liferay.taglib.security.EncryptTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>className</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>protocol</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>style</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>unencryptedParams</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>permissionsURL</name>
+		<tag-class>com.liferay.taglib.security.PermissionsURLTag</tag-class>
+		<tei-class>com.liferay.taglib.security.PermissionsURLTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>modelResource</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>modelResourceDescription</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>redirect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>resourceGroupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>resourcePrimKey</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>roleTypes</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>windowState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+</taglib>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-theme.tld b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-theme.tld
new file mode 100644
index 0000000..90ac81d
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-theme.tld
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+	<tlib-version>1.0</tlib-version>
+	<jsp-version>1.1</jsp-version>
+	<short-name>theme</short-name>
+	<uri>http://liferay.com/tld/theme</uri>
+	<tag>
+		<name>defineObjects</name>
+		<tag-class>com.liferay.taglib.theme.DefineObjectsTag</tag-class>
+		<tei-class>com.liferay.taglib.theme.DefineObjectsTei</tei-class>
+		<body-content>empty</body-content>
+	</tag>
+	<tag>
+		<name>include</name>
+		<tag-class>com.liferay.taglib.theme.IncludeTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>page</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>layout-icon</name>
+		<tag-class>com.liferay.taglib.theme.LayoutIconTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>layout</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>meta-tags</name>
+		<tag-class>com.liferay.taglib.theme.MetaTagsTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>param</name>
+		<tag-class>com.liferay.taglib.util.ParamTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>wrap-portlet</name>
+		<tag-class>com.liferay.taglib.theme.WrapPortletTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>page</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+</taglib>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-ui.tld b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-ui.tld
new file mode 100644
index 0000000..daa2c53
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-ui.tld
@@ -0,0 +1,4696 @@
+<?xml version="1.0"?>
+
+<taglib
+	version="2.1"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+>
+	<description>Provides the Liferay UI component tags, prefixed with <![CDATA[<code>liferay-ui:</code>]]>.</description>
+	<tlib-version>1.0</tlib-version>
+	<short-name>liferay-ui</short-name>
+	<uri>http://liferay.com/tld/ui</uri>
+	<tag>
+		<name>app-view-display-style</name>
+		<tag-class>com.liferay.taglib.ui.AppViewDisplayStyleTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<name>displayStyle</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyles</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>requestParams</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a component for displaying entry items such as images, documents, folders, etc. in a concise but informative manner. Items are displayed in a similar fashion to entries in the file system of most operating systems.</description>
+		<name>app-view-entry</name>
+		<tag-class>com.liferay.taglib.ui.AppViewEntryTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>The path to an action JSP page.</description>
+			<name>actionJsp</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Java class name for any categories added to the entry.</description>
+			<name>assetCategoryClassName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Java class primary key for any categories added to the entry. This is a Java <![CDATA[<code>long</code>]]>.</description>
+			<name>assetCategoryClassPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Java class name for any tags added to the entry.</description>
+			<name>assetTagClassName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Java class primary key for any tags added to the entry. This is a Java <![CDATA[<code>long</code>]]>.</description>
+			<name>assetTagClassPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of the entry's author.</description>
+			<name>author</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The date the entry was created.</description>
+			<name>createDate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling this component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Miscellaneous data to be stored via a map. This data is not shared with the browser. The map holds key value pairs of type <![CDATA[<code>&lt;String, Object&gt;</code>]]>.</description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description>A description of the entry.</description>
+			<name>description</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A date to display the entry.</description>
+			<name>displayDate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A display style for the component. Options are <![CDATA[<code>list</code>]]>, <![CDATA[<code>icon</code>]]>, and <![CDATA[<code>descriptive</code>]]>.</description>
+			<name>displayStyle</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A date for the entry to expire and be automatically deleted.</description>
+			<name>expirationDate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the entry is a folder. The default is <![CDATA[<code>false</code>]]>.</description>
+			<name>folder</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The group ID of the entry. This is a Java <![CDATA[<code>long</code>]]>.</description>
+			<name>groupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The version number of the most recently published copy of the entry.</description>
+			<name>latestApprovedVersion</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The author of the most recently published version of the entry.</description>
+			<name>latestApprovedVersionAuthor</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the entry is locked. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>locked</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The date of the most recent modification to the entry.</description>
+			<name>modifiedDate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The date the entry was reviewed.</description>
+			<name>reviewDate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A checkbox input ID to be used for the entry row checker.</description>
+			<name>rowCheckerId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the entry row checker.</description>
+			<name>rowCheckerName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to show a shortcut icon link to the entry. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>shortcut</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether the entry is selectable. An actual checkbox is used when the display style is <![CDATA[<code>icon</code>]]> or <![CDATA[<code>descriptive</code>]]>. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>showCheckbox</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to show the link title. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>showLinkTitle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The current status of the entry, as represented by an integer. Options are <![CDATA[<code>-1: STATUS_ANY</code>]]>, <![CDATA[<code>0: STATUS_APPROVED</code>]]>, <![CDATA[<code>1: ACTION_PUBLISH</code>]]>, <![CDATA[<code>2: STATUS_DRAFT</code>]]>, and <![CDATA[<code>4: STATUS_DENIED</code>]]>. The default value is <![CDATA[<code>-1</code>]]>.</description>
+			<name>status</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A CSS style to be applied to the div containing the thumbnail for the entry.</description>
+			<name>thumbnailDivStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The source URL for an entry thumbnail image.</description>
+			<name>thumbnailSrc</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS style to be applied to the thumbnail for the entry.</description>
+			<name>thumbnailStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A title for the entry.</description>
+			<name>title</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The current version of the entry.</description>
+			<name>version</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to view the full entry.</description>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a navigation list item component for navigating app view entries.</description>
+		<name>app-view-navigation-entry</name>
+		<tag-class>com.liferay.taglib.ui.AppViewNavigationEntryTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>The path for an action JSP page.</description>
+			<name>actionJsp</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling this component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Data to be applied to the component link and stored via a map. This data is not shared with the browser. The map holds key value pairs of type <![CDATA[<code>&lt;String, Object&gt;</code>]]>.</description>
+			<name>dataView</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description>A title for the component.</description>
+			<name>entryTitle</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for setting the icon of the component.</description>
+			<name>iconImage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>iconSrc</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the entry is selected.</description>
+			<name>selected</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A URL to view the entry.</description>
+			<name>viewURL</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a toolbar for viewing items in app view.</description>
+		<name>app-view-toolbar</name>
+		<tag-class>com.liferay.taglib.ui.AppViewToolbarTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether to include the option to choose a display style for component items. If the value is <![CDATA[<code>true</code>]]>, a list of display style options is rendered. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>includeDisplayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to include an option to select all component items. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>includeSelectAll</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The file path for a search JSP page.</description>
+			<name>searchJsp</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a component for displaying search results of entries in app view.</description>
+		<name>app-view-search-entry</name>
+		<tag-class>com.liferay.taglib.ui.AppViewSearchEntryTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>The file path for an action JSP page.</description>
+			<name>actionJsp</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>containerIcon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of the container that the entry is in, such as the name of a folder.</description>
+			<name>containerName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>containerSrc</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The type of container the entry is in, such as <![CDATA[<code>Folder</code>]]>.</description>
+			<name>containerType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling this component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A description of the entry.</description>
+			<name>description</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A list of objects containing information such as content, user ID, and titles of the entry file attachments.</description>
+			<name>fileEntryTuples</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the entry is locked. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>locked</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A list of objects containing information such as content, author, and status of entry messages. An example would be a comment made by one user on another user's blog post.</description>
+			<name>mbMessages</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Query terms of the search.</description>
+			<name>queryTerms</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A checkbox input ID to be used for the entry row checker. This is a Java <![CDATA[<code>long</code>]]>.</description>
+			<name>rowCheckerId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name to be used for the entry row checker.</description>
+			<name>rowCheckerName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the entry is selectable via a checkbox. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>showCheckbox</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The current status of the entry as represented by an integer. Options are <![CDATA[<code>-1: STATUS_ANY</code>]]>, <![CDATA[<code>0: STATUS_APPROVED</code>]]>, <![CDATA[<code>1: ACTION_PUBLISH</code>]]>, <![CDATA[<code>2: STATUS_DRAFT</code>]]>, and <![CDATA[<code>4: STATUS_DENIED</code>]]>.</description>
+			<name>status</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The URL for an entry thumbnail image.</description>
+			<name>thumbnailSrc</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A title for the entry.</description>
+			<name>title</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL used to view the full entry.</description>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The current and past versions of the entry.</description>
+			<name>versions</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>asset-categories-error</name>
+		<tag-class>com.liferay.taglib.ui.AssetCategoriesErrorTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>asset-categories-navigation</name>
+		<tag-class>com.liferay.taglib.ui.AssetCategoriesNavigationTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>hidePortletWhenEmpty</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>vocabularyIds</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>asset-categories-selector</name>
+		<tag-class>com.liferay.taglib.ui.AssetCategoriesSelectorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>className</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>contentCallback</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>curCategoryIds</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>groupIds</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>hiddenInput</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ignoreRequestValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>asset-categories-summary</name>
+		<tag-class>com.liferay.taglib.ui.AssetCategoriesSummaryTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>asset-links</name>
+		<tag-class>com.liferay.taglib.ui.AssetLinksTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>assetEntryId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>className</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a <![CDATA[<code>liferay-ui:error</code>]]> component to display tag-related error messages.</description>
+		<name>asset-tags-error</name>
+		<tag-class>com.liferay.taglib.ui.AssetTagsErrorTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>asset-tags-navigation</name>
+		<tag-class>com.liferay.taglib.ui.AssetTagsNavigationTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>classNameId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>hidePortletWhenEmpty</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>maxAssetTags</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showAssetCount</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showZeroAssetCount</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a <![CDATA[<code>Liferay.AssetTagsSelector</code>]]> component to create and select tags to add to an asset, such as a blog entry, bookmark, or wiki page.</description>
+		<name>asset-tags-selector</name>
+		<tag-class>com.liferay.taglib.ui.AssetTagsSelectorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether to automatically focus the tag input field. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The Java class of the asset.</description>
+			<name>className</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Java class primary key of an asset to associate with the tags. This is a Java <![CDATA[<code>long</code>]]>.</description>
+			<name>classPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A function to get tag suggestions based on the asset's content.</description>
+			<name>contentCallback</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The current selected tags.</description>
+			<name>curTags</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The group IDs of the asset tags.</description>
+			<name>groupIds</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of the hidden input for passing in the asset's current tags.</description>
+			<name>hiddenInput</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ignoreRequestValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a component to display all the tags associated with an asset, such as a blog entry, wiki page, or message boards message.</description>
+		<name>asset-tags-summary</name>
+		<tag-class>com.liferay.taglib.ui.AssetTagsSummaryTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>An array of the asset tag names.</description>
+			<name>assetTagNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Java class of the asset.</description>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The Java class primary key of an asset. This is a Java <![CDATA[<code>long</code>]]>.</description>
+			<name>classPK</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A message to display before the tag labels. A standard example is <![CDATA[<code>tags</code>]]>, which renders as <![CDATA[<code>Tags:</code>]]>.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The URL of a portlet to display the tags.</description>
+			<name>portletURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>breadcrumb</name>
+		<tag-class>com.liferay.taglib.ui.BreadcrumbTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>selLayout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>selLayoutParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showCurrentGroup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showCurrentPortlet</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showGuestGroup</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showLayout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showParentGroups</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showPortletBreadcrumb</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a calendar with configurable events.</description>
+		<name>calendar</name>
+		<tag-class>com.liferay.taglib.ui.CalendarTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A given set of integers, corresponding to a day of the chosen month, and to mark with a dot.</description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Set</type>
+		</attribute>
+		<attribute>
+			<description>A day of the month to highlight in the calendar.</description>
+			<name>day</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A format for the header.</description>
+			<name>headerFormat</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.text.Format</type>
+		</attribute>
+		<attribute>
+			<description>A pattern for the calendar header. A possible value is <![CDATA[<code>MMM/dd/yyyy</code>]]>.</description>
+			<name>headerPattern</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A month of the year to display at the top of the calendar.</description>
+			<name>month</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>Whether to display up to six calendar weeks relative to the set day. If the set day of the month is in the latter part of the month, the current month's weeks will be displayed and up to two weeks of the next month will be displayed. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>showAllPotentialWeeks</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A year to display at the top of the calendar.</description>
+			<name>year</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates an image CAPTCHA with a corresponding verification input.</description>
+		<name>captcha</name>
+		<tag-class>com.liferay.taglib.ui.CaptchaTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The source URL for the image CAPTCHA.</description>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>categorization-filter</name>
+		<tag-class>com.liferay.taglib.ui.CategorizationFilterTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>assetType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>custom-attribute</name>
+		<tag-class>com.liferay.taglib.ui.CustomAttributeTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>editable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>custom-attribute-list</name>
+		<tag-class>com.liferay.taglib.ui.CustomAttributeListTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>editable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ignoreAttributeNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>custom-attributes-available</name>
+		<tag-class>com.liferay.taglib.ui.CustomAttributesAvailableTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>companyId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ignoreAttributeNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>editable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>ddm-template-selector</name>
+		<tag-class>com.liferay.taglib.ui.DDMTemplateSelectorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>classNameId</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyle</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyleGroupId</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyles</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>icon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>refreshURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showEmptyOption</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>diff</name>
+		<tag-class>com.liferay.taglib.ui.DiffTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>diffResults</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>sourceName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>targetName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>diff-html</name>
+		<tag-class>com.liferay.taglib.ui.DiffHtmlTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>diffHtmlResults</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>discussion</name>
+		<tag-class>com.liferay.taglib.ui.DiscussionTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>assetEntryVisible</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>formAction</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>hideControls</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>permissionClassName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>permissionClassPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ratingsEnabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>redirect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Deprecated as of 6.2.0, with no direct replacement</description>
+			<name>subject</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>userId</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates an error message to display to the user.</description>
+		<name>error</name>
+		<tag-class>com.liferay.taglib.ui.ErrorTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.ErrorTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A class for the exception.</description>
+			<name>exception</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of a field on which to focus the error message.</description>
+			<name>focusField</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A key to place in the <![CDATA[<code>SessionErrors</code>]]> object to trigger the error message.</description>
+			<name>key</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Explicit message text or a language key name from which to derive text for the message.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rowBreak</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to translate the message into the user's language. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>translateMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<name>error-marker</name>
+		<tag-class>com.liferay.taglib.ui.ErrorMarkerTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>key</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a flag icon that lets users report inappropriate content.</description>
+		<name>flags</name>
+		<tag-class>com.liferay.taglib.ui.FlagsTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The flagged asset's Java class name.</description>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The flagged asset's entry ID.</description>
+			<name>classPK</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The flagged asset's title.</description>
+			<name>contentTitle</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to show message text as a label next to the flag icon or as a tooltip. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Text to display next to the flag icon. The default text is <![CDATA[<code>Flag</code>]]>.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The user ID of the user who flagged the asset.</description>
+			<name>reportedUserId</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>flash</name>
+		<tag-class>com.liferay.taglib.ui.FlashTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>align</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>allowFullScreen</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>allowScriptAccess</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>base</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>bgcolor</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>devicefont</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>flashvars</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>height</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>loop</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>menu</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>movie</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>play</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>quality</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>salign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>scale</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>swliveconnect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>version</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>wmode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a navigable form for multiple section forms. It's default navigation is a side navigation box with links to each section. But the navigation can be configured as a progressive step navigation positioned above the form or as vertically stacked accordion style sections that expand when clicked.</description>
+		<name>form-navigator</name>
+		<tag-class>com.liferay.taglib.ui.FormNavigatorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A URL for the form's cancel button.</description>
+			<name>backURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of each category in the form.</description>
+			<name>categoryNames</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of each section within a category.</description>
+			<name>categorySections</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A type of navigation to be used. Options are <![CDATA[<code>steps</code>]]> and <![CDATA[<code>panel</code>]]>. The default display style is side navigation.</description>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the form.</description>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML to append to the navigator. Examples include alternate form buttons, form instructions, or information about the form.</description>
+			<name>htmlBottom</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>HTML to prepend to the navigator.</description>
+			<name>htmlTop</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A path to the <![CDATA[<code>formSection.jsp</code>]]> file's folder <![CDATA[<code>/path/to/jsp/folder/</code>]]>.</description>
+			<name>jspPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to show the <![CDATA[<code>Submit</code>]]> and <![CDATA[<code>Cancel</code>]]> buttons. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>showButtons</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<name>group-search</name>
+		<tag-class>com.liferay.taglib.ui.GroupSearchTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>groupParams</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletURL</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rowChecker</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a header that displays its text above a horizontal rule accompanied by a configurable back URL button.</description>
+		<name>header</name>
+		<tag-class>com.liferay.taglib.ui.HeaderTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Text to display on mouse over of the back URL. The default value is <![CDATA[<code>Back</code>]]>.</description>
+			<name>backLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL for navigating back to.</description>
+			<name>backURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the header component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to escape the header's XML tags. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>escapeXml</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to translate the header's <![CDATA[<code>title</code>]]> into the localized language. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>localizeTitle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to display the back URL. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>showBackURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A title to display as the header text.</description>
+			<name>title</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a fully configurable icon that provides access to current Liferay theme icons.</description>
+		<name>icon</name>
+		<tag-class>com.liferay.taglib.ui.IconTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A value for the <![CDATA[<code>alt</code>]]> attribute of the embedded <![CDATA[<code>img</code>]]> tag.</description>
+			<name>alt</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A role for assistive technologies to interpret for HTML elements that have been used for something other than their intended purpose. For example, the <![CDATA[<code>&lt;p&gt;</code>]]> tag could be used for something other than a paragraph.</description>
+			<name>ariaRole</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Miscellaneous data to be stored via a map. This data is not shared with the browser. The map holds key value pairs of type <![CDATA[<code>&lt;String, Object&gt;</code>]]>.</description>
+			<name>data</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description>An icon from a Bootstrap icon CSS Class. Note that any image for the <![CDATA[<code>image</code>]]> attribute takes precedence. Icon CSS classes to specify for this attribute can be found at <![CDATA[<a href="http://marcoceppi.github.io/bootstrap-glyphicons/" >http://marcoceppi.github.io/bootstrap-glyphicons/</a>]]>.</description>
+			<name>iconCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An image for the icon, from the current theme. The value can be the filename prefix of any image file in the theme's <![CDATA[<code>common</code>]]> image folder. This image takes precedence over any icon value set via the <![CDATA[<code>iconCssClass</code>]]> attribute.</description>
+			<name>image</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An icon to display on mouse over of the component. The icon image comes from the current theme. The value can be the filename prefix of any image file in the theme's <![CDATA[<code>common</code>]]> image folder.</description>
+			<name>imageHover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to display the <![CDATA[<code>message</code>]]> attribute's value as the icon's label.</description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A language to associate with the icon, to assist search engines and web browsers in finding and rendering the icon appropriately.</description>
+			<name>lang</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the icon's URL.</description>
+			<name>linkCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to translate the icon's <![CDATA[<code>message</code>]]> into the user's language.</description>
+			<name>localizeMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Text to be displayed for the icon on mouse over.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An HTTP request method. Possible values are <![CDATA[<code>get</code>]]> and <![CDATA[<code>post</code>]]>.</description>
+			<name>method</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A function to be called on a user clicking the icon.</description>
+			<name>onClick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The location of an image file to use in the icon.</description>
+			<name>src</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The location of an image file to use on mouse over of the icon. This value takes precedence over the <![CDATA[<code>imageHover</code>]]> attribute. This image takes precedence over icons set with the <![CDATA[<code>imageHover</code>]]> attribute.</description>
+			<name>srcHover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A target window in which to open the URL. The default value is <![CDATA[<code>self</code>]]>. Possible values are <![CDATA[<code>blank</code>]]>, <![CDATA[<code>self</code>]]>, <![CDATA[<code>parent</code>]]>, <![CDATA[<code>top</code>]]>, and a unique frame's name.</description>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to use a tooltip. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>toolTip</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A URL to navigate to when the icon is clicked.</description>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to open the URL in a dialog window. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>useDialog</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates an icon to associate with deactivating an item.</description>
+		<name>icon-deactivate</name>
+		<tag-class>com.liferay.taglib.ui.IconDeactivateTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether to display a message on the icon's label on mouse over of the icon. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A URL navigated to when the icon is clicked.</description>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a configurable icon to associate with deleting or removing an item.</description>
+		<name>icon-delete</name>
+		<tag-class>com.liferay.taglib.ui.IconDeleteTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Text to use in place of the text from the default deletion confirmation message language key <![CDATA[<code>are-you-sure-you-want-to-delete-this</code>]]>. If the <![CDATA[<code>trash</code>]]> attribute is set to <![CDATA[<code>true</code>]]>, no confirmation message is shown.</description>
+			<name>confirmation</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An image for the icon, from the current theme. The value can be the filename prefix of any image file in the theme's <![CDATA[<code>common</code>]]> image folder. The image takes precedence over any default icon images.</description>
+			<name>image</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to display the <![CDATA[<code>message</code>]]> attribute's value as the icon's label. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>label</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Text to display on mouse over of the icon.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An HTTP request method to invoke. Possible values are <![CDATA[<code>get</code>]]> and <![CDATA[<code>post</code>]]>.</description>
+			<name>method</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to use the trash icon instead of the remove icon. The default value is<![CDATA[<code>false</code>]]>.</description>
+			<name>trash</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A URL navigated to when the icon is clicked.</description>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a help icon that displays a custom message as a tooltip on mouse over of the help icon.</description>
+		<name>icon-help</name>
+		<tag-class>com.liferay.taglib.ui.IconHelpTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Text to be displayed on mouse over of the icon.</description>
+			<name>message</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a list of icons from a list of child components.</description>
+		<name>icon-list</name>
+		<tag-class>com.liferay.taglib.ui.IconListTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether to render the icon list when there is only one child component. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>showWhenSingleIcon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates an icon menu from a list of child components.</description>
+		<name>icon-menu</name>
+		<tag-class>com.liferay.taglib.ui.IconMenuTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A position from which to pop up the icon menu dialog in relation to the trigger. The default direction is <![CDATA[<code>left</code>]]>. Possible values are <![CDATA[<code>up</code>]]>, <![CDATA[<code>down</code>]]>, <![CDATA[<code>left</code>]]> or <![CDATA[<code>right</code>]]>.</description>
+			<name>direction</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to disable the icon menu.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to extend the icon menu trigger by wrapping it in a button. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>extended</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The location of an image file to use in the icon.</description>
+			<name>icon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to translate the message to the user's language. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>localizeMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The number of items to show in the icon menu before scrolling. The default value is 15.</description>
+			<name>maxDisplayItems</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>Text to display next to the icon menu trigger. The default value is <![CDATA[<code>actions</code>]]>.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to add the <![CDATA[<code>select</code>]]> CSS class to the icon menu. If set to <![CDATA[<code>true</code>]]>, the selected icon is added to the icon menu's trigger when the icon is selected. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>select</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to extend the icon menu by default. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>showExpanded</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to show an arrow, indicating a popup dialog, next to the icon menu's trigger icon. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>showArrow</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to show the icon menu when there is only one icon. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>showWhenSingleIcon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the trigger for the icon menu. The default value is <![CDATA[<code>btn btn-default</code>]]>.</description>
+			<name>triggerCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the icon menu drop-down caret points to the direction set by the <![CDATA[<code>direction</code>]]> attribute.</description>
+			<name>useIconCaret</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-asset-links</name>
+		<tag-class>com.liferay.taglib.ui.InputAssetLinksTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>assetEntryId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>className</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a configurable input checkbox.</description>
+		<name>input-checkbox</name>
+		<tag-class>com.liferay.taglib.ui.InputCheckBoxTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the checkbox is selected by default.</description>
+			<name>defaultValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether the checkbox is disabled.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A name for the checkbox's form.</description>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A function to be called on a user clicking the checkbox.</description>
+			<name>onClick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name for the component.</description>
+			<name>param</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a date input field that displays a calendar for date selection.</description>
+		<name>input-date</name>
+		<tag-class>com.liferay.taglib.ui.InputDateTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether the date field gets focus by default. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name to refer to the day of the component.</description>
+			<name>dayParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A day value to display in the input field.</description>
+			<name>dayValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>Whether to disable the namespace for the component. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>disableNamespace</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to disable the input field. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A day to set as the first day of the week. The default value is <![CDATA[<code>Calendar.SUNDAY - 2</code>]]>.</description>
+			<name>firstDayOfWeek</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A name for the date input's form.</description>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name to refer to the combined month and year of the component.</description>
+			<name>monthAndYearParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name to refer to the month of the component.</description>
+			<name>monthParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The numerical value for a month to display in the input field. Integer values for the month start with <![CDATA[<code>0</code>]]>.</description>
+			<name>monthValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A name for the date input.</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the component's values can be set to null.</description>
+			<name>nullable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name to refer to the year of the component.</description>
+			<name>yearParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A year value to display in the input field.</description>
+			<name>yearValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates an input field for editing rich text.</description>
+		<name>input-editor</name>
+		<tag-class>com.liferay.taglib.ui.InputEditorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A map of configuration parameters. The map holds key value pairs of type <![CDATA[<code>&lt;String, String&gt;</code>]]>.</description>
+			<name>configParams</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<description>The ID of a language for the input editor's text.</description>
+			<name>contentsLanguageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>editorImpl</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>inlineEdit</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>inlineEditSaveURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A map of configuration parameters. The map holds key value pairs of <![CDATA[<code>&lt;String, String&gt;</code>]]>.</description>
+			<name>fileBrowserParams</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Map</type>
+		</attribute>
+		<attribute>
+			<name>height</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>initMethod</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the input editor. The default value is <![CDATA[<code>editor</code>]]>.</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A function to be called when the input editor loses focus.</description>
+			<name>onBlurMethod</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A function to be called on a change in the input editor.</description>
+			<name>onChangeMethod</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A function to be called when the input editor gets focus.</description>
+			<name>onFocusMethod</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the field for the input editor is resizable. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>resizable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to skip loading resources necessary for the CKEditor. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>skipEditorLoading</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A toolbar for the input editor. The default value is <![CDATA[<code>liferay</code>]]>. Possible values are <![CDATA[<code>bbcode</code>]]>, <![CDATA[<code>creole</code>]]>, <![CDATA[<code>editInPlace</code>]]>, <![CDATA[<code>email</code>]]>, <![CDATA[<code>liferay</code>]]>, <![CDATA[<code>liferayArticle</code>]]>, <![CDATA[<code>phone</code>]]>, <![CDATA[<code>simple</code>]]>, and <![CDATA[<code>tablet</code>]]>.</description>
+			<name>toolbarSet</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-field</name>
+		<tag-class>com.liferay.taglib.ui.InputFieldTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>autoComplete</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>autoSize</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>bean</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>dateTogglerCheckboxLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>defaultLanguageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>defaultValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>field</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>fieldParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>format</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ignoreRequestValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>languageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>model</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>placeholder</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-localized</name>
+		<tag-class>com.liferay.taglib.ui.InputLocalizedTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>autoSize</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>availableLocales</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>defaultLanguageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayWidth</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ignoreRequestValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>languageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>maxLength</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>xml</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<dynamic-attributes>true</dynamic-attributes>
+	</tag>
+	<tag>
+		<description>Creates an input move boxes component comprised of two columns of key value pairs that can be rearranged.</description>
+		<name>input-move-boxes</name>
+		<tag-class>com.liferay.taglib.ui.InputMoveBoxesTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the left box.</description>
+			<name>leftBoxName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A list of key value pairs for the left box.</description>
+			<name>leftList</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.List</type>
+		</attribute>
+		<attribute>
+			<description>A function to be called on a change in selection in the left list.</description>
+			<name>leftOnChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the left list can be reordered. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>leftReorder</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A title to display at the top of the right box.</description>
+			<name>leftTitle</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the right box.</description>
+			<name>rightBoxName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A list of key value pairs for the right box.</description>
+			<name>rightList</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.List</type>
+		</attribute>
+		<attribute>
+			<description>A function to be called on a change in selection in the right list.</description>
+			<name>rightOnChange</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the right list can be reordered. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>rightReorder</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A title to display at the top of the right box.</description>
+			<name>rightTitle</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-permissions</name>
+		<tag-class>com.liferay.taglib.ui.InputPermissionsTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>modelName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-permissions-params</name>
+		<tag-class>com.liferay.taglib.ui.InputPermissionsParamsTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>modelName</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-repeat</name>
+		<tag-class>com.liferay.taglib.ui.InputRepeatTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>event</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-resource</name>
+		<tag-class>com.liferay.taglib.ui.InputResourceTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>input-scheduler</name>
+		<tag-class>com.liferay.taglib.ui.InputSchedulerTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<description>Creates a configurable search box.</description>
+		<name>input-search</name>
+		<tag-class>com.liferay.taglib.ui.InputSearchTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether the search field gets focus by default. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A text value for the search button's label. The default value is <![CDATA[<code>Search</code>]]>.</description>
+			<name>buttonLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance. The default value is <![CDATA[<code>displayTerms.KEYWORDS</code>]]>.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the search box. The default value is <![CDATA[<code>displayTerms.KEYWORDS</code>]]>.</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Placeholder text for the search field. The default value is the value of the <![CDATA[<code>buttonLabel</code>]]> attribute.</description>
+			<name>placeholder</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to show the search button. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>showButton</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A title for the search box.</description>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to use a namespace with the search button. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>useNamespace</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a select input component with yes or no options.</description>
+		<name>input-select</name>
+		<tag-class>com.liferay.taglib.ui.InputSelectTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to select <![CDATA[<code>yes</code>]]> as the input's default value.</description>
+			<name>defaultValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to disable input.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A name for the input select's form.</description>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name for the component.</description>
+			<name>param</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a configurable text area input field.</description>
+		<name>input-textarea</name>
+		<tag-class>com.liferay.taglib.ui.InputTextAreaTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Text to display in the text area.</description>
+			<name>defaultValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to disable input. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A variable name for the component.</description>
+			<name>param</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a time input field that provides a scrollable dropdown list of hours, in intervals designated by the <![CDATA[<code>minuteInterval</code>]]> attribute.</description>
+		<name>input-time</name>
+		<tag-class>com.liferay.taglib.ui.InputTimeTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The name of the AM/PM parameter for the time input. An acceptable value is <![CDATA[<code>ampm</code>]]>.</description>
+			<name>amPmParam</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A time to AM or PM. Acceptable values are <![CDATA[<code>0</code>]]> for AM and <![CDATA[<code>1</code>]]> for PM. The default value is <![CDATA[<code>0</code>]]>.</description>
+			<name>amPmValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the time input.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A date parameter for the time input. An acceptable value is <![CDATA[<code>date</code>]]>.</description>
+			<name>dateParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A date to associate with the time displayed.</description>
+			<name>dateValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>java.util.Date</type>
+		</attribute>
+		<attribute>
+			<description>Whether the input field is disabled.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The name of the hour parameter for the component. An acceptable value is <![CDATA[<code>hour</code>]]>.</description>
+			<name>hourParam</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An hour value for the time displayed. The default value is <![CDATA[<code>12</code>]]>.</description>
+			<name>hourValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A minute interval displayed in the input. The default value is <![CDATA[<code>30</code>]]>.</description>
+			<name>minuteInterval</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>The name of the minute parameter for the component. An acceptable value is <![CDATA[<code>minute</code>]]>.</description>
+			<name>minuteParam</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A minute value for the time displayed. The default value is <![CDATA[<code>00</code>]]>.</description>
+			<name>minuteValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A name for the time input.</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a configurable timezone drop-down menu.</description>
+		<name>input-time-zone</name>
+		<tag-class>com.liferay.taglib.ui.InputTimeZoneTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether the field gets focus by default.</description>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to consider daylight savings for the times. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>daylight</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether the field is disabled.</description>
+			<name>disabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A style number corresponding to the time zone. A value of <![CDATA[<code>0</code>]]> displays the time zone's abbreviated name and a value of <![CDATA[<code>1</code>]]> displays its full name, e.g. "Pacific Standard Time." The default value is <![CDATA[<code>0</code>]]>.</description>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A name for the component.</description>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the times can be null.</description>
+			<name>nullable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>The ID of a time zone to associate with the component. For example, setting the value to <![CDATA[<code>PST</code>]]> associates the component with the Pacific Standard Time zone.</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>journal-article</name>
+		<tag-class>com.liferay.taglib.ui.JournalArticleTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>articleId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>articlePage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>articleResourcePrimKey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>groupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>languageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showAvailableLocales</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showTitle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>templateId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>xmlRequest</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>journal-content-search</name>
+		<tag-class>com.liferay.taglib.ui.JournalContentSearchTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>showListed</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>targetPortletId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>language</name>
+		<tag-class>com.liferay.taglib.ui.LanguageTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>displayCurrentLocale</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>formAction</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>languageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>languageIds</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>logo-selector</name>
+		<tag-class>com.liferay.taglib.ui.LogoSelectorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>currentLogoURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>defaultLogoURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>editLogoURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>imageId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>logoDisplaySelector</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showBackground</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>membership-policy-error</name>
+		<tag-class>com.liferay.taglib.ui.MembershipPolicyErrorTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<description>Creates a message to display to the user.</description>
+		<name>message</name>
+		<tag-class>com.liferay.taglib.ui.MessageTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Arguments for the language key, if the language key is configured to recieve arguments.</description>
+			<name>arguments</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The name of a language key from which to derive the message to be displayed.</description>
+			<name>key</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to translate the language key value into the user's language. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>localizeKey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Whether to translate the arguments into the user's language. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>translateArguments</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<name>unicode</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<name>my-sites</name>
+		<tag-class>com.liferay.taglib.ui.MySitesTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>classNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>includeControlPanel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>max</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>navigation</name>
+		<tag-class>com.liferay.taglib.ui.NavigationTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>bulletStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>headerType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>includedLayouts</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>nestedChildren</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>preview</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rootLayoutLevel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rootLayoutType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a page iterator for paginating through lists of items.</description>
+		<name>page-iterator</name>
+		<tag-class>com.liferay.taglib.ui.PageIteratorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Which page of items to display (e.g., first, second, third, etc.).</description>
+			<name>cur</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A variable name to refer to the <![CDATA[<code>cur</code>]]> value of the component.</description>
+			<name>curParam</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The number of items to display per page.</description>
+			<name>delta</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>Whether the user can choose the number of items displayed per page. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>deltaConfigurable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A variable name to refer to the delta value of the component.</description>
+			<name>deltaParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the form.</description>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>JavaScript to be called when the <![CDATA[<code>first</code>]]>, <![CDATA[<code>previous</code>]]>, <![CDATA[<code>next</code>]]>, or <![CDATA[<code>last</code>]]> links are clicked if the URL property is not set.</description>
+			<name>jsCall</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A maximum number of pages to iterate through.</description>
+			<name>maxPages</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A target for the <![CDATA[<code>first</code>]]>, <![CDATA[<code>previous</code>]]>, <![CDATA[<code>next</code>]]>, and <![CDATA[<code>last</code>]]> link buttons.</description>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The total number of items in the iterator.</description>
+			<name>total</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A type of iterator to display. Options are <![CDATA[<code>approximate</code>]]>, <![CDATA[<code>article</code>]]>, <![CDATA[<code>more</code>]]>, and <![CDATA[<code>regular</code>]]>.</description>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A base URL for the iterator. Parameters are added to and removed from this URL as the user navigates through pages.</description>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a collapsible panel for housing content.</description>
+		<name>panel</name>
+		<tag-class>com.liferay.taglib.ui.PanelTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether the panel can be collapsed. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>collapsible</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A default state for the component. Possible values are <![CDATA[<code>open</code>]]> and any string other than open. Any string other than <![CDATA[<code>open</code>]]> collapses the panel. The default value is <![CDATA[<code>open</code>]]>.</description>
+			<name>defaultState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the panel is extended. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>extended</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Text to display as a help tool tip on mouse over of the panel's help icon.</description>
+			<name>helpMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An icon to display next to the panel's title. The icon can be specified using the name of one of the Bootstrap icon CSS classes found at <![CDATA[<a href="http://marcoceppi.github.io/bootstrap-glyphicons/" >http://marcoceppi.github.io/bootstrap-glyphicons/</a>]]>.</description>
+			<name>iconCssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The ID of the component that contains the panel. If a <![CDATA[<code>liferay-ui:panel-container</code>]]> is used as the container for the panel, its ID is used as the value for the <![CDATA[<code>parentID</code>]]>.</description>
+			<name>parentId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to remember the component's state and persist it to the database. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>persistState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A state for the component. Possible values are <![CDATA[<code>open</code>]]> and any string other than open. Any string other than <![CDATA[<code>open</code>]]> collapses the panel.</description>
+			<name>state</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A title to display at the top of the panel.</description>
+			<name>title</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a collapsible container to house <![CDATA[<code>liferay-ui:panel</code>]]> components.</description>
+		<name>panel-container</name>
+		<tag-class>com.liferay.taglib.ui.PanelContainerTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether only one panel can be shown at a time. As one panel is opened, the others close, creating an accordian effect. The default value is <![CDATA[<code>false<code>]]>.</description>
+			<name>accordion</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the component.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to extend the interface with additional styling. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>extended</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to remember the component's state and persist it to the database. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>persistState</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<name>param</name>
+		<tag-class>com.liferay.taglib.util.ParamTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Renders a PNG image with the source given for the <![CDATA[<code>image</code>]]> attribute.</description>
+		<name>png-image</name>
+		<tag-class>com.liferay.taglib.ui.PngImageTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>The height of the image in pixels. A possible value would be <![CDATA[<code>16</code>]]>. <![CDATA[<code>px</code>]]> is then appended to the end of the value.</description>
+			<name>height</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>The location of a PNG image file to use.</description>
+			<name>image</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The height of the image in pixels. A possible value would be <![CDATA[<code>16</code>]]>. <![CDATA[<code>px</code>]]> is then appended to the end of the value.</description>
+			<name>width</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+	</tag>
+	<tag>
+		<name>progress</name>
+		<tag-class>com.liferay.taglib.ui.ProgressTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>height</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>sessionKey</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>updatePeriod</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>ratings</name>
+		<tag-class>com.liferay.taglib.ui.RatingsTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>numberOfStars</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ratingsEntry</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>ratingsStats</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>ratings-score</name>
+		<tag-class>com.liferay.taglib.ui.RatingsScoreTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>score</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>restore-entry</name>
+		<tag-class>com.liferay.taglib.ui.RestoreEntryTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>duplicateEntryAction</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>overrideMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>renameMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>restoreEntryAction</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a clickable link and/or icon to an RSS feed document.</description>
+		<name>rss</name>
+		<tag-class>com.liferay.taglib.ui.RSSTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A default maximum number of items to display. The default value is <![CDATA[<code>20</code>]]>.</description>
+			<name>delta</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A default style to display.</description>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A default format for the RSS feed. Options are <![CDATA[<code>atom_1.0</code>]]>, <![CDATA[<code>rss_1.0</code>]]>, and <![CDATA[<code>rss_2.0</code>]]>.</description>
+			<name>feedType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A message to display next to the RSS icon.</description>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the RSS feed.</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL from which to retrieve feed information.</description>
+			<name>resourceURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The URL for an RSS feed file.</description>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a configuration component for users to define RSS settings, such as how many articles to display.</description>
+		<name>rss-settings</name>
+		<tag-class>com.liferay.taglib.ui.RSSSettingsTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A default maximum number of items to display. The default value is <![CDATA[<code>20</code>]]>.</description>
+			<name>delta</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A default style to display.</description>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Available RSS display styles from which the user can choose. Options are <![CDATA[<code>abstract</code>]]>, <![CDATA[<code>full-content</code>]]>, and <![CDATA[<code>title</code>]]>.</description>
+			<name>displayStyles</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether users are able to subscribe. Default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>enabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A default format for the RSS feed. Options are <![CDATA[<code>atom_1.0</code>]]>, <![CDATA[<code>rss_1.0</code>]]>, and <![CDATA[<code>rss_2.0</code>]]>.</description>
+			<name>feedType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the component.</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the RSS feed has a name. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>nameEnabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a search form, with an additional select input to set the scope of the search.</description>
+		<name>search</name>
+		<tag-class>com.liferay.taglib.ui.SearchTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<description>Creates a grid for displaying a list of objects and their properties.</description>
+		<name>search-container</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.SearchContainerTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A variable for the search container's pagination. Different pagination variables ensure independent pagination when multiple search containers are on a JSP.</description>
+			<name>curParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The number of items to show on each search container page.</description>
+			<name>delta</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>The <![CDATA[<code>delta</code>]]> attribute as configurable by users.</description>
+			<name>deltaConfigurable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>deltaParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayTerms</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A message displayed when the search container is empty.</description>
+			<name>emptyResultsMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>headerNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>hover</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>iteratorURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>orderByCol</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>orderByColParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>orderByComparator</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An order type for the columns, either ascending or descending. Values are <![CDATA[<code>asc</code>]]> or <![CDATA[<code>desc</code>]]>.</description>
+			<name>orderByType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>orderByTypeParam</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Inserts a checkbox column in the search container. Value must be a <![CDATA[<code>RowChecker</code>]]> object.</description>
+			<name>rowChecker</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>searchContainer</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>searchTerms</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The total number of objects in the search container.</description>
+			<name>total</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A variable name for the results of the <![CDATA[<code>total</code>]]> attribute. The default is <![CDATA[<code>total</code>]]>.</description>
+			<name>totalVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name for the <![CDATA[<code>SearchContainer</code>]]> object. The default is <![CDATA[<code>searchContainer</code>]]>.</description>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>search-container-column-button</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerColumnButtonTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>align</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>colspan</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>href</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>valign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a date column in a search container.</description>
+		<name>search-container-column-date</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerColumnDateTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A horizontal alignment for the column contents. The default is <![CDATA[<code>left</code>]]>.</description>
+			<name>align</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The number of columns to span. The default is <![CDATA[<code>1</code>]]>.</description>
+			<name>colspan</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the column.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL for the items in the column.</description>
+			<name>href</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the column.</description>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to set the column as sortable. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>orderable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>An object's property by which to sort the column.</description>
+			<name>orderableProperty</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A property to request from the row object.</description>
+			<name>property</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A vertical alignment for the column contents. The default is <![CDATA[<code>middle</code>]]>.</description>
+			<name>valign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A value for the column.</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a column in a search container with the contents of a JSP file.</description>
+		<name>search-container-column-jsp</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerColumnJSPTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A horizontal alignment for the column contents. The default is <![CDATA[<code>left</code>]]>.</description>
+			<name>align</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The number of columns to span. The default is <![CDATA[<code>1</code>]]>.</description>
+			<name>colspan</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the column.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The JSP file's location.</description>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>valign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a column in a search container for the workflow status.</description>
+		<name>search-container-column-status</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerColumnStatusTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A horizontal alignment for the column contents. The default is <![CDATA[<code>left</code>]]>.</description>
+			<name>align</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The number of columns to span. The default is <![CDATA[<code>1</code>]]>.</description>
+			<name>colspan</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the column.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL for the column's contents.</description>
+			<name>href</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to set the column as sortable. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>orderable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>An object's property by which to sort the column.</description>
+			<name>orderableProperty</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An object's property to use for the column.</description>
+			<name>property</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A vertical alignment for the column contents. The default is <![CDATA[<code>middle</code>]]>.</description>
+			<name>valign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A workflow status for the item.</description>
+			<name>status</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>statusByUserId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>statusDate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a text column in a search container.</description>
+		<name>search-container-column-text</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerColumnTextTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.SearchContainerColumnTextTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A horizontal alignment for the column contents.</description>
+			<name>align</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A string buffer variable for constructing a URL in a scriptlet.</description>
+			<name>buffer</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The number of columns to span. The default is <![CDATA[<code>1</code>]]>.</description>
+			<name>colspan</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+		<attribute>
+			<description>A CSS class for styling the column.</description>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>href</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to set the column as sortable. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>orderable</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>An object's property by which to sort the column.</description>
+			<name>orderableProperty</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>property</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>title</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to automatically translate values. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>translate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A vertical alignment for the column contents. The default is <![CDATA[<code>middle</code>]]>.</description>
+			<name>valign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>The list of objects to display in the search container.</description>
+		<name>search-container-results</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerResultsTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.SearchContainerResultsTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A list of objects to display in the search container.</description>
+			<name>results</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable to use for the results.</description>
+			<name>resultsVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Deprecated as of 6.2.0, replaced by liferay-ui:search-container#total</description>
+			<name>total</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Deprecated as of 6.2.0, replaced by liferay-ui:search-container#totalVar</description>
+			<name>totalVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates rows in the search container for each object returned by <![CDATA[<code>liferay-ui:search-container-results</code>]]>.</description>
+		<name>search-container-row</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerRowTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.SearchContainerRowTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>bold</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The class name of the objects to display in rows.</description>
+			<name>className</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The returned model instances as HTML escaped.</description>
+			<name>escapedModel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name to use for the rows' index.</description>
+			<name>indexVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A property to use as the primary key for the object type in the <![CDATA[<code>className</code>]]> attribute.</description>
+			<name>keyProperty</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name to use for each object as the search container iterates through the objects returned by <![CDATA[<code>liferay-ui:search-container-results</code>]]>.</description>
+			<name>modelVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A model property to use as the row ID.</description>
+			<name>rowIdProperty</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable name to use for the rows.</description>
+			<name>rowVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>servletContext</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>stringKey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates parameters for rows in the search container. The <![CDATA[<code>liferay-ui:search-container-row</code>]]> tag is required.</description>
+		<name>search-container-row-parameter</name>
+		<tag-class>com.liferay.taglib.ui.SearchContainerRowParameterTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>A name for the row parameter.</description>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A value for the row parameter.</description>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>search-form</name>
+		<tag-class>com.liferay.taglib.ui.SearchFormTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>page</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>searchContainer</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>servletContext</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showAddButton</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a search results page iterator with an optional paginator.</description>
+		<name>search-iterator</name>
+		<tag-class>com.liferay.taglib.ui.SearchIteratorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether to add a <![CDATA[<code>liferay-ui:search-paginator</code>]]> to the search container. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>paginate</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>All configurable properties of the search container, such as <![CDATA[<code>cur</code>]]> and <![CDATA[<code>curParam</code>]]>. These properties are set with <![CDATA[<code>searchContainer.getCur()</code>]]> and <![CDATA[<code>searchContainer.getCurParam()</code>]]> respectively.</description>
+			<name>searchContainer</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A type of iterator to display. Options are <![CDATA[<code>approximate</code>]]>, <![CDATA[<code>article</code>]]>, <![CDATA[<code>more</code>]]>, and <![CDATA[<code>regular</code>]]>.</description>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a page iterator to paginate through search results</description>
+		<name>search-paginator</name>
+		<tag-class>com.liferay.taglib.ui.SearchPaginatorTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>An ID for the component instance.</description>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>All configurable porperties of the search container, such as <![CDATA[<code>cur</code>]]> and <![CDATA[<code>curParam</code>]]>. These properties are set with <![CDATA[<code>searchContainer.getCur()</code>]]> and <![CDATA[<code>searchContainer.getCurParam()</code>]]> respectively.</description>
+			<name>searchContainer</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A type of iterator to display. Options are <![CDATA[<code>approximate</code>]]>, <![CDATA[<code>article</code>]]>, <![CDATA[<code>more</code>]]>, and <![CDATA[<code>regular</code>]]>.</description>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>search-speed</name>
+		<tag-class>com.liferay.taglib.ui.SearchSpeedTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>hits</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>searchContainer</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a search instance that can be toggled between basic and advanced search.</description>
+		<name>search-toggle</name>
+		<tag-class>com.liferay.taglib.ui.SearchToggleTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether the search input field is automatically focused. The default value is <![CDATA[<code>false</code>]]>.</description>
+			<name>autoFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>A label for the search button such as <![CDATA[<code>Search</code>]]> or <![CDATA[<code>Go</code>]]>.</description>
+			<name>buttonLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Terms to be used and displayed through the search instance. Term examples include <![CDATA[<code>keywords</code>]]>, <![CDATA[<code>advancedSearch</code>]]>, and <![CDATA[<code>description</code>]]>.</description>
+			<name>displayTerms</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The component instance's ID.</description>
+			<name>id</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>section</name>
+		<tag-class>com.liferay.taglib.ui.SectionTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.SectionTei</tei-class>
+		<body-content>JSP</body-content>
+	</tag>
+	<tag>
+		<name>sites-directory</name>
+		<tag-class>com.liferay.taglib.ui.SitesDirectoryTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>sites</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>social-activities</name>
+		<tag-class>com.liferay.taglib.ui.SocialActivitiesTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>activities</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>className</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>classPK</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayRSSFeed</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>feedDelta</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>feedDisplayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>feedEnabled</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>feedLink</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>feedLinkMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>feedTitle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>feedType</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>social-bookmark</name>
+		<tag-class>com.liferay.taglib.ui.SocialBookmarkTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>contentId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>title</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>type</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>social-bookmarks</name>
+		<tag-class>com.liferay.taglib.ui.SocialBookmarksTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>contentId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>target</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>title</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>types</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>staging</name>
+		<tag-class>com.liferay.taglib.ui.StagingTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>cssClass</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>extended</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>groupId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>icon</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>layoutSetBranchId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>onlyActions</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>privateLayout</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>selPlid</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showManageBranches</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a success message to display to the user.</description>
+		<name>success</name>
+		<tag-class>com.liferay.taglib.ui.SuccessTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>A key to be placed in the <![CDATA[<code>SessionMessages</code>]]> object to trigger the success message.</description>
+			<name>key</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Explicit message text or the name of a language key from which to derive the message text.</description>
+			<name>message</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether to translate the success message into the user's language. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>translateMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<name>table-iterator</name>
+		<tag-class>com.liferay.taglib.ui.TableIteratorTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.TableIteratorTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>bodyPage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>list</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>listType</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rowBreak</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rowLength</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rowPadding</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rowValign</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a tabbed UI of section dividers that each house their own content.</description>
+		<name>tabs</name>
+		<tag-class>com.liferay.taglib.ui.TabsTag</tag-class>
+		<body-content>JSP</body-content>
+		<!--
+		values is a reserved property, so we have to use tabsValues instead
+		-->
+		<attribute>
+			<description>A label for the back URL.</description>
+			<name>backLabel</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL for navigating back to.</description>
+			<name>backURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A name for the tab's form.</description>
+			<name>formName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The names of the tabs. Each name must be separated by a comma with no spaces.</description>
+			<name>names</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A function to be called on a user clicking any of the tabs.</description>
+			<name>onClick</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A variable for the component.</description>
+			<name>param</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to refer to the portlet that contains the component.</description>
+			<name>portletURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Whether the page refreshes when a tab is clicked.</description>
+			<name>refresh</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>Tab values that must follow the same order as the <![CDATA[<code>names</code>]]> attribute. Each value must be separated by a comma with no spaces.</description>
+			<name>tabsValues</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A design type for the tabs. Possible values are <![CDATA[<code>tabs</code>]]> and <![CDATA[<code>pills</code>]]>.</description>
+			<name>type</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which all the tabs are linked when clicked. You can also set each tab's URL individually using <![CDATA[<code>url[number]</code>]]> attribute.</description>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url0</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the second tab is linked when clicked.</description>
+			<name>url1</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the third tab is linked when clicked</description>
+			<name>url2</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the fourth tab is linked when clicked</description>
+			<name>url3</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the fifth tab is linked when clicked</description>
+			<name>url4</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the sixth tab is linked when clicked</description>
+			<name>url5</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the seventh tab is linked when clicked</description>
+			<name>url6</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the eighth tab is linked when clicked</description>
+			<name>url7</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the ninth tab is linked when clicked</description>
+			<name>url8</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL to which the tenth tab is linked when clicked</description>
+			<name>url9</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An active tab from the value given in the attribute <![CDATA[<code>tabsValues</code>]]>. No matter which tab a user selects, the tab given for this value always remains active.</description>
+			<name>value</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a component that toggles the visibility of the content of the component matching the given <![CDATA[<code>id</code>]]>. Default icons are used as the component's default mechanism for showing and hiding the content.</description>
+		<name>toggle</name>
+		<tag-class>com.liferay.taglib.ui.ToggleTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<description>Whether to initially show content by default. The default value is <![CDATA[<code>true</code>]]>.</description>
+			<name>defaultShowContent</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>boolean</type>
+		</attribute>
+		<attribute>
+			<description>An icon to use as the mechanism for hiding the content. You can specify the location of an image file to use in the icon; otherwise a default icon is used.</description>
+			<name>hideImage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Text to display as a link for hiding the content. It overrides the <![CDATA[<code>hideImage</code>]]> attribute. Note that the <![CDATA[<code>showMessage</code>]]> attribute must also be configured in order for the hide message to render.</description>
+			<name>hideMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The ID of a component instance whose content's visibility to toggle.</description>
+			<name>id</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>An icon to use as the mechanism for showing the content. You can specify the location of an image file to use in the icon; otherwise a default icon is used.</description>
+			<name>showImage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A link to use as the mechanism for showing the content. The text value of this attribute is used as the link's text. The message takes precedence over showing an image, via the <![CDATA[<code>showImage</code>]]> attribute. If you specify a <![CDATA[<code>showMessage</code>]]> attribute, you should also specify the <![CDATA[<code>hideMessage</code>]]> attribute; a <![CDATA[<code>null</code>]]> is otherwise displayed for the text of the hide link.</description>
+			<name>showMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>Text to be prefixed to the <![CDATA[<code>Toggle()</code>]]> function that is called to toggle visibility of the content. If this is not configured, a random key is generated and prefixed to the <![CDATA[<code>Toggle()</code>]]> function. For example, a value of <![CDATA[<code>run</code>]]> would result in a function named <![CDATA[<code>runToggle()</code>]]>.</description>
+			<name>stateVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>toggle-area</name>
+		<tag-class>com.liferay.taglib.ui.ToggleAreaTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>align</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>defaultShowContent</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>hideImage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>hideMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showImage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>showMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>stateVar</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>toggle-value</name>
+		<tag-class>com.liferay.taglib.ui.ToggleValueTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>defaultValue</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a component for users to permanently delete items such as images, articles, etc. from the recycle bin.</description>
+		<name>trash-empty</name>
+		<tag-class>com.liferay.taglib.ui.TrashEmptyTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>A message to display to confirm that the user wants to remove the item(s) from the recycle bin.</description>
+			<name>confirmMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A message to be used for the <![CDATA[<code>empty-trash</code>]]> button and link.</description>
+			<name>emptyMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A message to display to give users information about removing items from the recycle bin.</description>
+			<name>infoMessage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A URL for the <![CDATA[<code>empty-trash</code>]]> button/link.</description>
+			<name>portletURL</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>The number of items to be removed from the recycle bin.</description>
+			<name>totalEntries</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+			<type>int</type>
+		</attribute>
+	</tag>
+	<tag>
+		<description>Creates a message confirming items were moved to the recycle bin and presenting an option to restore them.</description>
+		<name>trash-undo</name>
+		<tag-class>com.liferay.taglib.ui.TrashUndoTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<description>The URL of the undo link.</description>
+			<name>portletURL</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<description>A redirect URL.</description>
+			<name>redirect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>upload-progress</name>
+		<tag-class>com.liferay.taglib.ui.UploadProgressTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>height</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>id</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>redirect</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>updatePeriod</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>user-display</name>
+		<tag-class>com.liferay.taglib.ui.UserDisplayTag</tag-class>
+		<tei-class>com.liferay.taglib.ui.UserDisplayTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>displayStyle</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>userId</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>userName</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>user-search</name>
+		<tag-class>com.liferay.taglib.ui.UserSearchTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>portletURL</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>rowChecker</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>userParams</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>webdav</name>
+		<tag-class>com.liferay.taglib.ui.WebDAVTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>write</name>
+		<tag-class>com.liferay.taglib.ui.WriteTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>bean</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>property</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+</taglib>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-util.tld b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-util.tld
new file mode 100644
index 0000000..72a4caf
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/tld/liferay-util.tld
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+	<tlib-version>1.2</tlib-version>
+	<jsp-version>1.1</jsp-version>
+	<short-name>liferay-util</short-name>
+	<uri>http://liferay.com/tld/util</uri>
+	<tag>
+		<name>body-bottom</name>
+		<tag-class>com.liferay.taglib.util.BodyBottomTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>outputKey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>body-top</name>
+		<tag-class>com.liferay.taglib.util.BodyTopTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>outputKey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>buffer</name>
+		<tag-class>com.liferay.taglib.util.BufferTag</tag-class>
+		<tei-class>com.liferay.taglib.util.BufferTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>var</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>get-url</name>
+		<tag-class>com.liferay.taglib.util.GetUrlTag</tag-class>
+		<tei-class>com.liferay.taglib.util.GetUrlTei</tei-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>expires</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>url</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>html-bottom</name>
+		<tag-class>com.liferay.taglib.util.HtmlBottomTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>outputKey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>position</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>html-top</name>
+		<tag-class>com.liferay.taglib.util.HtmlTopTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>outputKey</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>position</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>include</name>
+		<tag-class>com.liferay.taglib.util.IncludeTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>page</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>portletId</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>servletContext</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>strict</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>useCustomPage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>param</name>
+		<tag-class>com.liferay.taglib.util.ParamTag</tag-class>
+		<body-content>JSP</body-content>
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	<tag>
+		<name>whitespace-remover</name>
+		<tag-class>com.liferay.taglib.util.WhitespaceRemoverTag</tag-class>
+		<body-content>JSP</body-content>
+	</tag>
+</taglib>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/WEB-INF/web.xml b/portlets/sicilia-login-portlet/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..1aa8cdb
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/WEB-INF/web.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+</web-app>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/docroot/html/configurazione/view.jsp b/portlets/sicilia-login-portlet/docroot/html/configurazione/view.jsp
new file mode 100644
index 0000000..9273604
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/html/configurazione/view.jsp
@@ -0,0 +1,21 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@page import="it.mwg.sicilia.login.service.ConfigurazioneLocalServiceUtil"%>
+<%@include file="/html/init.jsp"%>
+<%
+long companyId = company.getCompanyId();
+%>
+<liferay-ui:error key="username-without-password" message="username-without-password" />
+<liferay-portlet:actionURL name="salvaImpostazioni" var="salvaImpostazioniURL" />
+<h2>Configurazione</h2>
+<aui:form method="post" action="<%= salvaImpostazioniURL %>" inlineLabels="false" name="edit" id="edit">
+	<aui:row>
+		<aui:input type="text" cssClass="span12" name="<%= ConfigurazioneLocalServiceUtil.getApiServerKey() %>"
+				value="<%= ConfigurazioneLocalServiceUtil.getApiServer(companyId) %>" />
+	</aui:row>
+	<aui:row>
+		<aui:input type="text" cssClass="span6" name="<%= ConfigurazioneLocalServiceUtil.getApiUsernameKey() %>"
+				value="<%= ConfigurazioneLocalServiceUtil.getApiUsername(companyId) %>" />
+		<aui:input type="password" cssClass="span6" name="<%= ConfigurazioneLocalServiceUtil.getApiPasswordKey() %>" />
+	</aui:row>
+	<aui:button type="submit" value="save" />
+</aui:form>
diff --git a/portlets/sicilia-login-portlet/docroot/html/init.jsp b/portlets/sicilia-login-portlet/docroot/html/init.jsp
new file mode 100644
index 0000000..e4e7fe3
--- /dev/null
+++ b/portlets/sicilia-login-portlet/docroot/html/init.jsp
@@ -0,0 +1,17 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
+<%@taglib uri="http://liferay.com/tld/aui" prefix="aui"%>
+<%@taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet"%>
+<%@taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%>
+<%@taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui"%>
+<%@taglib uri="http://liferay.com/tld/util" prefix="liferay-util"%>
+<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%>
+<%@page import="com.liferay.portlet.PortletURLUtil"%>
+<%@page import="javax.portlet.PortletURL"%>
+<liferay-theme:defineObjects />
+<portlet:defineObjects />
+<%
+PortletURL portletURL = PortletURLUtil.getCurrent(liferayPortletRequest, liferayPortletResponse);
+PortletURL iteratorURL = liferayPortletResponse.createRenderURL();
+%>
diff --git a/portlets/sicilia-login-portlet/docroot/icon.png b/portlets/sicilia-login-portlet/docroot/icon.png
new file mode 100644
index 0000000..807b862
Binary files /dev/null and b/portlets/sicilia-login-portlet/docroot/icon.png differ
diff --git a/portlets/sicilia-login-portlet/ivy.xml b/portlets/sicilia-login-portlet/ivy.xml
new file mode 100644
index 0000000..d310b15
--- /dev/null
+++ b/portlets/sicilia-login-portlet/ivy.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="sicilia-login-portlet" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="../../ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0" />
+		
+		<dependency name="commons-codec" org="commons-codec" rev="1.10"/>
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/portlets/sicilia-login-portlet/ivy.xml.MD5 b/portlets/sicilia-login-portlet/ivy.xml.MD5
new file mode 100644
index 0000000..5b95aae
--- /dev/null
+++ b/portlets/sicilia-login-portlet/ivy.xml.MD5
@@ -0,0 +1 @@
+b889523c7b480c442409fa84bf08140c
diff --git a/portlets/sicilia-login-portlet/test/integration/arquillian.xml b/portlets/sicilia-login-portlet/test/integration/arquillian.xml
new file mode 100644
index 0000000..9413609
--- /dev/null
+++ b/portlets/sicilia-login-portlet/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">8099</property>
+			<property name="pass">tomcat</property>
+			<property name="user">tomcat</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/shared/.ant-targets-build.xml b/shared/.ant-targets-build.xml
new file mode 100644
index 0000000..b7a31d2
--- /dev/null
+++ b/shared/.ant-targets-build.xml
@@ -0,0 +1,50 @@
+build-common.setup-eclipse
+build-css
+build-db
+build-service
+build-upgrade-table
+build-wsdl
+build-xsd
+clean
+compile
+compile-jsp
+compile-test
+create
+deploy
+direct-deploy
+direct-deploy-ext-cmd
+direct-deploy-hook-cmd
+direct-deploy-layouttpl-cmd
+direct-deploy-portlet-cmd
+direct-deploy-theme-cmd
+direct-deploy-web-cmd
+format-javadoc
+format-source
+inspect-plugins
+install
+jar
+jar-javadoc
+jar-source
+javadoc
+prepare-upgrade-table
+print-current-time
+print-stale-snapshot
+publish
+publish-local-m2-release
+publish-local-m2-snapshot
+publish-remote-m2-release
+publish-remote-m2-snapshot
+release
+run-cpd
+run-pmd
+setup-arquillian
+setup-eclipse
+setup-jrebel
+sort-xml-attributes
+test
+test-class-group
+test-integration
+test-package
+test-unit
+war
+watch
diff --git a/shared/build-common-shared.xml b/shared/build-common-shared.xml
new file mode 100644
index 0000000..163aedd
--- /dev/null
+++ b/shared/build-common-shared.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-shared">
+	<import file="../build-common-plugin.xml" />
+
+	<target name="jar">
+		<jar-macro
+			module.dir="${basedir}"
+		/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/shared/build.xml b/shared/build.xml
new file mode 100644
index 0000000..816d62e
--- /dev/null
+++ b/shared/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="shared" basedir="." default="deploy">
+	<import file="../build-common-plugins.xml" />
+</project>
\ No newline at end of file
diff --git a/shared/portal-http-service/.classpath b/shared/portal-http-service/.classpath
new file mode 100644
index 0000000..94698ba
--- /dev/null
+++ b/shared/portal-http-service/.classpath
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<classpath>
+	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="src" />
+	<classpathentry kind="src" path="/portal-6.2.x" />
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
+	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="test/unit" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/junit.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/mockito.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/powermock-mockito.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/spring-test.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/activation.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/annotations.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/jsp-api.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/mail.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/servlet-api.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/global/portlet.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/portal/commons-io.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/portal/commons-lang.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/portal/commons-logging.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/portal/log4j.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/portal-service/portal-service.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/util-bridges/util-bridges.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/util-java/util-java.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/util-taglib/util-taglib.jar" />
+	<classpathentry kind="lib" path="lib/org.eclipse.osgi.services.jar" />
+	<classpathentry kind="lib" path="lib/org.osgi.core.jar" />
+	<classpathentry kind="lib" path="lib/portal-compat-shared.jar" />
+	<classpathentry kind="output" path="bin" />
+</classpath>
\ No newline at end of file
diff --git a/shared/portal-http-service/.project b/shared/portal-http-service/.project
new file mode 100644
index 0000000..13f5c6f
--- /dev/null
+++ b/shared/portal-http-service/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>portal-http-service-6.2.x</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1669365750342</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/shared/portal-http-service/bnd.bnd b/shared/portal-http-service/bnd.bnd
new file mode 100644
index 0000000..ffa99e0
--- /dev/null
+++ b/shared/portal-http-service/bnd.bnd
@@ -0,0 +1,10 @@
+Bundle-Activator: com.liferay.portal.http.service.internal.HttpServiceBundleActivator
+Bundle-Name: Liferay Portal HTTP Service
+Bundle-SymbolicName: com.liferay.portal.http.service
+Bundle-Version: 1.0.2
+Export-Package:\
+	com.liferay.portal.http.service.servlet,\
+	com.liferay.portal.http.service.ws.axis
+Include-Resource: classes
+Private-Package:\
+	com.liferay.portal.http.service.internal.*
\ No newline at end of file
diff --git a/shared/portal-http-service/build.xml b/shared/portal-http-service/build.xml
new file mode 100644
index 0000000..72eea64
--- /dev/null
+++ b/shared/portal-http-service/build.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project>
+	<property name="javac.source" value="1.6" />
+	<property name="javac.target" value="1.6" />
+	<property name="osgi.ide.dependencies" value="axis.jar" />
+	<property name="osgi.runtime.dependencies" value="org.eclipse.osgi.services.jar" />
+	<property name="plugin.full.version" value="1.0.2" />
+	<property name="plugin.name" value="com.liferay.portal.http.service" />
+
+	<import file="../../build-common-osgi-plugin.xml" />
+
+	<property name="auto.deploy.dir" value="${liferay.home}/osgi/portal" />
+</project>
\ No newline at end of file
diff --git a/shared/portal-http-service/ivy.xml b/shared/portal-http-service/ivy.xml
new file mode 100644
index 0000000..7dfbea2
--- /dev/null
+++ b/shared/portal-http-service/ivy.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="${plugin.name}" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<publications>
+		<artifact type="jar" />
+		<artifact type="pom" />
+		<artifact m2:classifier="sources" />
+	</publications>
+
+	<dependencies defaultconf="default">
+		<dependency name="org.eclipse.osgi.services" org="org.eclipse.birt.runtime" rev="3.3.100.v20120522-1822" />
+		<dependency name="org.osgi.core" org="org.osgi" rev="5.0.0" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/shared/portal-http-service/ivy.xml.MD5 b/shared/portal-http-service/ivy.xml.MD5
new file mode 100644
index 0000000..71ae448
--- /dev/null
+++ b/shared/portal-http-service/ivy.xml.MD5
@@ -0,0 +1 @@
+0610fea5fe877e1fd1f04ae117dc6030
diff --git a/shared/portal-http-service/lib/org.eclipse.osgi.services.jar b/shared/portal-http-service/lib/org.eclipse.osgi.services.jar
new file mode 100644
index 0000000..b648e76
Binary files /dev/null and b/shared/portal-http-service/lib/org.eclipse.osgi.services.jar differ
diff --git a/shared/portal-http-service/lib/org.osgi.core.jar b/shared/portal-http-service/lib/org.osgi.core.jar
new file mode 100644
index 0000000..d881a6a
Binary files /dev/null and b/shared/portal-http-service/lib/org.osgi.core.jar differ
diff --git a/shared/portal-http-service/lib/portal-compat-shared.jar b/shared/portal-http-service/lib/portal-compat-shared.jar
new file mode 100644
index 0000000..6e7a6ac
Binary files /dev/null and b/shared/portal-http-service/lib/portal-compat-shared.jar differ
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/HttpServiceBundleActivator.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/HttpServiceBundleActivator.java
new file mode 100644
index 0000000..8a63871
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/HttpServiceBundleActivator.java
@@ -0,0 +1,173 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal;
+
+import com.liferay.portal.http.service.internal.event.EventUtil;
+import com.liferay.portal.http.service.internal.http.PortalHttpContext;
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.http.service.internal.servlet.WebExtenderServlet;
+import com.liferay.portal.http.service.servlet.BundleServletConfig;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.Validator;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+/**
+ * @author Miguel Pastor
+ * @author Raymond Augé
+ */
+public class HttpServiceBundleActivator
+	implements BundleActivator,
+			   ServiceTrackerCustomizer<ServletContext, ServletContext> {
+
+
+	public ServletContext addingService(
+		ServiceReference<ServletContext> serviceReference) {
+
+		BundleContext bundleContext = getBundleContext();
+
+		ServletContext servletContext = bundleContext.getService(
+			serviceReference);
+
+		ServletConfig servletConfig = new BundleServletConfig(
+			servletContext, "Web Extender Servlet", null,
+			new PortalHttpContext(servletContext));
+
+		try {
+			_webExtenderServlet = new WebExtenderServlet(bundleContext);
+
+			_webExtenderServlet.init(servletConfig);
+
+			_webBundleDeployer = new WebBundleDeployer(_webExtenderServlet);
+
+			_startedBundleListener = new StartedBundleListener(
+				_webBundleDeployer);
+
+			bundleContext.addBundleListener(_startedBundleListener);
+
+			_stoppedBundleListener = new StoppedBundleListener(
+				_webBundleDeployer);
+
+			bundleContext.addBundleListener(_stoppedBundleListener);
+		}
+		catch (Exception e) {
+			_log.error(e, e);
+		}
+
+		checkStartableBundles();
+
+		return servletContext;
+	}
+
+	public BundleContext getBundleContext() {
+		return _bundleContext;
+	}
+
+
+	public void modifiedService(
+		ServiceReference<ServletContext> serviceReference,
+		ServletContext servletContext) {
+	}
+
+
+	public void removedService(
+		ServiceReference<ServletContext> serviceReference,
+		ServletContext servletContext) {
+
+		_webBundleDeployer.close();
+
+		_webBundleDeployer = null;
+
+		_webExtenderServlet.destroy();
+
+		_webExtenderServlet = null;
+
+		_bundleContext.removeBundleListener(_startedBundleListener);
+
+		_startedBundleListener = null;
+
+		_bundleContext.removeBundleListener(_stoppedBundleListener);
+
+		_stoppedBundleListener = null;
+	}
+
+
+	public void start(BundleContext bundleContext) throws Exception {
+		_bundleContext = bundleContext;
+
+		EventUtil.start(_bundleContext);
+
+		Filter filter = bundleContext.createFilter(
+			"(&(bean.id=" + ServletContext.class.getName() +
+				")(original.bean=*))");
+
+		_servletContextTracker =
+			new ServiceTracker<ServletContext, ServletContext>(
+				bundleContext, filter, this);
+
+		_servletContextTracker.open();
+	}
+
+
+	public void stop(BundleContext bundleContext) throws Exception {
+		_servletContextTracker.close();
+
+		_servletContextTracker = null;
+
+		EventUtil.close();
+
+		_bundleContext = null;
+	}
+
+	protected void checkStartableBundles() {
+		for (Bundle bundle : _bundleContext.getBundles()) {
+			String servletContextName =
+				BundleServletContext.getServletContextName(bundle);
+
+			if (Validator.isNull(servletContextName)) {
+				continue;
+			}
+
+			try {
+				_webBundleDeployer.doStart(bundle, servletContextName);
+			}
+			catch (Exception e) {
+				_log.error(e, e);
+			}
+		}
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(
+		HttpServiceBundleActivator.class);
+
+	private BundleContext _bundleContext;
+	private ServiceTracker<ServletContext, ServletContext>
+		_servletContextTracker;
+	private StartedBundleListener _startedBundleListener;
+	private StoppedBundleListener _stoppedBundleListener;
+	private WebBundleDeployer _webBundleDeployer;
+	private WebExtenderServlet _webExtenderServlet;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/StartedBundleListener.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/StartedBundleListener.java
new file mode 100644
index 0000000..c7e5bc3
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/StartedBundleListener.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.Validator;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class StartedBundleListener implements BundleListener {
+
+	public StartedBundleListener(WebBundleDeployer webBundleDeployer) {
+		_webBundleDeployer = webBundleDeployer;
+	}
+
+
+	public void bundleChanged(BundleEvent bundleEvent) {
+		int type = bundleEvent.getType();
+
+		Bundle bundle = bundleEvent.getBundle();
+
+		String servletContextName = BundleServletContext.getServletContextName(
+			bundle);
+
+		if (Validator.isNull(servletContextName)) {
+			return;
+		}
+
+		try {
+			if (type == BundleEvent.STARTED) {
+				_webBundleDeployer.doStart(bundle, servletContextName);
+			}
+		}
+		catch (Exception e) {
+			_log.error(e, e);
+		}
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(
+		StartedBundleListener.class);
+
+	private WebBundleDeployer _webBundleDeployer;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/StoppedBundleListener.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/StoppedBundleListener.java
new file mode 100644
index 0000000..fa8c311
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/StoppedBundleListener.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.Validator;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class StoppedBundleListener implements SynchronousBundleListener {
+
+	public StoppedBundleListener(WebBundleDeployer webBundleDeployer) {
+		_webBundleDeployer = webBundleDeployer;
+	}
+
+
+	public void bundleChanged(BundleEvent bundleEvent) {
+		int type = bundleEvent.getType();
+
+		Bundle bundle = bundleEvent.getBundle();
+
+		String servletContextName = BundleServletContext.getServletContextName(
+			bundle);
+
+		if (Validator.isNull(servletContextName)) {
+			return;
+		}
+
+		try {
+			if (type == BundleEvent.STOPPED) {
+				_webBundleDeployer.doStop(bundle, servletContextName);
+			}
+		}
+		catch (Exception e) {
+			_log.error(e, e);
+		}
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(
+		StoppedBundleListener.class);
+
+	private WebBundleDeployer _webBundleDeployer;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/WebBundleDeployer.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/WebBundleDeployer.java
new file mode 100644
index 0000000..c16e90c
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/WebBundleDeployer.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal;
+
+import com.liferay.portal.http.service.internal.event.EventUtil;
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.http.service.internal.servlet.WebExtenderServlet;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.servlet.ServletContextPool;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class WebBundleDeployer {
+
+	public WebBundleDeployer(WebExtenderServlet webExtenderServlet)
+		throws Exception {
+
+		_webExtenderServlet = webExtenderServlet;
+	}
+
+	public void close() {
+		_webExtenderServlet = null;
+	}
+
+	public void doStart(Bundle bundle, String servletContextName) {
+		if (bundle.getState() != Bundle.ACTIVE) {
+			return;
+		}
+
+		EventUtil.sendEvent(bundle, EventUtil.DEPLOYING, null, false);
+
+		ServletContext servletContext = ServletContextPool.get(
+			servletContextName);
+
+		if (servletContext != null) {
+			EventUtil.sendEvent(bundle, EventUtil.FAILED, null, true);
+
+			_collidedWABBundleIds.add(bundle.getBundleId());
+
+			return;
+		}
+
+		try {
+			BundleServletContext bundleServletContext =
+				new BundleServletContext(
+					bundle, servletContextName,
+					_webExtenderServlet.getServletContext());
+
+			bundleServletContext.open();
+
+			ServletContextPool.put(servletContextName, bundleServletContext);
+		}
+		catch (Exception e) {
+			EventUtil.sendEvent(bundle, EventUtil.FAILED, e, false);
+		}
+	}
+
+	public void doStop(Bundle bundle, String servletContextName) {
+		EventUtil.sendEvent(bundle, EventUtil.UNDEPLOYING, null, false);
+
+		BundleServletContext bundleServletContext = null;
+
+		ServletContext servletContext = ServletContextPool.get(
+			servletContextName);
+
+		if ((servletContext != null) &&
+			(servletContext instanceof BundleServletContext)) {
+
+			bundleServletContext = (BundleServletContext)servletContext;
+		}
+
+		if (bundleServletContext == null) {
+			EventUtil.sendEvent(bundle, EventUtil.UNDEPLOYED, null, false);
+
+			ServletContextPool.remove(servletContextName);
+
+			return;
+		}
+
+		try {
+			bundleServletContext.close();
+		}
+		catch (Exception e) {
+			EventUtil.sendEvent(bundle, EventUtil.FAILED, null, false);
+		}
+
+		EventUtil.sendEvent(bundle, EventUtil.UNDEPLOYED, null, false);
+
+		ServletContextPool.remove(servletContextName);
+
+		handleCollidedWABs(bundle, servletContextName);
+	}
+
+	protected void handleCollidedWABs(
+		Bundle bundle, String servletContextName) {
+
+		if (_collidedWABBundleIds.isEmpty()) {
+			return;
+		}
+
+		BundleContext bundleContext = _webExtenderServlet.getBundleContext();
+
+		Iterator<Long> iterator = _collidedWABBundleIds.iterator();
+
+		while (iterator.hasNext()) {
+			long bundleId = iterator.next();
+
+			Bundle curBundle = bundleContext.getBundle(bundleId);
+
+			if (curBundle == null) {
+				iterator.remove();
+
+				continue;
+			}
+
+			String curServletContextName =
+				BundleServletContext.getServletContextName(curBundle);
+
+			if (servletContextName.equals(curServletContextName) &&
+				(bundle.getBundleId() != curBundle.getBundleId())) {
+
+				iterator.remove();
+
+				doStart(curBundle, servletContextName);
+
+				break;
+			}
+		}
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(WebBundleDeployer.class);
+
+	private List<Long> _collidedWABBundleIds = Collections.synchronizedList(
+		new ArrayList<Long>());
+	private WebExtenderServlet _webExtenderServlet;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/FilterDefinition.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/FilterDefinition.java
new file mode 100644
index 0000000..dfe0409
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/FilterDefinition.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Filter;
+
+/**
+ * @author Raymond Augé
+ */
+public class FilterDefinition {
+
+	public void addURLPattern(String urlPattern) {
+		_urlPatterns.add(urlPattern);
+	}
+
+	public Filter getFilter() {
+		return _filter;
+	}
+
+	public Map<String, String> getInitParameters() {
+		return _initParameters;
+	}
+
+	public String getName() {
+		return _name;
+	}
+
+	public List<String> getURLPatterns() {
+		return _urlPatterns;
+	}
+
+	public void setFilter(Filter filter) {
+		_filter = filter;
+	}
+
+	public void setInitParameter(String key, String value) {
+		_initParameters.put(key, value);
+	}
+
+	public void setInitParameters(Map<String, String> initParameters) {
+		_initParameters = initParameters;
+	}
+
+	public void setName(String name) {
+		_name = name;
+	}
+
+	public void setURLPatterns(List<String> urlPatterns) {
+		_urlPatterns = urlPatterns;
+	}
+
+	private Filter _filter;
+	private Map<String, String> _initParameters = new HashMap<String, String>();
+	private String _name;
+	private List<String> _urlPatterns = new ArrayList<String>();
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/ListenerDefinition.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/ListenerDefinition.java
new file mode 100644
index 0000000..e78e8b5
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/ListenerDefinition.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+/**
+ * @author Raymond Augé
+ */
+public class ListenerDefinition {
+
+	public Object getListener() {
+		return _listener;
+	}
+
+	public void setListener(Object listener) {
+		_listener = listener;
+	}
+
+	private Object _listener;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/ServletDefinition.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/ServletDefinition.java
new file mode 100644
index 0000000..c969130
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/ServletDefinition.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Servlet;
+
+/**
+ * @author Raymond Augé
+ */
+public class ServletDefinition {
+
+	public void addURLPattern(String urlPattern) {
+		_urlPatterns.add(urlPattern);
+	}
+
+	public Map<String, String> getInitParameters() {
+		return _initParameters;
+	}
+
+	public String getName() {
+		return _name;
+	}
+
+	public Servlet getServlet() {
+		return _servlet;
+	}
+
+	public List<String> getURLPatterns() {
+		return _urlPatterns;
+	}
+
+	public void setInitParameter(String name, String value) {
+		_initParameters.put(name, value);
+	}
+
+	public void setInitParameters(Map<String, String> initParameters) {
+		_initParameters = initParameters;
+	}
+
+	public void setName(String name) {
+		_name = name;
+	}
+
+	public void setServlet(Servlet servlet) {
+		_servlet = servlet;
+	}
+
+	public void setURLPatterns(List<String> urlPatterns) {
+		_urlPatterns = urlPatterns;
+	}
+
+	private Map<String, String> _initParameters = new HashMap<String, String>();
+	private String _name;
+	private Servlet _servlet;
+	private List<String> _urlPatterns = new ArrayList<String>();
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/WebXMLDefinition.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/WebXMLDefinition.java
new file mode 100644
index 0000000..669a9a4
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/WebXMLDefinition.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class WebXMLDefinition {
+
+	public void addListenerDefinition(ListenerDefinition listenerDefinition) {
+		_listenerDefinitions.add(listenerDefinition);
+	}
+
+	public Map<String, String> getContextParameters() {
+		return _contextParameters;
+	}
+
+	public Map<String, FilterDefinition> getFilterDefinitions() {
+		return _filterDefinitions;
+	}
+
+	public List<ListenerDefinition> getListenerDefinitions() {
+		return _listenerDefinitions;
+	}
+
+	public Map<String, ServletDefinition> getServletDefinitions() {
+		return _servletDefinitions;
+	}
+
+	public void setContextParameter(String name, String value) {
+		_contextParameters.put(name, value);
+	}
+
+	public void setContextParameters(Map<String, String> contextParameters) {
+		_contextParameters = contextParameters;
+	}
+
+	public void setFilterDefinition(
+		String name, FilterDefinition filterDefinition) {
+
+		_filterDefinitions.put(name, filterDefinition);
+	}
+
+	public void setFilterDefinitions(
+		Map<String, FilterDefinition> filterDefinitions) {
+
+		_filterDefinitions = filterDefinitions;
+	}
+
+	public void setListenerDefinitions(
+		List<ListenerDefinition> listenerDefinitions) {
+
+		_listenerDefinitions = listenerDefinitions;
+	}
+
+	public void setServletDefinition(
+		String name, ServletDefinition servletDefinition) {
+
+		_servletDefinitions.put(name, servletDefinition);
+	}
+
+	public void setServletDefinitions(
+		Map<String, ServletDefinition> servletDefinitions) {
+
+		_servletDefinitions = servletDefinitions;
+	}
+
+	private Map<String, String> _contextParameters =
+		new HashMap<String, String>();
+	private Map<String, FilterDefinition> _filterDefinitions =
+		new HashMap<String, FilterDefinition>();
+	private List<ListenerDefinition> _listenerDefinitions =
+		new ArrayList<ListenerDefinition>();
+	private Map<String, ServletDefinition> _servletDefinitions =
+		new HashMap<String, ServletDefinition>();
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionLoader.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionLoader.java
new file mode 100644
index 0000000..881c2e3
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionLoader.java
@@ -0,0 +1,240 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.xml.Document;
+import com.liferay.portal.kernel.xml.DocumentException;
+import com.liferay.portal.kernel.xml.Element;
+import com.liferay.portal.kernel.xml.SAXReaderUtil;
+
+import java.net.URL;
+
+import java.util.List;
+
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+
+import org.osgi.framework.Bundle;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class WebXMLDefinitionLoader {
+
+	public WebXMLDefinition loadWebXML(Bundle bundle)
+		throws DocumentException, IllegalAccessException,
+			   InstantiationException {
+
+		WebXMLDefinition webXML = new WebXMLDefinition();
+
+		URL url = bundle.getEntry("WEB-INF/web.xml");
+
+		if (url != null) {
+			Document document = SAXReaderUtil.read(url);
+
+			Element rootElement = document.getRootElement();
+
+			readContextParameters(bundle, rootElement, webXML);
+			readFilters(bundle, rootElement, webXML);
+			readListeners(bundle, rootElement, webXML);
+			readServlets(bundle, rootElement, webXML);
+		}
+
+		return webXML;
+	}
+
+	protected String getURLPattern(Element element) {
+		String urlPattern = element.elementText("url-pattern");
+
+		if (urlPattern.endsWith(_SLASH_STAR) && (urlPattern.length() > 2)) {
+			urlPattern = urlPattern.substring(0, urlPattern.length() - 2);
+		}
+
+		if (urlPattern.startsWith(StringPool.STAR)) {
+			urlPattern = StringPool.SLASH.concat(urlPattern);
+		}
+
+		return urlPattern;
+	}
+
+	protected void readContextParameters(
+		Bundle bundle, Element rootElement, WebXMLDefinition webXML) {
+
+		for (Element element : rootElement.elements("context-param")) {
+			String name = element.elementText("param-name");
+			String value = element.elementText("param-value");
+
+			webXML.setContextParameter(name, value);
+		}
+	}
+
+	protected void readFilters(
+			Bundle bundle, Element rootElement, WebXMLDefinition webXML)
+		throws IllegalAccessException, InstantiationException {
+
+		List<Element> filterElements = rootElement.elements("filter");
+
+		for (Element filterElement : filterElements) {
+			FilterDefinition filterDefinition = new FilterDefinition();
+
+			String filterClassName = filterElement.elementText("filter-class");
+
+			Class<?> clazz = null;
+
+			try {
+				clazz = bundle.loadClass(filterClassName);
+			}
+			catch (Exception e) {
+				_log.error("Unable to load filter " + filterClassName);
+
+				continue;
+			}
+
+			Filter filter = (Filter)clazz.newInstance();
+
+			filterDefinition.setFilter(filter);
+
+			List<Element> initParamElements = filterElement.elements(
+				"init-param");
+
+			for (Element initParamElement : initParamElements) {
+				String paramName = initParamElement.elementText("param-name");
+				String paramValue = initParamElement.elementText("param-value");
+
+				filterDefinition.setInitParameter(paramName, paramValue);
+			}
+
+			String filterName = filterElement.elementText("filter-name");
+
+			filterDefinition.setName(filterName);
+
+			List<Element> filterMappingElements = rootElement.elements(
+				"filter-mapping");
+
+			for (Element filterMappingElement : filterMappingElements) {
+				String filterMappingElementFilterName =
+					filterMappingElement.elementText("filter-name");
+
+				if (filterMappingElementFilterName.equals(filterName)) {
+					String urlPattern = getURLPattern(filterMappingElement);
+
+					filterDefinition.addURLPattern(urlPattern);
+				}
+			}
+
+			webXML.setFilterDefinition(filterName, filterDefinition);
+		}
+	}
+
+	protected void readListeners(
+			Bundle bundle, Element rootElement, WebXMLDefinition webXML)
+		throws IllegalAccessException, InstantiationException {
+
+		List<Element> listenerElements = rootElement.elements("listener");
+
+		for (Element listenerElement : listenerElements) {
+			ListenerDefinition listenerDefinition = new ListenerDefinition();
+
+			String listenerClassName = listenerElement.elementText(
+				"listener-class");
+
+			Class<?> clazz = null;
+
+			try {
+				clazz = bundle.loadClass(listenerClassName);
+			}
+			catch (Exception e) {
+				_log.error("Unable to load listener " + listenerClassName);
+
+				continue;
+			}
+
+			Object listener = clazz.newInstance();
+
+			listenerDefinition.setListener(listener);
+
+			webXML.addListenerDefinition(listenerDefinition);
+		}
+	}
+
+	protected void readServlets(
+			Bundle bundle, Element rootElement, WebXMLDefinition webXML)
+		throws IllegalAccessException, InstantiationException {
+
+		List<Element> servletElements = rootElement.elements("servlet");
+
+		for (Element servletElement : servletElements) {
+			ServletDefinition servletDefinition = new ServletDefinition();
+
+			String servletClassName = servletElement.elementText(
+				"servlet-class");
+
+			Class<?> servletClass = null;
+
+			try {
+				servletClass = bundle.loadClass(servletClassName);
+			}
+			catch (Exception e) {
+				_log.error("Unable to load servlet " + servletClassName);
+
+				continue;
+			}
+
+			Servlet servlet = (Servlet)servletClass.newInstance();
+
+			servletDefinition.setServlet(servlet);
+
+			List<Element> initParamElements = servletElement.elements(
+				"init-param");
+
+			for (Element initParamElement : initParamElements) {
+				String paramName = initParamElement.elementText("param-name");
+				String paramValue = initParamElement.elementText("param-value");
+
+				servletDefinition.setInitParameter(paramName, paramValue);
+			}
+
+			String servletName = servletElement.elementText("servlet-name");
+
+			servletDefinition.setName(servletName);
+
+			List<Element> servletMappingElements = rootElement.elements(
+				"servlet-mapping");
+
+			for (Element servletMappingElement : servletMappingElements) {
+				String servletMappingElementServletName =
+					servletMappingElement.elementText("servlet-name");
+
+				if (servletMappingElementServletName.equals(servletName)) {
+					String urlPattern = getURLPattern(servletMappingElement);
+
+					servletDefinition.addURLPattern(urlPattern);
+				}
+			}
+
+			webXML.setServletDefinition(servletName, servletDefinition);
+		}
+	}
+
+	private static final String _SLASH_STAR = "/*";
+
+	private static Log _log = LogFactoryUtil.getLog(
+		WebXMLDefinitionLoader.class);
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/event/EventUtil.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/event/EventUtil.java
new file mode 100644
index 0000000..fd16475
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/event/EventUtil.java
@@ -0,0 +1,209 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.event;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.StringPool;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
+import org.osgi.service.event.EventConstants;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class EventUtil
+	implements ServiceTrackerCustomizer<EventAdmin, EventAdmin> {
+
+	public static final String DEPLOYED = "org/osgi/service/web/DEPLOYED";
+
+	public static final String DEPLOYING = "org/osgi/service/web/DEPLOYING";
+
+	public static final String FAILED = "org/osgi/service/web/FAILED";
+
+	public static final String UNDEPLOYED = "org/osgi/service/web/UNDEPLOYED";
+
+	public static final String UNDEPLOYING = "org/osgi/service/web/UNDEPLOYING";
+
+	public static void close() {
+		_instance._close();
+
+		_instance = null;
+	}
+
+	public static void sendEvent(
+		Bundle bundle, String eventTopic, Exception exception,
+		boolean collision) {
+
+		_instance._sendEvent(bundle, eventTopic, exception, collision);
+	}
+
+	public static void start(BundleContext bundleContext) {
+		if (_instance != null) {
+			return;
+		}
+
+		_instance = new EventUtil();
+
+		_instance._start(bundleContext);
+	}
+
+	public void _close() {
+		_eventAdminServiceTracker.close();
+
+		_bundleContext = null;
+		_eventAdminServiceTracker = null;
+		_webExtenderBundle = null;
+	}
+
+
+	public EventAdmin addingService(
+		ServiceReference<EventAdmin> serviceReference) {
+
+		_eventAdmin = _bundleContext.getService(serviceReference);
+
+		return _eventAdmin;
+	}
+
+
+	public void modifiedService(
+		ServiceReference<EventAdmin> serviceReference, EventAdmin eventAdmin) {
+	}
+
+
+	public void removedService(
+		ServiceReference<EventAdmin> serviceReference, EventAdmin eventAdmin) {
+
+		_eventAdmin = null;
+	}
+
+	private EventUtil() {
+	}
+
+	private void _sendEvent(
+		Bundle bundle, String eventTopic, Exception exception,
+		boolean collision) {
+
+		Map<String, Object> properties = new Hashtable<String, Object>();
+
+		properties.put("bundle", bundle);
+		properties.put("bundle.id", bundle.getBundleId());
+		properties.put("bundle.symbolicName", bundle.getSymbolicName());
+		properties.put("bundle.version", bundle.getVersion());
+
+		String servletContextName = BundleServletContext.getServletContextName(
+			bundle, true);
+
+		String contextPath = StringPool.SLASH.concat(servletContextName);
+
+		if (collision) {
+			properties.put("collision", contextPath);
+
+			List<String> collidedBundleIds = new ArrayList<String>();
+
+			BundleContext bundleContext = bundle.getBundleContext();
+
+			for (Bundle curBundle : bundleContext.getBundles()) {
+				if (curBundle.equals(bundle) ||
+					(curBundle.getState() != Bundle.ACTIVE)) {
+
+					continue;
+				}
+
+				String curServletContextName =
+					BundleServletContext.getServletContextName(curBundle);
+
+				if ((curServletContextName != null) &&
+					curServletContextName.equals(servletContextName)) {
+
+					collidedBundleIds.add(
+						String.valueOf(curBundle.getBundleId()));
+				}
+			}
+
+			properties.put("collision.bundles", collidedBundleIds);
+		}
+
+		properties.put("context.path", contextPath);
+
+		if (exception != null) {
+			properties.put("exception", exception);
+		}
+
+		properties.put("extender.bundle", _webExtenderBundle);
+		properties.put("extender.bundle.id", _webExtenderBundle.getBundleId());
+		properties.put(
+			"extender.bundle.symbolicName",
+			_webExtenderBundle.getSymbolicName());
+		properties.put(
+			"extender.bundle.version", _webExtenderBundle.getVersion());
+		properties.put("servlet.context.name", servletContextName);
+		properties.put("timestamp", System.currentTimeMillis());
+
+		Event event = new Event(eventTopic, properties);
+
+		if (_log.isInfoEnabled()) {
+			_log.info(event);
+		}
+
+		if (_eventAdmin == null) {
+			return;
+		}
+
+		_eventAdmin.sendEvent(event);
+	}
+
+	private void _start(BundleContext bundleContext) {
+		_bundleContext = bundleContext;
+
+		_webExtenderBundle = _bundleContext.getBundle();
+
+		Map<String, Object> properties = new Hashtable<String, Object>();
+
+		properties.put(EventConstants.EVENT_TOPIC, _EVENT_TOPICS);
+
+		_eventAdminServiceTracker = new ServiceTracker<EventAdmin, EventAdmin>(
+			_bundleContext, EventAdmin.class.getName(), this);
+
+		_eventAdminServiceTracker.open();
+	}
+
+	private static final String[] _EVENT_TOPICS = new String[] {
+		DEPLOYED, DEPLOYING, FAILED, UNDEPLOYED, UNDEPLOYING
+	};
+
+	private static Log _log = LogFactoryUtil.getLog(EventUtil.class);
+
+	private static EventUtil _instance;
+
+	private BundleContext _bundleContext;
+	private EventAdmin _eventAdmin;
+	private ServiceTracker<EventAdmin, EventAdmin> _eventAdminServiceTracker;
+	private Bundle _webExtenderBundle;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/BaseServiceTrackerCustomizer.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/BaseServiceTrackerCustomizer.java
new file mode 100644
index 0000000..9dcedd4
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/BaseServiceTrackerCustomizer.java
@@ -0,0 +1,144 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+/**
+ * @author Miguel Pastor
+ * @author Raymond Augé
+ */
+public abstract class BaseServiceTrackerCustomizer<S, T>
+	implements ServiceTrackerCustomizer<S, T> {
+
+	public BaseServiceTrackerCustomizer(HttpSupport httpSupport) {
+		this.httpSupport = httpSupport;
+	}
+
+
+	public T addingService(ServiceReference<S> serviceReference) {
+		BundleContext bundleContext = httpSupport.getBundleContext();
+
+		T service = (T)bundleContext.getService(serviceReference);
+
+		return doAction(serviceReference, service, ACTION_ADDING);
+	}
+
+
+	public void modifiedService(
+		ServiceReference<S> serviceReference, T service) {
+
+		doAction(serviceReference, service, ACTION_MODIFIED);
+	}
+
+
+	public void removedService(
+		ServiceReference<S> serviceReference, T service) {
+
+		doAction(serviceReference, service, ACTION_REMOVED);
+	}
+
+	protected T doAction(
+		ServiceReference<S> serviceReference, T service, int action) {
+
+		Map<String, String> initParameters = new HashMap<String, String>();
+
+		if (action != ACTION_REMOVED) {
+			for (String key : serviceReference.getPropertyKeys()) {
+				if (key.startsWith("init.")) {
+					String value = GetterUtil.getString(
+						serviceReference.getProperty(key));
+
+					initParameters.put(key.substring(5), value);
+				}
+			}
+
+			int serviceRanking = GetterUtil.getInteger(
+				serviceReference.getProperty(Constants.SERVICE_RANKING));
+
+			initParameters.put(
+				Constants.SERVICE_RANKING, String.valueOf(serviceRanking));
+		}
+
+		Bundle bundle = serviceReference.getBundle();
+
+		try {
+			HttpServiceWrapper httpServiceWrapper = httpSupport.getHttpService(
+				bundle);
+
+			BundleServletContext bundleServletContext =
+				httpServiceWrapper.getBundleServletContext();
+
+			if (action != ACTION_ADDING) {
+				unregisterService(bundleServletContext, serviceReference);
+			}
+
+			if (action != ACTION_REMOVED) {
+				String contextId = GetterUtil.getString(
+					serviceReference.getProperty("contextId"));
+
+				HttpContext httpContext = httpSupport.getHttpContext(contextId);
+
+				if (httpContext == null) {
+					httpContext = bundleServletContext.getHttpContext();
+				}
+
+				registerService(
+					bundleServletContext, serviceReference, service,
+					initParameters, httpContext);
+			}
+		}
+		catch (Exception e) {
+			_log.error(e, e);
+		}
+
+		return service;
+	}
+
+	protected abstract void registerService(
+			BundleServletContext bundleServletContext,
+			ServiceReference<S> serviceReference, T service,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws Exception;
+
+	protected abstract void unregisterService(
+		BundleServletContext bundleServletContext,
+		ServiceReference<S> serviceReference);
+
+	protected static final int ACTION_ADDING = 0;
+
+	protected static final int ACTION_MODIFIED = 1;
+
+	protected static final int ACTION_REMOVED = 2;
+
+	protected HttpSupport httpSupport;
+
+	private static Log _log = LogFactoryUtil.getLog(
+		BaseServiceTrackerCustomizer.class);
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/DefaultHttpContext.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/DefaultHttpContext.java
new file mode 100644
index 0000000..5becb71
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/DefaultHttpContext.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.kernel.util.MimeTypesUtil;
+import com.liferay.portal.kernel.util.StringPool;
+
+import java.net.URL;
+
+import java.util.Enumeration;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.framework.Bundle;
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class DefaultHttpContext implements HttpContext {
+
+	public DefaultHttpContext(Bundle bundle) {
+		_bundle = bundle;
+	}
+
+
+	public String getMimeType(String name) {
+		return MimeTypesUtil.getContentType(name);
+	}
+
+
+	public URL getResource(String path) {
+		if (!path.startsWith(StringPool.SLASH)) {
+			path = StringPool.SLASH.concat(path);
+		}
+
+		URL url = null;
+
+		if (!path.startsWith(_PATH_EXT)) {
+			url = getResource(_PATH_EXT.concat(path));
+
+			if (url != null) {
+				return url;
+			}
+		}
+
+		url = _bundle.getResource(path);
+
+		if (url != null) {
+			return url;
+		}
+
+		String filePattern = path;
+
+		int index = path.lastIndexOf(StringPool.SLASH);
+
+		if (index != -1) {
+			filePattern = path.substring(index + 1);
+
+			path = path.substring(0, index);
+		}
+
+		Enumeration<URL> enumeration = _bundle.findEntries(
+			path, filePattern, false);
+
+		if ((enumeration != null) && enumeration.hasMoreElements()) {
+			return enumeration.nextElement();
+		}
+
+		return null;
+	}
+
+
+	public boolean handleSecurity(
+		HttpServletRequest request, HttpServletResponse response) {
+
+		return true;
+	}
+
+	private static final String _PATH_EXT = "/ext";
+
+	private Bundle _bundle;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/ExtendedHttpService.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/ExtendedHttpService.java
new file mode 100644
index 0000000..175949b
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/ExtendedHttpService.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.http.NamespaceException;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public interface ExtendedHttpService extends HttpService {
+
+	public void registerFilter(
+			String filterName, List<String> urlPatterns, Filter filter,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException;
+
+	public void registerListener(
+		Object listener, Map<String, String> initParameters,
+		HttpContext httpContext);
+
+	public void registerServlet(
+			String servletName, List<String> urlPatterns, Servlet servlet,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException;
+
+	public void unregisterFilter(String filterName);
+
+	public void unregisterListener(Object listener);
+
+	public void unregisterServlet(String servletName);
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/FilterTracker.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/FilterTracker.java
new file mode 100644
index 0000000..2ef510c
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/FilterTracker.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+
+import java.util.Map;
+
+import javax.servlet.Filter;
+
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class FilterTracker
+	extends BaseServiceTrackerCustomizer<Filter, Filter> {
+
+	public FilterTracker(HttpSupport httpSupport) {
+		super(httpSupport);
+	}
+
+
+	protected void registerService(
+			BundleServletContext bundleServletContext,
+			ServiceReference<Filter> serviceReference, Filter filter,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws Exception {
+
+		String filterName = GetterUtil.getString(
+			serviceReference.getProperty("filterName"));
+
+		if (Validator.isNull(filterName)) {
+			filterName = String.valueOf(
+				serviceReference.getProperty(Constants.SERVICE_ID));
+		}
+
+		String urlPattern = GetterUtil.getString(
+			serviceReference.getProperty("urlPattern"));
+
+		if (Validator.isNull(urlPattern)) {
+			urlPattern = GetterUtil.getString(
+				serviceReference.getProperty("pattern"));
+		}
+
+		if (Validator.isNull(urlPattern)) {
+			return;
+		}
+
+		if (!urlPattern.startsWith(StringPool.SLASH)) {
+			urlPattern = StringPool.SLASH.concat(urlPattern);
+		}
+
+		bundleServletContext.registerFilter(
+			filterName, urlPattern, filter, initParameters, httpContext);
+	}
+
+
+	protected void unregisterService(
+		BundleServletContext bundleServletContext,
+		ServiceReference<Filter> serviceReference) {
+
+		String filterName = GetterUtil.getString(
+			serviceReference.getProperty("filterName"));
+
+		if (Validator.isNull(filterName)) {
+			filterName = String.valueOf(
+				serviceReference.getProperty(Constants.SERVICE_ID));
+		}
+
+		bundleServletContext.unregisterFilter(filterName);
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceFactory.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceFactory.java
new file mode 100644
index 0000000..4845626
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceFactory.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceFactory;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.http.HttpService;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class HttpServiceFactory implements ServiceFactory<HttpService> {
+
+	public HttpServiceFactory(HttpSupport httpSupport) {
+		_httpSupport = httpSupport;
+	}
+
+
+	public HttpService getService(
+		Bundle bundle, ServiceRegistration<HttpService> serviceRegistration) {
+
+		return _httpSupport.getHttpService(bundle);
+	}
+
+
+	public void ungetService(
+		Bundle bundle, ServiceRegistration<HttpService> serviceRegistration,
+		HttpService httpService) {
+
+		_httpSupport.ungetHttpService(bundle);
+	}
+
+	private HttpSupport _httpSupport;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceTracker.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceTracker.java
new file mode 100644
index 0000000..62d7aad
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceTracker.java
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.definition.FilterDefinition;
+import com.liferay.portal.http.service.internal.definition.ListenerDefinition;
+import com.liferay.portal.http.service.internal.definition.ServletDefinition;
+import com.liferay.portal.http.service.internal.definition.WebXMLDefinition;
+import com.liferay.portal.http.service.internal.definition.WebXMLDefinitionLoader;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.xml.DocumentException;
+
+import java.util.List;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class HttpServiceTracker
+	extends ServiceTracker<HttpService, HttpService> {
+
+	public HttpServiceTracker(BundleContext bundleContext, Bundle bundle)
+		throws DocumentException {
+
+		super(bundleContext, HttpService.class, null);
+
+		_bundleContext = bundleContext;
+		_bundle = bundle;
+
+		_webXMLDefinitionLoader = new WebXMLDefinitionLoader();
+	}
+
+
+	public HttpService addingService(
+		ServiceReference<HttpService> serviceReference) {
+
+		_serviceReference = serviceReference;
+
+		HttpService httpService = _bundleContext.getService(_serviceReference);
+
+		if (httpService == null) {
+			return httpService;
+		}
+
+		HttpContext httpContext = httpService.createDefaultHttpContext();
+
+		readConfiguration(_bundle);
+
+		ExtendedHttpService extendedHttpService =
+			(ExtendedHttpService)httpService;
+
+		initListeners(extendedHttpService, httpContext);
+
+		initServlets(extendedHttpService, httpContext);
+
+		initFilters(extendedHttpService, httpContext);
+
+		return httpService;
+	}
+
+
+	public void removedService(
+		ServiceReference<HttpService> serviceReference,
+		HttpService httpService) {
+
+		if (_webXML == null) {
+			return;
+		}
+
+		ExtendedHttpService extendedHttpService =
+			(ExtendedHttpService)httpService;
+
+		destroyFilters(extendedHttpService);
+
+		destroyServlets(extendedHttpService);
+
+		destroyListeners(extendedHttpService);
+
+		_webXML = null;
+	}
+
+	protected void destroyFilters(ExtendedHttpService extendedHttpService) {
+		Map<String, FilterDefinition> filterDefinitions =
+			_webXML.getFilterDefinitions();
+
+		for (String filterName : filterDefinitions.keySet()) {
+			try {
+				extendedHttpService.unregisterFilter(filterName);
+			}
+			catch (Exception e) {
+				_log.error(e, e);
+			}
+		}
+	}
+
+	protected void destroyListeners(ExtendedHttpService extendedHttpService) {
+		List<ListenerDefinition> listenerDefinitions =
+			_webXML.getListenerDefinitions();
+
+		for (ListenerDefinition listenerDefinition : listenerDefinitions) {
+			try {
+				extendedHttpService.unregisterListener(
+					listenerDefinition.getListener());
+			}
+			catch (Exception e) {
+				_log.error(e, e);
+			}
+		}
+	}
+
+	protected void destroyServlets(ExtendedHttpService extendedHttpService) {
+		Map<String, ServletDefinition> servlets =
+			_webXML.getServletDefinitions();
+
+		for (String servletName : servlets.keySet()) {
+			extendedHttpService.unregisterServlet(servletName);
+		}
+	}
+
+	protected void initFilters(
+		ExtendedHttpService extendedHttpService, HttpContext httpContext) {
+
+		Map<String, FilterDefinition> filterDefinitions =
+			_webXML.getFilterDefinitions();
+
+		for (Map.Entry<String, FilterDefinition> entry :
+				filterDefinitions.entrySet()) {
+
+			FilterDefinition filterDefinition = entry.getValue();
+
+			try {
+				extendedHttpService.registerFilter(
+					filterDefinition.getName(),
+					filterDefinition.getURLPatterns(),
+					filterDefinition.getFilter(),
+					filterDefinition.getInitParameters(), httpContext);
+			}
+			catch (Exception e) {
+				_log.error(e, e);
+			}
+		}
+	}
+
+	protected void initListeners(
+		ExtendedHttpService extendedHttpService, HttpContext httpContext) {
+
+		List<ListenerDefinition> listenerDefinitions =
+			_webXML.getListenerDefinitions();
+
+		for (ListenerDefinition listenerDefinition : listenerDefinitions) {
+			try {
+				extendedHttpService.registerListener(
+					listenerDefinition.getListener(),
+					_webXML.getContextParameters(), httpContext);
+			}
+			catch (Exception e) {
+				_log.error(e, e);
+			}
+		}
+	}
+
+	protected void initServlets(
+		ExtendedHttpService extendedHttpService, HttpContext httpContext) {
+
+		Map<String, ServletDefinition> servletDefinitions =
+			_webXML.getServletDefinitions();
+
+		for (Map.Entry<String, ServletDefinition> entry :
+				servletDefinitions.entrySet()) {
+
+			ServletDefinition servletDefinition = entry.getValue();
+
+			try {
+				extendedHttpService.registerServlet(
+					servletDefinition.getName(),
+					servletDefinition.getURLPatterns(),
+					servletDefinition.getServlet(),
+					servletDefinition.getInitParameters(), httpContext);
+			}
+			catch (Exception e) {
+				_log.error(e, e);
+			}
+		}
+	}
+
+	protected void readConfiguration(Bundle bundle) {
+		try {
+			_webXML = _webXMLDefinitionLoader.loadWebXML(bundle);
+		}
+		catch (Exception e) {
+			_log.error(e, e);
+		}
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(HttpServiceTracker.class);
+
+	private Bundle _bundle;
+	private BundleContext _bundleContext;
+	private ServiceReference<HttpService> _serviceReference;
+	private WebXMLDefinition _webXML;
+	private WebXMLDefinitionLoader _webXMLDefinitionLoader;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceWrapper.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceWrapper.java
new file mode 100644
index 0000000..ca22a6d
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpServiceWrapper.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+
+import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.http.NamespaceException;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class HttpServiceWrapper implements ExtendedHttpService, HttpService {
+
+	public HttpServiceWrapper(BundleServletContext bundleServletContext) {
+		this.bundleServletContext = bundleServletContext;
+	}
+
+	public void close() {
+		bundleServletContext.close();
+	}
+
+
+	public HttpContext createDefaultHttpContext() {
+		return bundleServletContext.getHttpContext();
+	}
+
+	public BundleServletContext getBundleServletContext() {
+		return bundleServletContext;
+	}
+
+
+	public void registerFilter(
+			String filterName, List<String> urlPatterns, Filter filter,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		if (httpContext == null) {
+			httpContext = createDefaultHttpContext();
+		}
+
+		bundleServletContext.registerFilter(
+			filterName, urlPatterns, filter, initParameters, httpContext);
+	}
+
+
+	public void registerListener(
+		Object listener, Map<String, String> initParameters,
+		HttpContext httpContext) {
+
+		bundleServletContext.registerListener(
+			listener, initParameters, httpContext);
+	}
+
+
+	public void registerResources(
+			String alias, String name, HttpContext httpContext)
+		throws NamespaceException {
+
+		bundleServletContext.registerResources(alias, name, httpContext);
+	}
+
+
+	public void registerServlet(
+			String servletName, List<String> urlPatterns, Servlet servlet,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		if (httpContext == null) {
+			httpContext = createDefaultHttpContext();
+		}
+
+		bundleServletContext.registerServlet(
+			servletName, urlPatterns, servlet, initParameters, httpContext);
+	}
+
+
+	public void registerServlet(
+			String urlPattern, Servlet servlet,
+			@SuppressWarnings("rawtypes") Dictionary initParameters,
+			HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		// This method is not called by Liferay directly, but is made available
+		// for other OSGi modules that depend on the HTTP service
+
+		bundleServletContext.registerServlet(
+			urlPattern, Arrays.asList(urlPattern), servlet,
+			toMap(initParameters), httpContext);
+	}
+
+
+	public void unregister(String servletName) {
+		unregisterServlet(servletName);
+	}
+
+
+	public void unregisterFilter(String filterName) {
+		bundleServletContext.unregisterFilter(filterName);
+	}
+
+
+	public void unregisterListener(Object listener) {
+		bundleServletContext.unregisterListener(listener);
+	}
+
+
+	public void unregisterServlet(String servletName) {
+		bundleServletContext.unregisterServlet(servletName);
+	}
+
+	protected <K, V> Map<K, V> toMap(Dictionary<K, V> dictionary) {
+		Map<K, V> map = new HashMap<K, V>();
+
+		Enumeration<K> keys = dictionary.keys();
+
+		while (keys.hasMoreElements()) {
+			K key = keys.nextElement();
+
+			map.put(key, dictionary.get(key));
+		}
+
+		return map;
+	}
+
+	protected BundleServletContext bundleServletContext;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpSupport.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpSupport.java
new file mode 100644
index 0000000..dfc2cfe
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/HttpSupport.java
@@ -0,0 +1,200 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.http.service.internal.servlet.WebExtenderServlet;
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.xml.DocumentException;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class HttpSupport {
+
+	public HttpSupport(
+		BundleContext bundleContext, WebExtenderServlet webExtenderServlet) {
+
+		_bundleContext = bundleContext;
+		_webExtenderServlet = webExtenderServlet;
+	}
+
+	public BundleContext getBundleContext() {
+		return _bundleContext;
+	}
+
+	public BundleServletContext getBundleServletContext(Bundle bundle)
+		throws DocumentException, InvalidSyntaxException {
+
+		BundleServletContext bundleServletContext = getWABBundleServletContext(
+			bundle);
+
+		if (bundleServletContext != null) {
+			return bundleServletContext;
+		}
+
+		return getNonWABBundleServletContext(bundle);
+	}
+
+	public Filter getFilter(Bundle bundle) throws InvalidSyntaxException {
+		StringBundler sb = new StringBundler(7);
+
+		sb.append("(&(bundle.symbolicName=");
+		sb.append(bundle.getSymbolicName());
+		sb.append(")(bundle.version=");
+		sb.append(bundle.getVersion());
+		sb.append(")(bundle.id=");
+		sb.append(bundle.getBundleId());
+		sb.append(")(Web-ContextPath=*))");
+
+		return _bundleContext.createFilter(sb.toString());
+	}
+
+	public Filter getFilter(String contextId) throws InvalidSyntaxException {
+		return _bundleContext.createFilter("(&(contextId=" + contextId + ")");
+	}
+
+	public HttpContext getHttpContext(String contextId)
+		throws InvalidSyntaxException {
+
+		if (Validator.isNull(contextId)) {
+			return null;
+		}
+
+		Filter filter = getFilter(contextId);
+
+		Collection<ServiceReference<HttpContext>> serviceReferences =
+			_bundleContext.getServiceReferences(
+				HttpContext.class, filter.toString());
+
+		Iterator<ServiceReference<HttpContext>> iterator =
+			serviceReferences.iterator();
+
+		if (iterator.hasNext()) {
+			ServiceReference<HttpContext> httpContextReference =
+				iterator.next();
+
+			return _bundleContext.getService(httpContextReference);
+		}
+
+		return null;
+	}
+
+	public HttpServiceWrapper getHttpService(Bundle bundle) {
+		HttpServiceWrapper httpServiceWrapper = _httpServiceWrappers.get(
+			bundle);
+
+		if (httpServiceWrapper != null) {
+			return httpServiceWrapper;
+		}
+
+		httpServiceWrapper = doGetService(bundle);
+
+		_httpServiceWrappers.put(bundle, httpServiceWrapper);
+
+		return httpServiceWrapper;
+	}
+
+	public BundleServletContext getWABBundleServletContext(Bundle bundle)
+		throws InvalidSyntaxException {
+
+		Filter filter = getFilter(bundle);
+
+		Collection<ServiceReference<BundleServletContext>> serviceReferences =
+			_bundleContext.getServiceReferences(
+				BundleServletContext.class, filter.toString());
+
+		Iterator<ServiceReference<BundleServletContext>> iterator =
+			serviceReferences.iterator();
+
+		if (iterator.hasNext()) {
+			ServiceReference<BundleServletContext> servletContextReference =
+				iterator.next();
+
+			return _bundleContext.getService(servletContextReference);
+		}
+
+		return null;
+	}
+
+	public WebExtenderServlet getWebExtenderServlet() {
+		return _webExtenderServlet;
+	}
+
+	public void ungetHttpService(Bundle bundle) {
+		HttpServiceWrapper httpServiceWrapper = _httpServiceWrappers.get(
+			bundle);
+
+		if (httpServiceWrapper == null) {
+			return;
+		}
+
+		BundleServletContext bundleServletContext =
+			httpServiceWrapper.getBundleServletContext();
+
+		bundleServletContext.close();
+
+		_httpServiceWrappers.remove(bundle);
+	}
+
+	protected HttpServiceWrapper doGetService(Bundle bundle) {
+		try {
+			BundleServletContext bundleServletContext = getBundleServletContext(
+				bundle);
+
+			if (bundleServletContext != null) {
+				return new HttpServiceWrapper(bundleServletContext);
+			}
+
+			bundleServletContext = getNonWABBundleServletContext(bundle);
+
+			return new NonWABHttpServiceWrapper(bundleServletContext);
+		}
+		catch (Exception ise) {
+			throw new IllegalStateException(ise);
+		}
+	}
+
+	protected BundleServletContext getNonWABBundleServletContext(Bundle bundle)
+		throws DocumentException {
+
+		BundleServletContext bundleServletContext = new BundleServletContext(
+			bundle, null, _webExtenderServlet.getServletContext());
+
+		bundleServletContext.open();
+
+		return bundleServletContext;
+	}
+
+	private BundleContext _bundleContext;
+	private Map<Bundle, HttpServiceWrapper> _httpServiceWrappers =
+		new HashMap<Bundle, HttpServiceWrapper>();
+	private WebExtenderServlet _webExtenderServlet;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/NonWABHttpServiceWrapper.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/NonWABHttpServiceWrapper.java
new file mode 100644
index 0000000..8d8e10f
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/NonWABHttpServiceWrapper.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.NamespaceException;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class NonWABHttpServiceWrapper extends HttpServiceWrapper {
+
+	public NonWABHttpServiceWrapper(BundleServletContext bundleServletContext) {
+		super(bundleServletContext);
+	}
+
+
+	public void registerFilter(
+			String filterName, List<String> urlPatterns, Filter filter,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		super.registerFilter(
+			filterName, urlPatterns, filter, initParameters, httpContext);
+
+		_registrations.add(filterName);
+	}
+
+
+	public void registerListener(
+		Object listener, Map<String, String> initParameters,
+		HttpContext httpContext) {
+
+		if (httpContext == null) {
+			httpContext = createDefaultHttpContext();
+		}
+
+		bundleServletContext.registerListener(
+			listener, initParameters, httpContext);
+
+		_registrations.add(listener);
+	}
+
+
+	public void registerResources(
+			String alias, String name, HttpContext httpContext)
+		throws NamespaceException {
+
+		if (httpContext == null) {
+			httpContext = createDefaultHttpContext();
+		}
+
+		bundleServletContext.registerResources(alias, name, httpContext);
+
+		_registrations.add(alias);
+	}
+
+
+	public void registerServlet(
+			String servletName, List<String> urlPatterns, Servlet servlet,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		super.registerServlet(
+			servletName, urlPatterns, servlet, initParameters, httpContext);
+
+		_registrations.add(servletName);
+	}
+
+
+	public void registerServlet(
+			String urlPattern, Servlet servlet,
+			@SuppressWarnings("rawtypes") Dictionary initParameters,
+			HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		// This method is not called by Liferay directly, but is made available
+		// for other OSGi modules that depend on the HTTP service
+
+		super.registerServlet(urlPattern, servlet, initParameters, httpContext);
+
+		_registrations.add(urlPattern);
+	}
+
+
+	public void unregister(String servletName) {
+		unregisterServlet(servletName);
+	}
+
+
+	public void unregisterFilter(String filterName) {
+		super.unregisterFilter(filterName);
+
+		removeRegistration(filterName);
+	}
+
+
+	public void unregisterListener(Object listener) {
+		bundleServletContext.unregisterListener(listener);
+
+		removeRegistration(listener);
+	}
+
+
+	public void unregisterServlet(String servletName) {
+		super.unregisterServlet(servletName);
+
+		removeRegistration(servletName);
+	}
+
+	protected void removeRegistration(Object object) {
+		_registrations.remove(object);
+	}
+
+	private List<Object> _registrations = new ArrayList<Object>();
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/PortalHttpContext.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/PortalHttpContext.java
new file mode 100644
index 0000000..89193d8
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/PortalHttpContext.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.util.MimeTypesUtil;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class PortalHttpContext implements HttpContext {
+
+	public PortalHttpContext(ServletContext servletContext) {
+		_servletContext = servletContext;
+	}
+
+
+	public String getMimeType(String name) {
+		String mimeType = _servletContext.getMimeType(name);
+
+		if (mimeType == null) {
+			mimeType = MimeTypesUtil.getContentType(name);
+		}
+
+		return mimeType;
+	}
+
+
+	public URL getResource(String path) {
+		try {
+			return _servletContext.getResource(path);
+		}
+		catch (MalformedURLException mue) {
+			_log.error(mue, mue);
+		}
+
+		return null;
+	}
+
+
+	public boolean handleSecurity(
+		HttpServletRequest request, HttpServletResponse response) {
+
+		return true;
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(PortalHttpContext.class);
+
+	private ServletContext _servletContext;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/ServletTracker.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/ServletTracker.java
new file mode 100644
index 0000000..0b94448
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/http/ServletTracker.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+
+import java.util.Map;
+
+import javax.servlet.Servlet;
+
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class ServletTracker
+	extends BaseServiceTrackerCustomizer<Servlet, Servlet> {
+
+	public ServletTracker(HttpSupport httpSupport) {
+		super(httpSupport);
+	}
+
+
+	protected void registerService(
+			BundleServletContext bundleServletContext,
+			ServiceReference<Servlet> serviceReference, Servlet servlet,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws Exception {
+
+		String servletName = GetterUtil.getString(
+			serviceReference.getProperty("servletName"));
+
+		if (Validator.isNull(servletName)) {
+			servletName = String.valueOf(
+				serviceReference.getProperty(Constants.SERVICE_ID));
+		}
+
+		String urlPattern = GetterUtil.getString(
+			serviceReference.getProperty("urlPattern"));
+
+		if (Validator.isNull(urlPattern)) {
+			urlPattern = GetterUtil.getString(
+				serviceReference.getProperty("alias"));
+		}
+
+		if (Validator.isNull(urlPattern)) {
+			return;
+		}
+
+		if (!urlPattern.startsWith(StringPool.SLASH)) {
+			urlPattern = StringPool.SLASH.concat(urlPattern);
+		}
+
+		bundleServletContext.registerServlet(
+			servletName, urlPattern, servlet, initParameters, httpContext);
+	}
+
+
+	protected void unregisterService(
+		BundleServletContext bundleServletContext,
+		ServiceReference<Servlet> serviceReference) {
+
+		String servletName = GetterUtil.getString(
+			serviceReference.getProperty("servletName"));
+
+		if (Validator.isNull(servletName)) {
+			servletName = String.valueOf(
+				serviceReference.getProperty(Constants.SERVICE_ID));
+		}
+
+		bundleServletContext.unregisterServlet(servletName);
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleFilterChain.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleFilterChain.java
new file mode 100644
index 0000000..af5ccf3
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleFilterChain.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import com.liferay.portal.http.service.servlet.BundleServletConfig;
+
+import java.io.IOException;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ */
+public class BundleFilterChain implements FilterChain {
+
+	public void addFilter(Filter filter) {
+		_filters.add(filter);
+	}
+
+
+	public void doFilter(
+			ServletRequest servletRequest, ServletResponse servletResponse)
+		throws IOException, ServletException {
+
+		Filter filter = _filters.poll();
+
+		if (filter == null) {
+			ServletConfig servletConfig = _servlet.getServletConfig();
+
+			if (servletConfig instanceof BundleServletConfig) {
+				BundleServletConfig bundleServletConfig =
+					(BundleServletConfig)servletConfig;
+
+				HttpContext httpContext = bundleServletConfig.getHttpContext();
+
+				if (!httpContext.handleSecurity(
+						(HttpServletRequest)servletRequest,
+						(HttpServletResponse)servletResponse)) {
+
+					return;
+				}
+			}
+
+			_servlet.service(servletRequest, servletResponse);
+
+			return;
+		}
+
+		filter.doFilter(servletRequest, servletResponse, this);
+	}
+
+	public void setServlet(Servlet servlet) {
+		_servlet = servlet;
+	}
+
+	private Queue<Filter> _filters = new LinkedList<Filter>();
+	private Servlet _servlet;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleFilterConfig.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleFilterConfig.java
new file mode 100644
index 0000000..7a16a3b
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleFilterConfig.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class BundleFilterConfig implements FilterConfig {
+
+	public BundleFilterConfig(
+		ServletContext servletContext, String filterName,
+		Map<String, String> initParameters, HttpContext httpContext) {
+
+		_servletContext = servletContext;
+		_filterName = filterName;
+		_initParameters = initParameters;
+		_httpContext = httpContext;
+	}
+
+
+	public String getFilterName() {
+		return _filterName;
+	}
+
+	public HttpContext getHttpContext() {
+		return _httpContext;
+	}
+
+
+	public String getInitParameter(String parameter) {
+		return _initParameters.get(parameter);
+	}
+
+
+	public Enumeration<String> getInitParameterNames() {
+		return Collections.enumeration(_initParameters.keySet());
+	}
+
+
+	public ServletContext getServletContext() {
+		return _servletContext;
+	}
+
+	private String _filterName;
+	private HttpContext _httpContext;
+	private Map<String, String> _initParameters;
+	private ServletContext _servletContext;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleRequestDispatcher.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleRequestDispatcher.java
new file mode 100644
index 0000000..33e4543
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleRequestDispatcher.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import com.liferay.portal.kernel.util.JavaConstants;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.util.ClassLoaderUtil;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import java.net.URLDecoder;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class BundleRequestDispatcher implements RequestDispatcher {
+
+	public BundleRequestDispatcher(
+		String servletMapping, boolean extensionMapping, String requestURI,
+		BundleServletContext bundleServletContext) {
+
+		_servletMapping = servletMapping;
+		_extensionMapping = extensionMapping;
+		_requestURI = StringUtil.replace(
+			requestURI, StringPool.DOUBLE_SLASH, StringPool.SLASH);
+		_bundleServletContext = bundleServletContext;
+
+		if (!_extensionMapping) {
+			_servletPath = _servletMapping;
+		}
+		else {
+			_servletPath = _requestURI;
+		}
+
+		if ((_servletPath != null) &&
+			_requestURI.startsWith(_servletPath) &&
+			(_requestURI.length() > _servletPath.length())) {
+
+			_pathInfo = _requestURI.substring(_servletPath.length());
+
+			try {
+				_pathInfo = URLDecoder.decode(_pathInfo, StringPool.UTF8);
+			}
+			catch (UnsupportedEncodingException uee) {
+				throw new RuntimeException(uee);
+			}
+		}
+	}
+
+	public void doDispatch(
+			ServletRequest servletRequest, ServletResponse servletResponse,
+			DispatcherType dispatcherType)
+		throws IOException, ServletException {
+
+		ClassLoader contextClassLoader =
+			ClassLoaderUtil.getContextClassLoader();
+
+		try {
+			ClassLoader pluginClassLoader =
+				_bundleServletContext.getClassLoader();
+
+			ClassLoaderUtil.setContextClassLoader(pluginClassLoader);
+
+			for (ServletRequestListener servletRequestListener :
+					_bundleServletContext.getServletRequestListeners()) {
+
+				ServletRequestEvent servletRequestEvent =
+					new ServletRequestEvent(
+						_bundleServletContext, servletRequest);
+
+				servletRequestListener.requestInitialized(servletRequestEvent);
+			}
+
+			BundleFilterChain bundleFilterChain =
+				_bundleServletContext.getFilterChain(
+					_requestURI, dispatcherType);
+
+			bundleFilterChain.doFilter(servletRequest, servletResponse);
+
+			for (ServletRequestListener servletRequestListener :
+					_bundleServletContext.getServletRequestListeners()) {
+
+				ServletRequestEvent servletRequestEvent =
+					new ServletRequestEvent(
+						_bundleServletContext, servletRequest);
+
+				servletRequestListener.requestDestroyed(servletRequestEvent);
+			}
+		}
+		finally {
+			ClassLoaderUtil.setContextClassLoader(contextClassLoader);
+		}
+	}
+
+
+	public void forward(
+			ServletRequest servletRequest, ServletResponse servletResponse)
+		throws IOException, ServletException {
+
+		BundleServletRequest bundleServletRequest = new BundleServletRequest(
+			this, (HttpServletRequest)servletRequest);
+
+		doDispatch(
+			bundleServletRequest, servletResponse, DispatcherType.FORWARD);
+	}
+
+
+	public void include(
+			ServletRequest servletRequest, ServletResponse servletResponse)
+		throws IOException, ServletException {
+
+		BundleServletRequest bundleServletRequest = new BundleServletRequest(
+			this, (HttpServletRequest)servletRequest);
+
+		String contextPath = _bundleServletContext.getContextPath();
+
+		if (_requestURI != null) {
+			bundleServletRequest.setAttribute(
+				JavaConstants.JAVAX_SERVLET_INCLUDE_REQUEST_URI,
+				_bundleServletContext.getContextPath().concat(_requestURI));
+		}
+
+		if (contextPath != null) {
+			bundleServletRequest.setAttribute(
+				JavaConstants.JAVAX_SERVLET_INCLUDE_CONTEXT_PATH, contextPath);
+		}
+
+		if (_servletPath != null) {
+			bundleServletRequest.setAttribute(
+				JavaConstants.JAVAX_SERVLET_INCLUDE_SERVLET_PATH, _servletPath);
+		}
+
+		if (_queryString != null) {
+			bundleServletRequest.setAttribute(
+				JavaConstants.JAVAX_SERVLET_INCLUDE_QUERY_STRING, _queryString);
+		}
+
+		if (_pathInfo != null) {
+			bundleServletRequest.setAttribute(
+				JavaConstants.JAVAX_SERVLET_INCLUDE_PATH_INFO, _pathInfo);
+		}
+
+		doDispatch(
+			bundleServletRequest, servletResponse, DispatcherType.INCLUDE);
+	}
+
+	protected BundleServletContext getBundleServletContext() {
+		return _bundleServletContext;
+	}
+
+	protected String getPathInfo() {
+		return _pathInfo;
+	}
+
+	protected String getRequestURI() {
+		return _requestURI;
+	}
+
+	protected String getServletPath() {
+		return _servletPath;
+	}
+
+	private BundleServletContext _bundleServletContext;
+	private boolean _extensionMapping;
+	private String _pathInfo;
+	private String _queryString;
+	private String _requestURI;
+	private String _servletMapping;
+	private String _servletPath;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleServletContext.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleServletContext.java
new file mode 100644
index 0000000..8df2cbb
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleServletContext.java
@@ -0,0 +1,1315 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import com.liferay.portal.apache.bridges.struts.LiferayServletContext;
+import com.liferay.portal.http.service.internal.http.DefaultHttpContext;
+import com.liferay.portal.http.service.internal.http.HttpServiceTracker;
+import com.liferay.portal.http.service.servlet.BundleServletConfig;
+import com.liferay.portal.http.service.servlet.ResourceServlet;
+import com.liferay.portal.kernel.deploy.hot.DependencyManagementThreadLocal;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.servlet.PluginContextListener;
+import com.liferay.portal.kernel.servlet.PortletSessionListenerManager;
+import com.liferay.portal.kernel.servlet.ServletContextPool;
+import com.liferay.portal.kernel.util.FileUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.HttpUtil;
+import com.liferay.portal.kernel.util.JavaConstants;
+import com.liferay.portal.kernel.util.PropertiesUtil;
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.xml.Document;
+import com.liferay.portal.kernel.xml.DocumentException;
+import com.liferay.portal.kernel.xml.Element;
+import com.liferay.portal.kernel.xml.SAXReaderUtil;
+import com.liferay.portal.struts.AuthPublicPathRegistry;
+import com.liferay.portal.util.Portal;
+import com.liferay.portal.util.PortalUtil;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.net.URL;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterConfig;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextAttributeEvent;
+import javax.servlet.ServletContextAttributeListener;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequestAttributeListener;
+import javax.servlet.ServletRequestListener;
+import javax.servlet.http.HttpSessionActivationListener;
+import javax.servlet.http.HttpSessionAttributeListener;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionListener;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.NamespaceException;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class BundleServletContext
+	extends LiferayServletContext implements BundleReference {
+
+	public static String getServletContextName(Bundle bundle) {
+		return getServletContextName(bundle, false);
+	}
+
+	public static String getServletContextName(
+		Bundle bundle, boolean generate) {
+
+		Dictionary<String, String> headers = bundle.getHeaders();
+
+		String webContextPath = headers.get("Web-ContextPath");
+
+		if (Validator.isNotNull(webContextPath)) {
+			return webContextPath.substring(1);
+		}
+
+		String deploymentContext = null;
+
+		try {
+			String pluginPackageXml = HttpUtil.URLtoString(
+				bundle.getResource("/WEB-INF/liferay-plugin-package.xml"));
+
+			if (pluginPackageXml != null) {
+				Document document = SAXReaderUtil.read(pluginPackageXml);
+
+				Element rootElement = document.getRootElement();
+
+				deploymentContext = GetterUtil.getString(
+					rootElement.elementText("recommended-deployment-context"));
+			}
+			else {
+				String pluginPackageProperties = HttpUtil.URLtoString(
+					bundle.getResource(
+						"/WEB-INF/liferay-plugin-package.properties"));
+
+				if (pluginPackageProperties != null) {
+					if (_log.isDebugEnabled()) {
+						_log.debug(
+							"Reading plugin package from " +
+								"liferay-plugin-package.properties");
+					}
+
+					Properties properties = PropertiesUtil.load(
+						pluginPackageProperties);
+
+					deploymentContext = GetterUtil.getString(
+						properties.getProperty(
+							"recommended-deployment-context"),
+						deploymentContext);
+				}
+			}
+		}
+		catch (Exception e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn(e, e);
+			}
+		}
+
+		if (Validator.isNull(deploymentContext) && generate) {
+			deploymentContext = PortalUtil.getJsSafePortletId(
+				bundle.getSymbolicName());
+		}
+
+		if (Validator.isNotNull(deploymentContext) &&
+			deploymentContext.startsWith(StringPool.SLASH)) {
+
+			deploymentContext = deploymentContext.substring(1);
+		}
+
+		return deploymentContext;
+	}
+
+	public BundleServletContext(
+		Bundle bundle, String servletContextName,
+		ServletContext servletContext) {
+
+		super(servletContext);
+
+		_bundle = bundle;
+
+		if (servletContextName == null) {
+			_servletContextName = StringPool.BLANK;
+		}
+		else {
+			_servletContextName = servletContextName;
+		}
+
+		_httpContext = new DefaultHttpContext(_bundle);
+	}
+
+	public void close() {
+		ServletContextPool.remove(_servletContextName);
+
+		_httpServiceTracker.close();
+
+		try {
+			_serviceRegistration.unregister();
+		}
+		catch (IllegalStateException ies) {
+			if (_log.isInfoEnabled()) {
+				_log.info("The service is already unregistered");
+			}
+		}
+
+		if (_tempDir != null) {
+			FileUtil.deltree(_tempDir);
+		}
+	}
+
+
+	public Object getAttribute(String name) {
+		if (name.equals(JavaConstants.JAVAX_SERVLET_CONTEXT_TEMPDIR)) {
+			return getTempDir();
+		}
+		else if (name.equals("osgi-bundle")) {
+			return _bundle;
+		}
+		else if (name.equals("osgi-bundlecontext")) {
+			return _bundle.getBundleContext();
+		}
+
+		Object value = _contextAttributes.get(name);
+
+		if (value == null) {
+			if (name.equals(PluginContextListener.PLUGIN_CLASS_LOADER)) {
+				return getClassLoader();
+			}
+			else if (name.equals("org.apache.catalina.JSP_PROPERTY_GROUPS")) {
+				value = new HashMap<Object, Object>();
+
+				_contextAttributes.put(name, value);
+			}
+			else if (name.equals("org.apache.tomcat.InstanceManager")) {
+				return super.getAttribute(name);
+			}
+		}
+
+		return value;
+	}
+
+
+	public Bundle getBundle() {
+		return _bundle;
+	}
+
+
+	public ClassLoader getClassLoader() {
+		ClassLoader classLoader = (ClassLoader)_contextAttributes.get(
+			PluginContextListener.PLUGIN_CLASS_LOADER);
+
+		if (classLoader == null) {
+			BundleWiring bundleWiring = _bundle.adapt(BundleWiring.class);
+
+			classLoader = bundleWiring.getClassLoader();
+
+			_contextAttributes.put(
+				PluginContextListener.PLUGIN_CLASS_LOADER, classLoader);
+		}
+
+		return classLoader;
+	}
+
+
+	public String getContextPath() {
+		if (_contextPath != null) {
+			return _contextPath;
+		}
+
+		StringBundler sb = new StringBundler(4);
+
+		sb.append(PortalUtil.getPathContext());
+		sb.append(Portal.PATH_MODULE);
+		sb.append(StringPool.SLASH);
+
+		String servletContextName = getServletContextName();
+
+		if (Validator.isNotNull(servletContextName)) {
+			sb.append(servletContextName);
+		}
+
+		_contextPath = sb.toString();
+
+		return _contextPath;
+	}
+
+	public BundleFilterChain getFilterChain(
+		String path, DispatcherType dispatcherType) {
+
+		BundleFilterChain bundleFilterChain = new BundleFilterChain();
+
+		for (FilterServiceRanking filterServiceRanking :
+				_filterServiceRankings) {
+
+			if (!matchDispatcherType(filterServiceRanking, dispatcherType)) {
+				continue;
+			}
+
+			String filterName = filterServiceRanking.getFilterName();
+
+			Filter filter = _filtersByFilterNames.get(filterName);
+
+			List<String> urlPatterns = filterServiceRanking.getUrlPatterns();
+
+			for (String urlPattern : urlPatterns) {
+				if (urlPattern.equals(path)) {
+					bundleFilterChain.addFilter(filter);
+
+					break;
+				}
+
+				if (urlPattern.contains(StringPool.STAR)) {
+					urlPattern = urlPattern.replaceAll(
+						"\\".concat(StringPool.STAR), ".*");
+				}
+
+				if (path.matches(urlPattern)) {
+					bundleFilterChain.addFilter(filter);
+				}
+			}
+		}
+
+		ExtensionMapping extensionMapping = getMatchingServletKey(path);
+
+		Servlet servlet = _servletsByURLPatterns.get(
+			extensionMapping.getPath());
+
+		bundleFilterChain.setServlet(servlet);
+
+		return bundleFilterChain;
+	}
+
+	public HttpContext getHttpContext() {
+		return _httpContext;
+	}
+
+
+	public String getInitParameter(String name) {
+		return _initParameters.get(name);
+	}
+
+
+	public Enumeration<String> getInitParameterNames() {
+		return Collections.enumeration(_initParameters.keySet());
+	}
+
+	public ExtensionMapping getMatchingServletKey(String path) {
+		if (_servletsByURLPatterns.containsKey(path)) {
+			return new ExtensionMapping(false, path);
+		}
+
+		String extension = StringUtil.toLowerCase(FileUtil.getExtension(path));
+
+		boolean extensionMapping = false;
+
+		if (Validator.isNotNull(extension)) {
+			extension = "*.".concat(extension);
+
+			extensionMapping = true;
+		}
+
+		String alias = path.substring(0, path.lastIndexOf(StringPool.SLASH));
+
+		while (alias.length() != 0) {
+			if (_servletsByURLPatterns.containsKey(alias)) {
+				return new ExtensionMapping(false, alias);
+			}
+			else if (_servletsByURLPatterns.containsKey(
+						alias.concat(extension))) {
+
+				return new ExtensionMapping(true, alias.concat(extension));
+			}
+
+			alias = path.substring(0, alias.lastIndexOf(StringPool.SLASH));
+		}
+
+		if (_servletsByURLPatterns.containsKey(
+				StringPool.SLASH.concat(extension))) {
+
+			return new ExtensionMapping(
+				extensionMapping, StringPool.SLASH.concat(extension));
+		}
+
+		if (_servletsByURLPatterns.containsKey(StringPool.SLASH)) {
+			return new ExtensionMapping(false, StringPool.SLASH);
+		}
+
+		return null;
+	}
+
+
+	public String getRealPath(String path) {
+		URL url = _httpContext.getResource(path);
+
+		if (url != null) {
+			return url.toExternalForm();
+		}
+
+		return path;
+	}
+
+
+	public RequestDispatcher getRequestDispatcher(String path) {
+		String contextPath = getContextPath();
+
+		String portalContextPath = PortalUtil.getPathContext();
+
+		if (Validator.isNotNull(portalContextPath)) {
+			if (contextPath.startsWith(portalContextPath)) {
+				contextPath = contextPath.substring(portalContextPath.length());
+			}
+
+			if (path.startsWith(portalContextPath)) {
+				path = path.substring(portalContextPath.length());
+			}
+		}
+
+		if (path.startsWith(contextPath)) {
+			path = path.substring(contextPath.length());
+		}
+
+		if (Validator.isNull(path)) {
+			path = StringPool.SLASH;
+		}
+
+		if (!isValidPath(path)) {
+			return null;
+		}
+
+		ExtensionMapping extensionMapping = getMatchingServletKey(path);
+
+		if (extensionMapping != null) {
+			return new BundleRequestDispatcher(
+				extensionMapping.getPath(), extensionMapping.isExtension(),
+				path, this);
+		}
+
+		return null;
+	}
+
+
+	public URL getResource(String path) {
+		return _httpContext.getResource(path);
+	}
+
+
+	public InputStream getResourceAsStream(String path) {
+		try {
+			URL url = getResource(path);
+
+			if (url != null) {
+				return url.openStream();
+			}
+		}
+		catch (IOException ioe) {
+			_log.error(ioe, ioe);
+		}
+
+		return null;
+	}
+
+
+	public Set<String> getResourcePaths(String path) {
+		Set<String> paths = new HashSet<String>();
+
+		Enumeration<String> enumeration = _bundle.getEntryPaths(path);
+
+		if (enumeration == null) {
+			return Collections.emptySet();
+		}
+
+		while (enumeration.hasMoreElements()) {
+			String entryPath = enumeration.nextElement();
+
+			paths.add(StringPool.SLASH.concat(entryPath));
+		}
+
+		return paths;
+	}
+
+
+	public Servlet getServlet(String name) {
+		return _servletsByServletNames.get(name);
+	}
+
+
+	public String getServletContextName() {
+		return _servletContextName;
+	}
+
+	public List<ServletRequestAttributeListener>
+		getServletRequestAttributeListeners() {
+
+		return _servletRequestAttributeListeners;
+	}
+
+	public List<ServletRequestListener> getServletRequestListeners() {
+		return _servletRequestListeners;
+	}
+
+	public void open() throws DocumentException {
+		Hashtable<String, Object> properties = new Hashtable<String, Object>();
+
+		properties.put("bundle", _bundle);
+		properties.put("bundle.id", _bundle.getBundleId());
+		properties.put("bundle.symbolicName", _bundle.getSymbolicName());
+		properties.put("bundle.version", _bundle.getVersion());
+		properties.put("Web-ContextPath", getContextPath());
+
+		BundleContext bundleContext = _bundle.getBundleContext();
+
+		_serviceRegistration =
+			(ServiceRegistration<ServletContext>)
+				bundleContext.registerService(
+					new String[] {
+						BundleServletContext.class.getName(),
+						ServletContext.class.getName()
+					},
+					this, properties);
+
+		_httpServiceTracker = new HttpServiceTracker(bundleContext, _bundle);
+
+		_httpServiceTracker.open();
+	}
+
+	public void registerFilter(
+			String filterName, List<String> urlPatterns, Filter filter,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		validateFilter(filterName, filter, urlPatterns, httpContext);
+
+		Thread currentThread = Thread.currentThread();
+
+		ClassLoader contextClassLoader = currentThread.getContextClassLoader();
+
+		try {
+			currentThread.setContextClassLoader(getClassLoader());
+
+			FilterConfig filterConfig = new BundleFilterConfig(
+				this, filterName, initParameters, httpContext);
+
+			filter.init(filterConfig);
+
+			_filtersByFilterNames.put(filterName, filter);
+
+			if (_log.isInfoEnabled()) {
+				_log.info("Registered filter " + filterName);
+			}
+
+			for (String urlPattern : urlPatterns) {
+				_filtersByURLPatterns.put(urlPattern, filter);
+
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"Mapped filter " + filterName + " to " +
+							getContextPath() + urlPattern);
+				}
+			}
+
+			FilterServiceRanking filterServiceRanking =
+				new FilterServiceRanking();
+
+			filterServiceRanking.setFilterName(filterName);
+
+			int serviceRanking = _FILTER_SERVICE_RANKING_DEFAULT;
+
+			if (initParameters != null) {
+				serviceRanking = GetterUtil.getInteger(
+					initParameters.remove("service.ranking"),
+					_FILTER_SERVICE_RANKING_DEFAULT);
+			}
+
+			filterServiceRanking.setServiceRanking(serviceRanking);
+			filterServiceRanking.setUrlPattterns(urlPatterns);
+			filterServiceRanking.setDispatcherType(
+				getDispatcher(initParameters));
+
+			// Filters are sorted based on their service ranking value where the
+			// default service ranking is 10 for those filters that do not
+			// specify a specific service ranking.
+
+			// Filters are first sorted based on the service ranking where
+			// filters with a smaller service ranking appear earlier in the
+			// list, and then based on when the filter was registered where
+			// those that are registered earlier appear earlier in the list.
+
+			_filterServiceRankings.add(filterServiceRanking);
+		}
+		finally {
+			currentThread.setContextClassLoader(contextClassLoader);
+		}
+	}
+
+	public void registerFilter(
+			String filterName, String urlPattern, Filter filter,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		List<String> urlPatterns = Arrays.asList(urlPattern);
+
+		registerFilter(
+			filterName, urlPatterns, filter, initParameters, httpContext);
+	}
+
+	public void registerListener(
+		Object listener, Map<String, String> initParameters,
+		HttpContext httpContext) {
+
+		Thread currentThread = Thread.currentThread();
+
+		ClassLoader contextClassLoader = currentThread.getContextClassLoader();
+
+		boolean enabled = DependencyManagementThreadLocal.isEnabled();
+
+		try {
+			currentThread.setContextClassLoader(getClassLoader());
+
+			DependencyManagementThreadLocal.setEnabled(false);
+
+			if (initParameters != null) {
+				Set<Entry<String, String>> set = initParameters.entrySet();
+
+				Iterator<Entry<String, String>> iterator = set.iterator();
+
+				while (iterator.hasNext()) {
+					Entry<String, String> entry = iterator.next();
+
+					String value = entry.getValue();
+
+					if (_initParameters.containsKey(value)) {
+						continue;
+					}
+
+					_initParameters.put(entry.getKey(), value);
+				}
+			}
+
+			if (listener instanceof HttpSessionActivationListener) {
+				PortletSessionListenerManager.addHttpSessionActivationListener(
+					(HttpSessionActivationListener)listener);
+			}
+
+			if (listener instanceof HttpSessionAttributeListener) {
+				PortletSessionListenerManager.addHttpSessionAttributeListener(
+					(HttpSessionAttributeListener)listener);
+			}
+
+			if (listener instanceof HttpSessionBindingListener) {
+				PortletSessionListenerManager.addHttpSessionBindingListener(
+					(HttpSessionBindingListener)listener);
+			}
+
+			if (listener instanceof HttpSessionListener) {
+				PortletSessionListenerManager.addHttpSessionListener(
+					(HttpSessionListener)listener);
+			}
+
+			if (listener instanceof ServletContextAttributeListener) {
+				_servletContextAttributeListeners.add(
+					(ServletContextAttributeListener)listener);
+			}
+
+			if (listener instanceof ServletContextListener) {
+				ServletContextListener servletContextListener =
+					(ServletContextListener)listener;
+
+				ServletContextEvent servletContextEvent =
+					new ServletContextEvent(this);
+
+				servletContextListener.contextInitialized(servletContextEvent);
+
+				_servletContextListeners.add(servletContextListener);
+			}
+
+			if (listener instanceof ServletRequestAttributeListener) {
+				_servletRequestAttributeListeners.add(
+					(ServletRequestAttributeListener)listener);
+			}
+
+			if (listener instanceof ServletRequestListener) {
+				_servletRequestListeners.add((ServletRequestListener)listener);
+			}
+		}
+		finally {
+			DependencyManagementThreadLocal.setEnabled(enabled);
+
+			currentThread.setContextClassLoader(contextClassLoader);
+		}
+	}
+
+	public void registerResources(
+			String alias, String name, HttpContext httpContext)
+		throws NamespaceException {
+
+		Map<String, String> initParameters = new Hashtable<String, String>();
+
+		initParameters.put("alias", alias);
+
+		if (name == null) {
+			throw new IllegalArgumentException("Name is null");
+		}
+
+		if (name.endsWith(StringPool.SLASH) && !name.equals(StringPool.SLASH)) {
+			throw new IllegalArgumentException("Invalid name " + name);
+		}
+
+		initParameters.put("name", name);
+
+		Servlet resourceServlet = new ResourceServlet();
+
+		try {
+			registerServlet(
+				name, alias, resourceServlet, initParameters, httpContext);
+
+			StringBundler sb = new StringBundler(4);
+
+			sb.append(Portal.PATH_MODULE);
+			sb.append(StringPool.SLASH);
+
+			String servletContextName = getServletContextName();
+
+			if (Validator.isNotNull(servletContextName)) {
+				sb.append(servletContextName);
+			}
+
+			sb.append(alias);
+
+			AuthPublicPathRegistry.register(sb.toString());
+		}
+		catch (ServletException se) {
+			throw new IllegalArgumentException(se);
+		}
+	}
+
+	public void registerServlet(
+			String servletName, List<String> urlPatterns, Servlet servlet,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		validateServlet(servletName, servlet, urlPatterns, httpContext);
+
+		Thread currentThread = Thread.currentThread();
+
+		ClassLoader contextClassLoader = currentThread.getContextClassLoader();
+
+		try {
+			currentThread.setContextClassLoader(getClassLoader());
+
+			ServletConfig servletConfig = new BundleServletConfig(
+				this, servletName, initParameters, httpContext);
+
+			servlet.init(servletConfig);
+
+			_servletsByServletNames.put(servletName, servlet);
+
+			if (_log.isInfoEnabled()) {
+				_log.info("Registered servlet " + servletName);
+			}
+
+			for (String urlPattern : urlPatterns) {
+				_servletsByURLPatterns.put(urlPattern, servlet);
+
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"Mapped servlet " + servletName + " to " +
+							getContextPath() + urlPattern);
+				}
+			}
+		}
+		finally {
+			currentThread.setContextClassLoader(contextClassLoader);
+		}
+	}
+
+	public void registerServlet(
+			String servletName, String urlPattern, Servlet servlet,
+			Map<String, String> initParameters, HttpContext httpContext)
+		throws NamespaceException, ServletException {
+
+		List<String> urlPatterns = Arrays.asList(urlPattern);
+
+		registerServlet(
+			servletName, urlPatterns, servlet, initParameters, httpContext);
+	}
+
+
+	public void removeAttribute(String name) {
+		Object value = _contextAttributes.remove(name);
+
+		for (ServletContextAttributeListener servletContextAttributeListener :
+				_servletContextAttributeListeners) {
+
+			servletContextAttributeListener.attributeRemoved(
+				new ServletContextAttributeEvent(this, name, value));
+		}
+	}
+
+
+	public void setAttribute(String name, Object value) {
+		if (name.equals(JavaConstants.JAVAX_SERVLET_CONTEXT_TEMPDIR) ||
+			name.equals(PluginContextListener.PLUGIN_CLASS_LOADER)) {
+
+			return;
+		}
+
+		Object originalValue = _contextAttributes.get(name);
+
+		_contextAttributes.put(name, value);
+
+		for (ServletContextAttributeListener servletContextAttributeListener :
+				_servletContextAttributeListeners) {
+
+			ServletContextAttributeEvent servletContextAttributeEvent =
+				new ServletContextAttributeEvent(this, name, value);
+
+			if (originalValue != null) {
+				servletContextAttributeListener.attributeReplaced(
+					servletContextAttributeEvent);
+			}
+			else {
+				servletContextAttributeListener.attributeAdded(
+					servletContextAttributeEvent);
+			}
+		}
+	}
+
+	public void setServletContextName(String servletContextName) {
+		_servletContextName = servletContextName;
+	}
+
+	public void unregisterFilter(String filterName) {
+		Filter filter = _filtersByFilterNames.remove(filterName);
+
+		if (filter == null) {
+			return;
+		}
+
+		filter.destroy();
+
+		unregisterFilterByServiceRanking(filterName);
+		unregisterFilterByURLMapping(filterName, filter);
+	}
+
+	public void unregisterListener(Object listener) {
+		Thread currentThread = Thread.currentThread();
+
+		ClassLoader contextClassLoader = currentThread.getContextClassLoader();
+
+		boolean enabled = DependencyManagementThreadLocal.isEnabled();
+
+		try {
+			currentThread.setContextClassLoader(getClassLoader());
+
+			DependencyManagementThreadLocal.setEnabled(false);
+
+			if (listener instanceof HttpSessionActivationListener) {
+				PortletSessionListenerManager.
+					removeHttpSessionActivationListener(
+						(HttpSessionActivationListener)listener);
+			}
+
+			if (listener instanceof HttpSessionAttributeListener) {
+				PortletSessionListenerManager.
+					removeHttpSessionAttributeListener(
+						(HttpSessionAttributeListener)listener);
+			}
+
+			if (listener instanceof HttpSessionBindingListener) {
+				PortletSessionListenerManager.removeHttpSessionBindingListener(
+					(HttpSessionBindingListener)listener);
+			}
+
+			if (listener instanceof HttpSessionListener) {
+				PortletSessionListenerManager.removeHttpSessionListener(
+					(HttpSessionListener)listener);
+			}
+
+			if (listener instanceof ServletContextAttributeListener) {
+				_servletContextAttributeListeners.remove(listener);
+			}
+
+			if (listener instanceof ServletContextListener) {
+				if (_servletContextListeners.contains(listener)) {
+					_servletContextListeners.remove(listener);
+
+					ServletContextListener servletContextListener =
+						(ServletContextListener)listener;
+
+					ServletContextEvent servletContextEvent =
+						new ServletContextEvent(this);
+
+					servletContextListener.contextDestroyed(
+						servletContextEvent);
+				}
+			}
+
+			if (listener instanceof ServletRequestAttributeListener) {
+				_servletRequestAttributeListeners.remove(listener);
+			}
+
+			if (listener instanceof ServletRequestListener) {
+				_servletRequestListeners.remove(listener);
+			}
+		}
+		finally {
+			DependencyManagementThreadLocal.setEnabled(enabled);
+
+			currentThread.setContextClassLoader(contextClassLoader);
+		}
+	}
+
+	public void unregisterServlet(String servletName) {
+		Servlet servlet = _servletsByServletNames.remove(servletName);
+
+		if (servlet == null) {
+			return;
+		}
+
+		servlet.destroy();
+
+		Set<Map.Entry<String, Servlet>> set = _servletsByURLPatterns.entrySet();
+
+		Iterator<Map.Entry<String, Servlet>> iterator = set.iterator();
+
+		while (iterator.hasNext()) {
+			Map.Entry<String, Servlet> entry = iterator.next();
+
+			Servlet curServlet = entry.getValue();
+
+			if (curServlet != servlet) {
+				continue;
+			}
+
+			StringBundler sb = new StringBundler(4);
+
+			sb.append(Portal.PATH_MODULE);
+			sb.append(StringPool.SLASH);
+
+			String servletContextName = getServletContextName();
+
+			if (Validator.isNotNull(servletContextName)) {
+				sb.append(servletContextName);
+			}
+
+			String alias = entry.getKey();
+
+			sb.append(alias);
+
+			AuthPublicPathRegistry.unregister(alias);
+
+			iterator.remove();
+
+			if (_log.isInfoEnabled()) {
+				String urlPattern = entry.getKey();
+
+				_log.info("Unmapped servlet " + servletName + " from " + alias);
+			}
+		}
+
+		if (_log.isInfoEnabled()) {
+			_log.info("Unregistered servlet " + servletName);
+		}
+	}
+
+	protected DispatcherType getDispatcher(Map<String, String> parameters) {
+		if (parameters == null) {
+			return DispatcherType.REQUEST;
+		}
+
+		String dispatcher = parameters.get("dispatcher");
+
+		if (DispatcherType.ASYNC.name().equals(dispatcher)) {
+			return DispatcherType.ASYNC;
+		}
+		else if (DispatcherType.ERROR.name().equals(dispatcher)) {
+			return DispatcherType.ERROR;
+		}
+		else if (DispatcherType.FORWARD.name().equals(dispatcher)) {
+			return DispatcherType.FORWARD;
+		}
+		else if (DispatcherType.INCLUDE.name().equals(dispatcher)) {
+			return DispatcherType.INCLUDE;
+		}
+
+		return DispatcherType.REQUEST;
+	}
+
+	protected File getTempDir() {
+		if (_tempDir != null) {
+			return _tempDir;
+		}
+
+		File parentTempDir = (File)super.getAttribute(
+			JavaConstants.JAVAX_SERVLET_CONTEXT_TEMPDIR);
+
+		String fileName = getServletContextName();
+
+		if (Validator.isNull(fileName)) {
+			fileName = String.valueOf(_bundle.getBundleId());
+		}
+
+		File tempDir = new File(parentTempDir, fileName);
+
+		if (!tempDir.exists() && !tempDir.mkdirs()) {
+			throw new IllegalStateException(
+				"Unable to make temporary directory " + tempDir);
+		}
+
+		_tempDir = tempDir;
+
+		return _tempDir;
+	}
+
+	protected boolean isValidPath(String path) {
+		if (!path.startsWith(StringPool.SLASH)) {
+			path = StringPool.SLASH.concat(path);
+		}
+
+		for (String illegalPath : _ILLEGAL_PATHS) {
+			if (path.startsWith(illegalPath)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	protected boolean matchDispatcherType(
+		FilterServiceRanking filterServiceRanking,
+		DispatcherType dispatcherType) {
+
+		DispatcherType targetDispatcherType =
+			filterServiceRanking.getDispatcherType();
+
+		return targetDispatcherType.equals(dispatcherType);
+	}
+
+	protected void unregisterFilterByServiceRanking(String filterName) {
+		Iterator<FilterServiceRanking> iterator =
+			_filterServiceRankings.iterator();
+
+		while (iterator.hasNext()) {
+			FilterServiceRanking filterServiceRanking = iterator.next();
+
+			if (!filterName.equals(filterServiceRanking.getFilterName())) {
+				continue;
+			}
+
+			iterator.remove();
+		}
+	}
+
+	protected void unregisterFilterByURLMapping(
+		String filterName, Filter filter) {
+
+		Set<Map.Entry<String, Filter>> set = _filtersByURLPatterns.entrySet();
+
+		Iterator<Map.Entry<String, Filter>> iterator = set.iterator();
+
+		while (iterator.hasNext()) {
+			Map.Entry<String, Filter> entry = iterator.next();
+
+			Filter curFilter = entry.getValue();
+
+			if (curFilter != filter) {
+				continue;
+			}
+
+			iterator.remove();
+
+			if (_log.isInfoEnabled()) {
+				String urlPattern = entry.getKey();
+
+				_log.info(
+					"Unmapped filter " + filterName + " from " + urlPattern);
+			}
+		}
+
+		if (_log.isInfoEnabled()) {
+			_log.info("Unregistered filter " + filterName);
+		}
+	}
+
+	protected void validateFilter(
+			String filterName, Filter filter, List<String> urlPatterns,
+			HttpContext httpContext)
+		throws NamespaceException {
+
+		if (filter == null) {
+			throw new IllegalArgumentException("Filter must not be null");
+		}
+
+		Filter registeredFilter = _filtersByFilterNames.get(filterName);
+
+		if ((registeredFilter != null) && (registeredFilter != filter)) {
+			throw new NamespaceException(
+				"A filter is already registered with the name " + filterName);
+		}
+
+		for (String urlPattern : urlPatterns) {
+			validateURLPattern(urlPattern);
+		}
+	}
+
+	protected void validateServlet(
+			String servletName, Servlet servlet, List<String> urlPatterns,
+			HttpContext httpContext)
+		throws NamespaceException {
+
+		if (servlet == null) {
+			throw new IllegalArgumentException("Servlet must not be null");
+		}
+
+		Servlet registeredServlet = _servletsByServletNames.get(servletName);
+
+		if ((registeredServlet != null) && (registeredServlet != servlet)) {
+			throw new NamespaceException(
+				"A servlet is already registered with the name " + servletName);
+		}
+
+		for (String urlPattern : urlPatterns) {
+			validateURLPattern(urlPattern);
+
+			if (_servletsByURLPatterns.containsKey(urlPattern)) {
+				throw new NamespaceException(
+					"A servlet is already registered with the URL pattern " +
+						urlPattern);
+			}
+		}
+	}
+
+	protected void validateURLPattern(String urlPattern) {
+		if (Validator.isNull(urlPattern)) {
+			throw new IllegalArgumentException(
+				"An empty URL pattern is not allowed");
+		}
+
+		if (!urlPattern.startsWith(StringPool.SLASH) ||
+			(urlPattern.endsWith(StringPool.SLASH) &&
+			 !urlPattern.equals(StringPool.SLASH))) {
+
+			throw new IllegalArgumentException(
+				"URL patterns must start with / but cannot end with it");
+		}
+	}
+
+	private static final int _FILTER_SERVICE_RANKING_DEFAULT = 10;
+
+	private static final String[] _ILLEGAL_PATHS = new String[] {
+		"/META-INF/", "/OSGI-INF/", "/OSGI-OPT/", "/WEB-INF/"
+	};
+
+	private static final String _PATH_MODULE_SLASH =
+		Portal.PATH_MODULE + StringPool.SLASH;
+
+	private static Log _log = LogFactoryUtil.getLog(BundleServletContext.class);
+
+	private Bundle _bundle;
+	private Map<String, Object> _contextAttributes =
+		new ConcurrentHashMap<String, Object>();
+	private String _contextPath;
+	private Map<String, Filter> _filtersByFilterNames =
+		new ConcurrentHashMap<String, Filter>();
+	private Map<String, Filter> _filtersByURLPatterns =
+		new ConcurrentHashMap<String, Filter>();
+	private Set<FilterServiceRanking> _filterServiceRankings =
+		new ConcurrentSkipListSet<FilterServiceRanking>(
+			new FilterServiceRankingComparator());
+	private HttpContext _httpContext;
+	private HttpServiceTracker _httpServiceTracker;
+	private Map<String, String> _initParameters = new HashMap<String, String>();
+	private ServiceRegistration<ServletContext> _serviceRegistration;
+	private List<ServletContextAttributeListener>
+		_servletContextAttributeListeners =
+			new ArrayList<ServletContextAttributeListener>();
+	private List<ServletContextListener> _servletContextListeners =
+		new ArrayList<ServletContextListener>();
+	private String _servletContextName;
+	private List<ServletRequestAttributeListener>
+		_servletRequestAttributeListeners =
+			new ArrayList<ServletRequestAttributeListener>();
+	private List<ServletRequestListener> _servletRequestListeners =
+		new ArrayList<ServletRequestListener>();
+	private Map<String, Servlet> _servletsByServletNames =
+		new ConcurrentHashMap<String, Servlet>();
+	private Map<String, Servlet> _servletsByURLPatterns =
+		new ConcurrentHashMap<String, Servlet>();
+	private File _tempDir;
+
+	private class ExtensionMapping {
+
+		public ExtensionMapping(boolean extension, String path) {
+			_extension = extension;
+			_path = path;
+		}
+
+		public String getPath() {
+			return _path;
+		}
+
+		public boolean isExtension() {
+			return _extension;
+		}
+
+		private boolean _extension;
+		private String _path;
+	}
+
+	private class FilterServiceRanking {
+
+
+		public boolean equals(Object object) {
+			FilterServiceRanking filterServiceRanking =
+				(FilterServiceRanking)object;
+
+			if (Validator.equals(
+					_filterName, filterServiceRanking._filterName) &&
+				Validator.equals(
+					_serviceRanking, filterServiceRanking._serviceRanking)) {
+
+				return true;
+			}
+
+			return false;
+		}
+
+		public DispatcherType getDispatcherType() {
+			return _dispatcherType;
+		}
+
+		public String getFilterName() {
+			return _filterName;
+		}
+
+		public int getServiceRanking() {
+			return _serviceRanking;
+		}
+
+		public long getTimestamp() {
+			return _timestamp;
+		}
+
+		public List<String> getUrlPatterns() {
+			return _urlPatterns;
+		}
+
+		public void setDispatcherType(DispatcherType dispatcherType) {
+			_dispatcherType = dispatcherType;
+		}
+
+		public void setFilterName(String filterName) {
+			_filterName = filterName;
+		}
+
+		public void setServiceRanking(int serviceRanking) {
+			_serviceRanking = serviceRanking;
+		}
+
+		public void setUrlPattterns(List<String> urlMappings) {
+			_urlPatterns = urlMappings;
+		}
+
+		private DispatcherType _dispatcherType;
+		private String _filterName;
+		private int _serviceRanking;
+		private long _timestamp = System.currentTimeMillis();
+		private List<String> _urlPatterns;
+
+	}
+
+	private class FilterServiceRankingComparator
+		implements Comparator<FilterServiceRanking> {
+
+
+		public int compare(
+			FilterServiceRanking filterServiceRanking1,
+			FilterServiceRanking filterServiceRanking2) {
+
+			String filterName = filterServiceRanking1.getFilterName();
+
+			int compareTo = filterName.compareTo(
+				filterServiceRanking2.getFilterName());
+
+			if (compareTo != 0) {
+				return compareTo;
+			}
+
+			if (filterServiceRanking1.getServiceRanking() <
+					filterServiceRanking2.getServiceRanking()) {
+
+				return -1;
+			}
+			else if (filterServiceRanking1.getServiceRanking() >
+						filterServiceRanking2.getServiceRanking()) {
+
+				return 1;
+			}
+
+			if (filterServiceRanking1.getTimestamp() <
+					filterServiceRanking2.getTimestamp()) {
+
+				return -1;
+			}
+			else if (filterServiceRanking1.getTimestamp() >
+						filterServiceRanking2.getTimestamp()) {
+
+				return 1;
+			}
+
+			return 0;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleServletRequest.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleServletRequest.java
new file mode 100644
index 0000000..3f0ff11
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleServletRequest.java
@@ -0,0 +1,212 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import com.liferay.portal.kernel.util.JavaConstants;
+import com.liferay.portal.kernel.util.SetUtil;
+import com.liferay.portal.kernel.util.UniqueList;
+import com.liferay.portal.kernel.util.WebKeys;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletRequestAttributeEvent;
+import javax.servlet.ServletRequestAttributeListener;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class BundleServletRequest extends HttpServletRequestWrapper {
+
+	public BundleServletRequest(
+		BundleRequestDispatcher bundleRequestDispatcher,
+		HttpServletRequest request) {
+
+		super(request);
+
+		_bundleRequestDispatcher = bundleRequestDispatcher;
+
+		_bundleServletContext =
+			_bundleRequestDispatcher.getBundleServletContext();
+
+		_session = new BundleSession(
+			_bundleServletContext, request.getSession());
+	}
+
+
+	public Object getAttribute(String name) {
+		if ((name.equals(
+				JavaConstants.JAVAX_SERVLET_FORWARD_SERVLET_PATH) ||
+			 name.equals(WebKeys.INVOKER_FILTER_URI)) &&
+			_attributes.containsKey(WebKeys.SERVLET_PATH)) {
+
+			return _attributes.get(WebKeys.SERVLET_PATH);
+		}
+
+		if (_maskedAttributes.contains(name)) {
+			return _attributes.get(name);
+		}
+
+		return super.getAttribute(name);
+	}
+
+
+	public Enumeration<String> getAttributeNames() {
+		List<String> attributeNames = new UniqueList<String>();
+
+		Enumeration<String> enumeration = super.getAttributeNames();
+
+		while (enumeration.hasMoreElements()) {
+			String name = enumeration.nextElement();
+
+			attributeNames.add(name);
+		}
+
+		attributeNames.addAll(_attributes.keySet());
+
+		return Collections.enumeration(attributeNames);
+	}
+
+
+	public String getContextPath() {
+		return _bundleServletContext.getContextPath();
+	}
+
+
+	public String getPathInfo() {
+		return _bundleRequestDispatcher.getPathInfo();
+	}
+
+
+	public RequestDispatcher getRequestDispatcher(String path) {
+		RequestDispatcher requestDispatcher =
+			_bundleServletContext.getRequestDispatcher(path);
+
+		if (requestDispatcher != null) {
+			return requestDispatcher;
+		}
+
+		return super.getRequestDispatcher(path);
+	}
+
+
+	public String getRequestURI() {
+		String contextPath = getContextPath();
+
+		return contextPath.concat(_bundleRequestDispatcher.getRequestURI());
+	}
+
+
+	public String getServletPath() {
+		return _bundleRequestDispatcher.getServletPath();
+	}
+
+
+	public HttpSession getSession() {
+		return _session;
+	}
+
+
+	public HttpSession getSession(boolean create) {
+		return _session;
+	}
+
+
+	public void removeAttribute(String name) {
+		Object oldValue = null;
+
+		if (_maskedAttributes.contains(name)) {
+			oldValue = _attributes.remove(name);
+		}
+		else {
+			oldValue = super.getAttribute(name);
+
+			super.removeAttribute(name);
+		}
+
+		List<ServletRequestAttributeListener> servletRequestAttributeListeners =
+			_bundleServletContext.getServletRequestAttributeListeners();
+
+		for (ServletRequestAttributeListener servletRequestAttributeListener :
+				servletRequestAttributeListeners) {
+
+			ServletRequestAttributeEvent servletRequestAttributeEvent =
+				new ServletRequestAttributeEvent(
+					_bundleServletContext, this, name, oldValue);
+
+			servletRequestAttributeListener.attributeReplaced(
+				servletRequestAttributeEvent);
+		}
+	}
+
+
+	public void setAttribute(String name, Object value) {
+		Object oldValue = null;
+
+		if (_maskedAttributes.contains(name)) {
+			oldValue = _attributes.put(name, value);
+		}
+		else {
+			oldValue = super.getAttribute(name);
+
+			super.setAttribute(name, value);
+		}
+
+		List<ServletRequestAttributeListener> servletRequestAttributeListeners =
+			_bundleServletContext.getServletRequestAttributeListeners();
+
+		for (ServletRequestAttributeListener servletRequestAttributeListener :
+				servletRequestAttributeListeners) {
+
+			ServletRequestAttributeEvent servletRequestAttributeEvent =
+				new ServletRequestAttributeEvent(
+					_bundleServletContext, this, name, oldValue);
+
+			if (oldValue != null) {
+				servletRequestAttributeListener.attributeReplaced(
+					servletRequestAttributeEvent);
+			}
+			else {
+				servletRequestAttributeListener.attributeAdded(
+					servletRequestAttributeEvent);
+			}
+		}
+	}
+
+	private static Set<String> _maskedAttributes = SetUtil.fromArray(
+		new String[] {
+			JavaConstants.JAVAX_SERVLET_ERROR_REQUEST_URI,
+			JavaConstants.JAVAX_SERVLET_FORWARD_CONTEXT_PATH,
+			JavaConstants.JAVAX_SERVLET_FORWARD_SERVLET_PATH,
+			JavaConstants.JAVAX_SERVLET_INCLUDE_PATH_INFO,
+			JavaConstants.JAVAX_SERVLET_INCLUDE_QUERY_STRING,
+			WebKeys.INVOKER_FILTER_URI, WebKeys.SERVLET_PATH
+		});
+
+	private Map<String, Object> _attributes = new HashMap<String, Object>();
+	private BundleRequestDispatcher _bundleRequestDispatcher;
+	private BundleServletContext _bundleServletContext;
+	private HttpSession _session;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleSession.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleSession.java
new file mode 100644
index 0000000..541e3a0
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/BundleSession.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import com.liferay.portal.kernel.servlet.HttpSessionWrapper;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class BundleSession extends HttpSessionWrapper {
+
+	public BundleSession(ServletContext servletContext, HttpSession session) {
+		super(session);
+
+		_servletContext = servletContext;
+	}
+
+
+	public ServletContext getServletContext() {
+		return _servletContext;
+	}
+
+	private ServletContext _servletContext;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/WebExtenderServlet.java b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/WebExtenderServlet.java
new file mode 100644
index 0000000..08bdcb0
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/internal/servlet/WebExtenderServlet.java
@@ -0,0 +1,257 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import com.liferay.portal.http.service.internal.http.ExtendedHttpService;
+import com.liferay.portal.http.service.internal.http.FilterTracker;
+import com.liferay.portal.http.service.internal.http.HttpServiceFactory;
+import com.liferay.portal.http.service.internal.http.HttpSupport;
+import com.liferay.portal.http.service.internal.http.ServletTracker;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.servlet.PortletServlet;
+import com.liferay.portal.kernel.servlet.ServletContextPool;
+import com.liferay.portal.kernel.util.JavaConstants;
+import com.liferay.portal.kernel.util.ReleaseInfo;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.util.WebKeys;
+import com.liferay.portal.model.Portlet;
+import com.liferay.portal.model.PortletApp;
+import com.liferay.portal.model.PortletConstants;
+import com.liferay.portal.service.PortletLocalServiceUtil;
+import com.liferay.portal.util.Portal;
+import com.liferay.portal.util.PortalUtil;
+
+import java.io.IOException;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.servlet.Filter;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.http.HttpService;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class WebExtenderServlet extends PortletServlet {
+
+	public WebExtenderServlet(BundleContext bundleContext) {
+		_bundleContext = bundleContext;
+	}
+
+
+	public void destroy() {
+		_filterTracker.close();
+		_httpServiceRegistration.unregister();
+		_httpServletRegistration.unregister();
+		_servletTracker.close();
+
+		super.destroy();
+	}
+
+	public BundleContext getBundleContext() {
+		return _bundleContext;
+	}
+
+
+	public void init(ServletConfig servletConfig) throws ServletException {
+		super.init(servletConfig);
+
+		HttpSupport httpSupport = new HttpSupport(_bundleContext, this);
+
+		HttpServiceFactory httpServiceFactory = new HttpServiceFactory(
+			httpSupport);
+
+		_filterTracker = new ServiceTracker<Filter, Filter>(
+			_bundleContext, Filter.class, new FilterTracker(httpSupport));
+
+		_filterTracker.open();
+
+		Hashtable<String, Object> properties = new Hashtable<String, Object>();
+
+		properties.put("bean.id", HttpService.class.getName());
+		properties.put("original.bean", Boolean.TRUE);
+		properties.put("service.vendor", ReleaseInfo.getVendor());
+
+		_httpServiceRegistration = _bundleContext.registerService(
+			new String[] {
+				ExtendedHttpService.class.getName(),
+				HttpService.class.getName(),
+			},
+			httpServiceFactory, properties);
+
+		properties.put("bean.id", HttpServlet.class.getName());
+
+		_httpServletRegistration = _bundleContext.registerService(
+			HttpServlet.class, this, properties);
+
+		_servletTracker = new ServiceTracker<Servlet, Servlet>(
+			_bundleContext, Servlet.class, new ServletTracker(httpSupport));
+
+		_servletTracker.open();
+	}
+
+
+	public void service(
+			HttpServletRequest request, HttpServletResponse response)
+		throws IOException, ServletException {
+
+		printHeaders(request);
+
+		String portletId = (String)request.getAttribute(WebKeys.PORTLET_ID);
+		String requestURI = request.getRequestURI();
+
+		String includeRequestURI = (String)request.getAttribute(
+			JavaConstants.JAVAX_SERVLET_INCLUDE_PATH_INFO);
+
+		if (Validator.isNotNull(includeRequestURI)) {
+			requestURI = includeRequestURI;
+		}
+
+		ServletContext servletContext = getServletContext(
+			portletId, requestURI);
+
+		if (servletContext == null) {
+			response.sendError(
+				HttpServletResponse.SC_NOT_FOUND,
+				"No servlet or resource mapped to " + requestURI);
+
+			return;
+		}
+
+		service(request, response, servletContext, portletId, requestURI);
+	}
+
+	protected ServletContext getServletContext(
+		String portletId, String requestURI) {
+
+		Portlet portlet = null;
+
+		if (Validator.isNotNull(portletId)) {
+			try {
+				String rootPortletId = PortletConstants.getRootPortletId(
+					portletId);
+
+				portlet = PortletLocalServiceUtil.getPortletById(rootPortletId);
+			}
+			catch (Exception e) {
+				if (_log.isDebugEnabled()) {
+					_log.debug(e, e);
+				}
+			}
+		}
+
+		String servletContextName = null;
+
+		if (portlet != null) {
+			PortletApp portletApp = portlet.getPortletApp();
+
+			servletContextName = portletApp.getServletContextName();
+		}
+		else if (requestURI != null) {
+			servletContextName = requestURI;
+
+			String contextPath = PortalUtil.getPathContext();
+
+			if (Validator.isNotNull(contextPath) &&
+				servletContextName.startsWith(contextPath)) {
+
+				servletContextName = servletContextName.substring(
+					contextPath.length());
+			}
+
+			String modulePath = Portal.PATH_MODULE + StringPool.SLASH;
+
+			if (servletContextName.startsWith(modulePath)) {
+				servletContextName = servletContextName.substring(
+					modulePath.length());
+			}
+
+			if (servletContextName.startsWith(StringPool.SLASH)) {
+				servletContextName = servletContextName.substring(1);
+			}
+
+			int index = servletContextName.indexOf(StringPool.SLASH);
+
+			if (index != -1) {
+				servletContextName = servletContextName.substring(0, index);
+			}
+		}
+
+		return ServletContextPool.get(servletContextName);
+	}
+
+	protected void printHeaders(HttpServletRequest request) {
+		if (!_log.isDebugEnabled()) {
+			return;
+		}
+
+		Enumeration<String> enumeration = request.getHeaderNames();
+
+		while (enumeration.hasMoreElements()) {
+			Object name = enumeration.nextElement();
+
+			_log.debug(name + " = " + request.getHeader(String.valueOf(name)));
+		}
+	}
+
+	protected void service(
+			HttpServletRequest request, HttpServletResponse response,
+			ServletContext servletContext, String portletId, String requestURI)
+		throws IOException, ServletException {
+
+		RequestDispatcher requestDispatcher =
+			servletContext.getRequestDispatcher(requestURI);
+
+		if (requestDispatcher != null) {
+			requestDispatcher.forward(request, response);
+
+			return;
+		}
+
+		if (requestURI.endsWith("/invoke") && Validator.isNotNull(portletId)) {
+			super.service(request, response);
+
+			return;
+		}
+
+		response.sendError(
+			HttpServletResponse.SC_NOT_FOUND,
+			"No servlet or resource mapped to " + requestURI);
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(WebExtenderServlet.class);
+
+	private BundleContext _bundleContext;
+	private ServiceTracker<Filter, Filter> _filterTracker;
+	private ServiceRegistration<?> _httpServiceRegistration;
+	private ServiceRegistration<HttpServlet> _httpServletRegistration;
+	private ServiceTracker<Servlet, Servlet> _servletTracker;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/servlet/BundleServletConfig.java b/shared/portal-http-service/src/com/liferay/portal/http/service/servlet/BundleServletConfig.java
new file mode 100644
index 0000000..dce9f40
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/servlet/BundleServletConfig.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.servlet;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class BundleServletConfig implements ServletConfig {
+
+	public BundleServletConfig(
+		ServletContext servletContext, String servletName,
+		Map<String, String> initParameters, HttpContext httpContext) {
+
+		_servletContext = servletContext;
+		_servletName = servletName;
+		_initParameters = initParameters;
+
+		if (_initParameters == null) {
+			_initParameters = new Hashtable<String, String>();
+		}
+
+		_httpContext = httpContext;
+	}
+
+	public HttpContext getHttpContext() {
+		return _httpContext;
+	}
+
+
+	public String getInitParameter(String name) {
+		return _initParameters.get(name);
+	}
+
+
+	public Enumeration<String> getInitParameterNames() {
+		return Collections.enumeration(_initParameters.keySet());
+	}
+
+	public Map<String, String> getInitParameters() {
+		return _initParameters;
+	}
+
+
+	public ServletContext getServletContext() {
+		return _servletContext;
+	}
+
+
+	public String getServletName() {
+		return _servletName;
+	}
+
+	public void setInitParameter(String name, String value) {
+		_initParameters.put(name, value);
+	}
+
+	private HttpContext _httpContext;
+	private Map<String, String> _initParameters;
+	private ServletContext _servletContext;
+	private String _servletName;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/servlet/ResourceServlet.java b/shared/portal-http-service/src/com/liferay/portal/http/service/servlet/ResourceServlet.java
new file mode 100644
index 0000000..95c6050
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/servlet/ResourceServlet.java
@@ -0,0 +1,168 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.servlet;
+
+import com.liferay.portal.kernel.servlet.HttpHeaders;
+import com.liferay.portal.kernel.servlet.ServletResponseUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.JavaConstants;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.webserver.WebServerServlet;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLDecoder;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.service.http.HttpContext;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class ResourceServlet extends WebServerServlet {
+
+
+	public void init(ServletConfig servletConfig) {
+		_bundleServletConfig = (BundleServletConfig)servletConfig;
+
+		_httpContext = _bundleServletConfig.getHttpContext();
+
+		_alias = GetterUtil.getString(
+			_bundleServletConfig.getInitParameter("alias"));
+		_name = GetterUtil.getString(
+			_bundleServletConfig.getInitParameter("name"));
+	}
+
+
+	public void service(
+			HttpServletRequest request, HttpServletResponse response)
+		throws IOException, ServletException {
+
+		String requestURI = getRequestURI(request);
+
+		try {
+			int aliasIndex = requestURI.indexOf(_alias);
+
+			if (aliasIndex == 0) {
+				requestURI = requestURI.substring(_alias.length());
+			}
+
+			if (Validator.isNotNull(_name)) {
+				requestURI = _name.concat(requestURI);
+			}
+
+			URL url = _httpContext.getResource(requestURI);
+
+			if (url == null) {
+				response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+
+				return;
+			}
+
+			URLConnection urlConnection = url.openConnection();
+
+			long lastModified = urlConnection.getLastModified();
+
+			if (lastModified > 0) {
+				long ifModifiedSince = request.getDateHeader(
+					HttpHeaders.IF_MODIFIED_SINCE);
+
+				if ((ifModifiedSince > 0) &&
+					(ifModifiedSince == lastModified)) {
+
+					response.setContentLength(0);
+
+					response.setDateHeader(
+						HttpHeaders.LAST_MODIFIED, lastModified);
+
+					String ifNoneMatch = request.getHeader(
+						HttpHeaders.IF_NONE_MATCH);
+
+					if (Validator.isNotNull(ifNoneMatch) &&
+						!ifNoneMatch.equals('0')) {
+
+						response.setHeader(HttpHeaders.ETAG, ifNoneMatch);
+					}
+
+					response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+
+					return;
+				}
+			}
+
+			if (lastModified > 0) {
+				response.setDateHeader(HttpHeaders.LAST_MODIFIED, lastModified);
+			}
+
+			String fileName = getRequestURI(request);
+
+			int slashIndex = fileName.lastIndexOf(StringPool.SLASH);
+
+			if (slashIndex != -1) {
+				fileName = fileName.substring(slashIndex + 1);
+			}
+
+			String contentType = _httpContext.getMimeType(fileName);
+
+			if (isSupportsRangeHeader(contentType)) {
+				ServletResponseUtil.sendFileWithRangeHeader(
+					request, response, fileName, urlConnection.getInputStream(),
+					urlConnection.getContentLength(), contentType);
+			}
+			else {
+				ServletResponseUtil.sendFile(
+					request, response, fileName, urlConnection.getInputStream(),
+					urlConnection.getContentLength(), contentType);
+			}
+		}
+		catch (Exception e) {
+			request.setAttribute(
+				JavaConstants.JAVAX_SERVLET_ERROR_EXCEPTION, e);
+
+			response.sendError(
+				HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
+		}
+	}
+
+	protected String getRequestURI(HttpServletRequest request)
+		throws UnsupportedEncodingException {
+
+		String requestURI = URLDecoder.decode(
+			request.getRequestURI(), StringPool.UTF8);
+
+		String contextPath = request.getContextPath();
+
+		if (!contextPath.equals(StringPool.SLASH)) {
+			requestURI = requestURI.substring(contextPath.length());
+		}
+
+		return requestURI;
+	}
+
+	private String _alias;
+	private BundleServletConfig _bundleServletConfig;
+	private HttpContext _httpContext;
+	private String _name;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/src/com/liferay/portal/http/service/ws/axis/AxisConfigurationFactory.java b/shared/portal-http-service/src/com/liferay/portal/http/service/ws/axis/AxisConfigurationFactory.java
new file mode 100644
index 0000000..082117f
--- /dev/null
+++ b/shared/portal-http-service/src/com/liferay/portal/http/service/ws/axis/AxisConfigurationFactory.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.ws.axis;
+
+import org.apache.axis.EngineConfiguration;
+import org.apache.axis.EngineConfigurationFactory;
+import org.apache.axis.configuration.EngineConfigurationFactoryDefault;
+
+/**
+ * @author Raymond Augé
+ * @author Miguel Pastor
+ */
+public class AxisConfigurationFactory implements EngineConfigurationFactory {
+
+	public AxisConfigurationFactory() {
+		_engineConfigurationFactory =
+			EngineConfigurationFactoryDefault.newFactory(null);
+	}
+
+
+	public EngineConfiguration getClientEngineConfig() {
+		return _engineConfigurationFactory.getClientEngineConfig();
+	}
+
+
+	public EngineConfiguration getServerEngineConfig() {
+		return _engineConfigurationFactory.getServerEngineConfig();
+	}
+
+	private EngineConfigurationFactory _engineConfigurationFactory;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/FilterDefinitionTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/FilterDefinitionTest.java
new file mode 100644
index 0000000..813f467
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/FilterDefinitionTest.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Filter;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.powermock.modules.junit4.PowerMockRunner;
+
+/**
+ * @author Miguel Pastor
+ */
+@RunWith(PowerMockRunner.class)
+public class FilterDefinitionTest {
+
+	@Before
+	public void setUp() {
+		_filterDefinition = new FilterDefinition();
+	}
+
+	@Test
+	public void testAddMultipleURLPatterns() {
+		String urlPattern = "/o/module";
+
+		List<String> urlPatterns = new ArrayList<String>();
+
+		for (int i = 0; i < 10; i++) {
+			urlPatterns.add(urlPattern + "/" + i);
+		}
+
+		_filterDefinition.setURLPatterns(urlPatterns);
+
+		urlPatterns = _filterDefinition.getURLPatterns();
+
+		Assert.assertEquals(10, urlPatterns.size());
+
+		for (int i = 0; i < 10; i++) {
+			Assert.assertEquals(urlPattern + "/" + i, urlPatterns.get(i));
+		}
+	}
+
+	@Test
+	public void testAddSingleURLPattern() {
+		String urlPattern = "/o/module";
+
+		_filterDefinition.addURLPattern(urlPattern);
+
+		List<String> urlPatterns = _filterDefinition.getURLPatterns();
+
+		Assert.assertEquals(1, urlPatterns.size());
+		Assert.assertEquals(urlPattern, urlPatterns.get(0));
+	}
+
+	@Test
+	public void testSetFilter() {
+		_filterDefinition.setFilter(_filter);
+
+		Assert.assertEquals(_filter, _filterDefinition.getFilter());
+	}
+
+	@Test
+	public void testSetFilterName() {
+		String filterName = "Module Filter";
+
+		_filterDefinition.setName(filterName);
+
+		Assert.assertEquals(filterName, _filterDefinition.getName());
+	}
+
+	@Test
+	public void testSetMultipleInitParameters() {
+		Map<String, String> initParameters = new HashMap<String, String>();
+
+		for (int i = 0; i < 10; i++) {
+			initParameters.put("parameter-" + i, String.valueOf(i));
+		}
+
+		_filterDefinition.setInitParameters(initParameters);
+
+		initParameters = _filterDefinition.getInitParameters();
+
+		Assert.assertEquals(10, initParameters.size());
+
+		for (int i = 0; i < 10; i++) {
+			String expectedValue = String.valueOf(i);
+			String value = initParameters.get("parameter-" + i);
+
+			Assert.assertEquals(expectedValue, value);
+		}
+	}
+
+	@Test
+	public void testSetSingleInitParameter() {
+		String key = "parameter";
+		String value = "1";
+
+		_filterDefinition.setInitParameter(key, value);
+
+		Map<String, String> initParameters =
+			_filterDefinition.getInitParameters();
+
+		Assert.assertEquals(1, initParameters.size());
+		Assert.assertEquals(value, initParameters.get(key));
+	}
+
+	@Mock
+	private Filter _filter;
+
+	private FilterDefinition _filterDefinition;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/ServletDefinitionTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/ServletDefinitionTest.java
new file mode 100644
index 0000000..bf2675c
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/ServletDefinitionTest.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.Servlet;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.powermock.modules.junit4.PowerMockRunner;
+
+/**
+ * @author Miguel Pastor
+ */
+@RunWith(PowerMockRunner.class)
+public class ServletDefinitionTest {
+
+	@Before
+	public void setUp() {
+		_servletDefinition = new ServletDefinition();
+	}
+
+	@Test
+	public void testAddMultipleURLPatterns() {
+		String urlPattern = "/o/module";
+
+		List<String> urlPatterns = new ArrayList<String>();
+
+		for (int i = 0; i < 10; i++) {
+			urlPatterns.add(urlPattern + "/" + i);
+		}
+
+		_servletDefinition.setURLPatterns(urlPatterns);
+
+		urlPatterns = _servletDefinition.getURLPatterns();
+
+		Assert.assertEquals(10, urlPatterns.size());
+
+		for (int i = 0; i < 10; i++) {
+			Assert.assertEquals(urlPattern + "/" + i, urlPatterns.get(i));
+		}
+	}
+
+	@Test
+	public void testAddSingleURLPattern() {
+		String urlPattern = "/o/module";
+
+		_servletDefinition.addURLPattern(urlPattern);
+
+		List<String> urlPatterns = _servletDefinition.getURLPatterns();
+
+		Assert.assertEquals(1, urlPatterns.size());
+		Assert.assertEquals(urlPattern, urlPatterns.get(0));
+	}
+
+	@Test
+	public void testSetMultipleInitParameters() {
+		Map<String, String> initParameters = new HashMap<String, String>();
+
+		for (int i = 0; i < 10; i++) {
+			initParameters.put("parameter-" + i, String.valueOf(i));
+		}
+
+		_servletDefinition.setInitParameters(initParameters);
+
+		initParameters = _servletDefinition.getInitParameters();
+
+		Assert.assertEquals(10, initParameters.size());
+
+		for (int i = 0; i < 10; i++) {
+			String expectedValue = String.valueOf(i);
+			String value = initParameters.get("parameter-" + i);
+
+			Assert.assertEquals(expectedValue, value);
+		}
+	}
+
+	@Test
+	public void testSetServlet() {
+		_servletDefinition.setServlet(_servlet);
+
+		Assert.assertEquals(_servlet, _servletDefinition.getServlet());
+	}
+
+	@Test
+	public void testSetServletName() {
+		String servletName = "Module Servlet";
+
+		_servletDefinition.setName(servletName);
+
+		Assert.assertEquals(servletName, _servletDefinition.getName());
+	}
+
+	@Test
+	public void testSetSingleInitParameter() {
+		String key = "parameter";
+		String value = "1";
+
+		_servletDefinition.setInitParameter(key, value);
+
+		Map<String, String> initParameters =
+			_servletDefinition.getInitParameters();
+
+		Assert.assertEquals(1, initParameters.size());
+		Assert.assertEquals(value, initParameters.get(key));
+	}
+
+	@Mock
+	private Servlet _servlet;
+
+	private ServletDefinition _servletDefinition;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionLoaderTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionLoaderTest.java
new file mode 100644
index 0000000..dbcd2d3
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionLoaderTest.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import com.liferay.portal.http.service.test.MockBundle;
+import com.liferay.portal.kernel.xml.DocumentException;
+import com.liferay.portal.kernel.xml.SAXReaderUtil;
+import com.liferay.portal.xml.SAXReaderImpl;
+
+import java.net.URL;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContextListener;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.osgi.framework.Bundle;
+
+import org.powermock.modules.junit4.PowerMockRunner;
+
+/**
+ * @author Miguel Pastor
+ */
+@RunWith(PowerMockRunner.class)
+public class WebXMLDefinitionLoaderTest {
+
+	@BeforeClass
+	public static void setUpClass() {
+		SAXReaderUtil saxReaderUtil = new SAXReaderUtil();
+
+		saxReaderUtil.setSAXReader(SAXReaderImpl.getInstance());
+	}
+
+	public WebXMLDefinitionLoaderTest() throws DocumentException {
+		_webXMLDefinitionLoader = new WebXMLDefinitionLoader();
+	}
+
+	@Test
+	public void testLoadCustomDependencies() throws Exception {
+		Bundle bundle = new EntryLoaderMockBundle();
+
+		testLoadDependencies(bundle, 1, 1, 1);
+	}
+
+	protected void testLoadDependencies(
+			Bundle bundle, int numfOfListeners, int numOfFilters,
+			int numfOfServlets)
+		throws Exception {
+
+		WebXMLDefinition webXMLDefinition = _webXMLDefinitionLoader.loadWebXML(
+			bundle);
+
+		List<ListenerDefinition> listenerDefinitions =
+			webXMLDefinition.getListenerDefinitions();
+
+		Assert.assertEquals(numfOfListeners, listenerDefinitions.size());
+
+		for (ListenerDefinition listenerDefinition : listenerDefinitions) {
+			Object listener = listenerDefinition.getListener();
+
+			Assert.assertTrue(listener instanceof ServletContextListener);
+		}
+
+		Map<String, ServletDefinition> servletDefinitions =
+			webXMLDefinition.getServletDefinitions();
+
+		Assert.assertEquals(numfOfServlets, servletDefinitions.size());
+
+		Map<String, FilterDefinition> filterDefinitions =
+			webXMLDefinition.getFilterDefinitions();
+
+		Assert.assertEquals(numOfFilters, filterDefinitions.size());
+	}
+
+	private WebXMLDefinitionLoader _webXMLDefinitionLoader;
+
+	private class EntryLoaderMockBundle extends MockBundle {
+
+
+		public URL getEntry(String path) {
+			Class<?> clazz = getClass();
+
+			return clazz.getResource("dependencies/custom-web.xml");
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionTest.java
new file mode 100644
index 0000000..9a65415
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/WebXMLDefinitionTest.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.definition;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Miguel Pastor
+ */
+public class WebXMLDefinitionTest {
+
+	@Before
+	public void setUp() {
+		_webXmlDefinition = new WebXMLDefinition();
+	}
+
+	@Test
+	public void testAddMultipleFilterDefinition() {
+		testAddFilterDefinitions(5);
+	}
+
+	@Test
+	public void testAddMultipleListenerDefinition() {
+		testAddListenerDefinition(5);
+	}
+
+	@Test
+	public void testAddMultipleServletDefinitions() {
+		testAddServletDefinitions(5);
+	}
+
+	@Test
+	public void testAddSingleFilterDefinition() {
+		testAddFilterDefinitions(1);
+	}
+
+	@Test
+	public void testAddSingleListenerDefinition() {
+		testAddListenerDefinition(1);
+	}
+
+	@Test
+	public void testAddSingleServletDefinition() {
+		testAddServletDefinitions(1);
+	}
+
+	protected void testAddFilterDefinitions(int count) {
+		for (int i = 0; i < count; i++) {
+			String s = String.valueOf(i);
+
+			FilterDefinition filterDefinition = new FilterDefinition();
+
+			filterDefinition.addURLPattern(s);
+
+			filterDefinition.setName(s);
+
+			_webXmlDefinition.setFilterDefinition(s, filterDefinition);
+		}
+
+		Map<String, FilterDefinition> filterDefinitions =
+			_webXmlDefinition.getFilterDefinitions();
+
+		Assert.assertEquals(count, filterDefinitions.size());
+	}
+
+	protected void testAddListenerDefinition(int count) {
+		for (int i = 0; i < count; i++) {
+			ListenerDefinition listenerDefinition = new ListenerDefinition();
+
+			listenerDefinition.setListener(new Object());
+
+			_webXmlDefinition.addListenerDefinition(listenerDefinition);
+		}
+
+		List<ListenerDefinition> listenerDefinitions =
+			_webXmlDefinition.getListenerDefinitions();
+
+		Assert.assertEquals(count, listenerDefinitions.size());
+	}
+
+	protected void testAddServletDefinitions(int count) {
+		for (int i = 0; i < count; i++) {
+			String s = String.valueOf(i);
+
+			ServletDefinition servletDefinition = new ServletDefinition();
+
+			servletDefinition.addURLPattern(s);
+
+			servletDefinition.setName(s);
+
+			_webXmlDefinition.setServletDefinition(s, servletDefinition);
+		}
+
+		Map<String, ServletDefinition> servletDefinitions =
+			_webXmlDefinition.getServletDefinitions();
+
+		Assert.assertEquals(count, servletDefinitions.size());
+	}
+
+	private WebXMLDefinition _webXmlDefinition;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/dependencies/custom-web.xml b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/dependencies/custom-web.xml
new file mode 100644
index 0000000..e544421
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/definition/dependencies/custom-web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<web-app
+		metadata-complete="true"
+		version="2.6"
+		xmlns="http://java.sun.com/xml/ns/javaee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_6.xsd"
+>
+	<listener>
+		<listener-class>com.liferay.portal.http.service.mock.MockServletContextListener</listener-class>
+	</listener>
+	<filter>
+		<filter-name>Mock Filter</filter-name>
+		<filter-class>com.liferay.portal.http.service.mock.MockFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>Mock Filter</filter-name>
+		<url-pattern>/mock_filter</url-pattern>
+	</filter-mapping>
+	<servlet>
+		<servlet-name>Mock Servlet</servlet-name>
+		<servlet-class>com.liferay.portal.http.service.mock.MockServlet</servlet-class>
+		<load-on-startup>0</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Mock Servlet</servlet-name>
+		<url-pattern>/mock_servlet</url-pattern>
+	</servlet-mapping>
+</web-app>
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/BaseTrackerTestCase.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/BaseTrackerTestCase.java
new file mode 100644
index 0000000..6b422cc
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/BaseTrackerTestCase.java
@@ -0,0 +1,193 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.kernel.xml.DocumentException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.verification.VerificationMode;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+import org.powermock.api.mockito.PowerMockito;
+
+/**
+ * @author Miguel Pastor
+ */
+public abstract class BaseTrackerTestCase<S> extends PowerMockito {
+
+	@Before
+	public void setUp() {
+		service = buildService();
+		_tracker = buildTracker();
+	}
+
+	@Test
+	public void testAddingServiceWithEmptyInitParameters() throws Exception {
+		mockAddingService(new String[0]);
+
+		_tracker.addingService(_serviceReference);
+
+		verifyAddingService(Mockito.never());
+	}
+
+	@Test
+	public void testAddingServiceWithInitParameters() throws Exception {
+		mockAddingService(new String[] {"init.a", "init.b", "foo.c"});
+
+		_tracker.addingService(_serviceReference);
+
+		verifyAddingService(Mockito.never());
+	}
+
+	@Test
+	public void testRemovedService() throws Exception {
+		mockRemovedService();
+
+		_tracker.removedService(_serviceReference, service);
+
+		verifyRemovedService();
+	}
+
+	protected abstract S buildService();
+
+	protected abstract ServiceTrackerCustomizer<S, S> buildTracker();
+
+	protected void mockAction(String[] initParameters)
+		throws DocumentException, InvalidSyntaxException {
+
+		when(
+			bundleContext.getService(_serviceReference)
+		).thenReturn(
+			service
+		);
+
+		when(
+			httpServiceWrapper.getBundleServletContext()
+		).thenReturn(
+			bundleServletContext
+		);
+
+		when(
+			httpSupport.getHttpContext(Mockito.anyString())
+		).thenReturn(
+			httpContext
+		);
+
+		when(
+			httpSupport.getHttpService(bundle)
+		).thenReturn(
+			httpServiceWrapper
+		);
+
+		when(
+			_serviceReference.getBundle()
+		).thenReturn(
+			bundle
+		);
+	}
+
+	protected void mockAddingService(String[] initParameters) throws Exception {
+		when(
+			httpSupport.getBundleContext()
+		).thenReturn(
+			bundleContext
+		);
+
+		when(
+			_serviceReference.getPropertyKeys()
+		).thenReturn(
+			initParameters
+		);
+
+		mockAction(initParameters);
+	}
+
+	protected void mockRemovedService() throws Exception {
+		mockAction(null);
+	}
+
+	protected void verifyAddingService(VerificationMode verificationMode)
+		throws Exception {
+
+		BundleContext bundleContext = Mockito.verify(this.bundleContext);
+
+		bundleContext.getService(_serviceReference);
+
+		HttpSupport httpSupport = Mockito.verify(this.httpSupport);
+
+		httpSupport.getBundleContext();
+		httpSupport.getBundleServletContext(bundle);
+		httpSupport.getHttpContext(Mockito.anyString());
+
+		verifyRegisterServiceAction(verificationMode);
+		verifyServiceReference();
+	}
+
+	protected abstract void verifyRegisterServiceAction(
+			VerificationMode verificationMode)
+		throws Exception;
+
+	protected void verifyRemovedService() throws Exception {
+		verifyServiceReference();
+		verifyUnRegisterServiceAction();
+	}
+
+	protected void verifyServiceReference() {
+		ServiceReference<S> serviceReference = Mockito.verify(
+			_serviceReference);
+
+		serviceReference.getBundle();
+		serviceReference.getPropertyKeys();
+	}
+
+	protected abstract void verifyUnRegisterServiceAction() throws Exception;
+
+	@Mock
+	protected Bundle bundle;
+
+	@Mock
+	protected BundleContext bundleContext;
+
+	@Mock
+	protected BundleServletContext bundleServletContext;
+
+	@Mock
+	protected HttpContext httpContext;
+
+	@Mock
+	protected HttpServiceWrapper httpServiceWrapper;
+
+	@Mock
+	protected HttpSupport httpSupport;
+
+	protected S service;
+
+	@Mock
+	private ServiceReference<S> _serviceReference;
+
+	private ServiceTrackerCustomizer<S, S> _tracker;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/DefaultHttpContextTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/DefaultHttpContextTest.java
new file mode 100644
index 0000000..c3491e3
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/DefaultHttpContextTest.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import org.osgi.framework.Bundle;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * @author Miguel Pastor
+ */
+@RunWith(PowerMockRunner.class)
+public class DefaultHttpContextTest extends PowerMockito {
+
+	@Before
+	public void setUp() {
+		_defaultHttpContext = new DefaultHttpContext(_bundle);
+	}
+
+	@Test
+	public void testGetExistingResourceWithNoSlash() throws Exception {
+		mockBundleFindEntries();
+
+		getResourceAndVerify("existingResource");
+
+		verifyBundleFindEntries();
+	}
+
+	@Test
+	public void testGetExistingResourceWithSlash() throws Exception {
+		mockBundleFindEntries();
+
+		getResourceAndVerify("/existingResource");
+
+		verifyBundleFindEntries();
+	}
+
+	@Test
+	public void testGetNonExistingResourceNoSlash() {
+		Assert.assertNull(
+			_defaultHttpContext.getResource("nonExistingResource"));
+	}
+
+	@Test
+	public void testGetNonExistingResourceWithSlash() {
+		Assert.assertNull(
+			_defaultHttpContext.getResource("nonExistingResource"));
+	}
+
+	@Test
+	public void testHandleSecurity() {
+		MockHttpServletRequest mockHttpServletRequest =
+			new MockHttpServletRequest();
+		MockHttpServletResponse mockHttpServletResponse =
+			new MockHttpServletResponse();
+
+		Assert.assertTrue(
+			_defaultHttpContext.handleSecurity(
+				mockHttpServletRequest, mockHttpServletResponse));
+	}
+
+	protected void getResourceAndVerify(String path) {
+		URL url = _defaultHttpContext.getResource(path);
+
+		Assert.assertNotNull(url);
+		Assert.assertEquals(_FILE, url.getFile());
+		Assert.assertEquals(_HOST, url.getHost());
+		Assert.assertEquals(_PROTOCOL, url.getProtocol());
+	}
+
+	protected void mockBundleFindEntries() throws MalformedURLException {
+		when(
+			_bundle.getResource(Mockito.anyString())
+		).thenReturn(
+			new URL(_PROTOCOL, _HOST, _FILE)
+		);
+	}
+
+	protected void verifyBundleFindEntries() {
+		Bundle bundle = Mockito.verify(_bundle);
+
+		bundle.getResource(Mockito.anyString());
+	}
+
+	private static final String _FILE = "/tmp/foo";
+
+	private static final String _HOST = "localhost";
+
+	private static final String _PROTOCOL = "file";
+
+	@Mock
+	private Bundle _bundle;
+
+	private DefaultHttpContext _defaultHttpContext;
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/FilterTrackerTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/FilterTrackerTest.java
new file mode 100644
index 0000000..b573d85
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/FilterTrackerTest.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+import com.liferay.portal.http.service.mock.MockFilter;
+
+import javax.servlet.Filter;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mockito;
+import org.mockito.verification.VerificationMode;
+
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+import org.powermock.modules.junit4.PowerMockRunner;
+
+/**
+ * @author Miguel Pastor
+ */
+@RunWith(PowerMockRunner.class)
+public class FilterTrackerTest extends BaseTrackerTestCase<Filter> {
+
+
+	protected Filter buildService() {
+		return new MockFilter();
+	}
+
+
+	protected ServiceTrackerCustomizer<Filter, Filter> buildTracker() {
+		return new FilterTracker(httpSupport);
+	}
+
+
+	protected void verifyRegisterServiceAction(
+			VerificationMode verificationMode)
+		throws Exception {
+
+		BundleServletContext bundleServletContext = Mockito.verify(
+			this.bundleServletContext, verificationMode);
+
+		bundleServletContext.registerFilter(
+			Mockito.anyString(), Mockito.anyString(), Mockito.eq(service),
+			Mockito.anyMap(), Mockito.eq(httpContext));
+	}
+
+
+	protected void verifyUnRegisterServiceAction() throws Exception {
+		BundleServletContext bundleServletContext = Mockito.verify(
+			this.bundleServletContext);
+
+		bundleServletContext.unregisterFilter(Mockito.anyString());
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/ServletTrackerTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/ServletTrackerTest.java
new file mode 100644
index 0000000..87c0275
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/http/ServletTrackerTest.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.http;
+
+import com.liferay.portal.http.service.internal.servlet.BundleServletContext;
+
+import javax.servlet.GenericServlet;
+import javax.servlet.Servlet;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mockito;
+import org.mockito.verification.VerificationMode;
+
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+import org.powermock.modules.junit4.PowerMockRunner;
+
+/**
+ * @author Miguel Pastor
+ */
+@RunWith(PowerMockRunner.class)
+public class ServletTrackerTest extends BaseTrackerTestCase<Servlet> {
+
+
+	protected Servlet buildService() {
+		return new MockServlet();
+	}
+
+
+	protected ServiceTrackerCustomizer<Servlet, Servlet> buildTracker() {
+		return new ServletTracker(httpSupport);
+	}
+
+
+	protected void verifyRegisterServiceAction(
+			VerificationMode verificationMode)
+		throws Exception {
+
+		BundleServletContext bundleServletContext = Mockito.verify(
+			this.bundleServletContext, verificationMode);
+
+		bundleServletContext.registerServlet(
+			Mockito.anyString(), Mockito.anyString(), Mockito.eq(service),
+			Mockito.anyMap(), Mockito.eq(httpContext));
+	}
+
+
+	protected void verifyUnRegisterServiceAction() throws Exception {
+		BundleServletContext bundleServletContext = Mockito.verify(
+			this.bundleServletContext);
+
+		bundleServletContext.unregisterServlet(Mockito.anyString());
+	}
+
+	private class MockServlet extends GenericServlet {
+
+
+		public void service(
+			ServletRequest servletRequest, ServletResponse servletResponse) {
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/servlet/BundleServletContextTest.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/servlet/BundleServletContextTest.java
new file mode 100644
index 0000000..8ab131d
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/internal/servlet/BundleServletContextTest.java
@@ -0,0 +1,647 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.internal.servlet;
+
+import com.liferay.portal.http.service.mock.MockFilter;
+import com.liferay.portal.http.service.mock.MockServlet;
+import com.liferay.portal.http.service.servlet.ResourceServlet;
+import com.liferay.portal.kernel.test.JDKLoggerTestUtil;
+import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
+import com.liferay.portal.kernel.util.FileUtil;
+import com.liferay.portal.util.FileImpl;
+import com.liferay.portal.util.PortalUtil;
+
+import java.text.SimpleDateFormat;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextAttributeListener;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestAttributeListener;
+import javax.servlet.ServletRequestListener;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpSessionActivationListener;
+import javax.servlet.http.HttpSessionAttributeListener;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionListener;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.NamespaceException;
+
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockServletConfig;
+
+/**
+ * @author Miguel Pastor
+ */
+@PrepareForTest({FastDateFormatFactoryUtil.class, PortalUtil.class})
+@RunWith(PowerMockRunner.class)
+public class BundleServletContextTest extends PowerMockito {
+
+	@Before
+	public void setUp() {
+		mockStatic(FastDateFormatFactoryUtil.class);
+
+		when(
+			FastDateFormatFactoryUtil.getSimpleDateFormat(Mockito.anyString())
+		).thenReturn(
+			new SimpleDateFormat()
+		);
+
+		mockStatic(PortalUtil.class);
+
+		when(
+			PortalUtil.getPathContext()
+		).thenReturn(
+			"sample-test-module"
+		);
+
+		_bundleServletContext = new BundleServletContext(
+			_bundle, "test", _servletContext);
+
+		FileUtil fileUtil = new FileUtil();
+
+		fileUtil.setFile(new FileImpl());
+	}
+
+	@After
+	public void tearDown() {
+		verifyStatic();
+	}
+
+	@Test
+	public void testGetClassloader() {
+		mockBundleWiring();
+
+		Class<?> clazz = getClass();
+
+		ClassLoader classLoader = clazz.getClassLoader();
+
+		Assert.assertEquals(
+			classLoader, _bundleServletContext.getClassLoader());
+
+		verifyBundleWiring();
+	}
+
+	@Test
+	public void testGetFilterChain() throws Exception {
+		mockBundleWiring();
+
+		List<LogRecord> logFilterRecords = JDKLoggerTestUtil.configureJDKLogger(
+			MockLoggingFilter.class.getName(), Level.INFO);
+
+		String cssFilterName = "CSS Filter";
+
+		registerFilter(
+			cssFilterName, new MockLoggingFilter(cssFilterName), null,
+			"/css/*");
+
+		String jsFilterName = "JS Filter";
+
+		registerFilter(
+			jsFilterName, new MockLoggingFilter(jsFilterName), null, "/js/*");
+
+		registerServlet("Sample Servlet", "/");
+
+		FilterChain filterChain = _bundleServletContext.getFilterChain(
+			"/js/main.js", DispatcherType.REQUEST);
+
+		Assert.assertNotNull(filterChain);
+
+		filterChain.doFilter(
+			new MockHttpServletRequest(), new MockHttpServletResponse());
+
+		Assert.assertEquals(1, logFilterRecords.size());
+
+		LogRecord logRecord = logFilterRecords.get(0);
+
+		Assert.assertEquals(jsFilterName, logRecord.getMessage());
+
+		verifyBundleWiring();
+	}
+
+	@Test
+	public void testGetServletContextName() {
+		Assert.assertEquals(
+			"test",_bundleServletContext.getServletContextName());
+	}
+
+	@Test
+	public void testRegisterFilterBadURLMapping()
+		throws NamespaceException, ServletException {
+
+		try {
+			registerFilter("Bad Mapping Filter", "/a/");
+		}
+		catch (IllegalArgumentException iae) {
+			return;
+		}
+
+		Assert.fail();
+	}
+
+	@Test
+	public void testRegisterFilterMultipleMapping()
+		throws NamespaceException, ServletException {
+
+		registerFilter("Security Filter", "/a", "/b/*");
+	}
+
+	@Test
+	public void testRegisterFilterSingleMapping()
+		throws NamespaceException, ServletException {
+
+		registerFilter("Security Filter", "/a");
+	}
+
+	@Test
+	public void testRegisterFilterWithServiceRanking()
+		throws NamespaceException, ServletException {
+
+		Map<String, String> initParameters = new HashMap<String, String>();
+
+		initParameters.put("service.ranking", "1");
+
+		registerFilter("Security Filter", _filter, initParameters, "/a");
+	}
+
+	@Test
+	public void testRegisterHttpSessionActivationListener() {
+		registerListener(_httpSessionActivationListener);
+	}
+
+	@Test
+	public void testRegisterHttpSessionAttributeListener() {
+		registerListener(_httpSessionAttributeListener);
+	}
+
+	@Test
+	public void testRegisterHttpSessionBindingListener() {
+		registerListener(_httpSessionBindingListener);
+	}
+
+	@Test
+	public void testRegisterHttpSessionListener() {
+		registerListener(_httpSessionListener);
+	}
+
+	@Test
+	public void testRegisterNullFilter()
+		throws NamespaceException, ServletException {
+
+		try {
+			_bundleServletContext.registerFilter(
+				"Filter A", Arrays.asList("/a"), null, null, _httpContext);
+		}
+		catch (IllegalArgumentException iae) {
+			return;
+		}
+
+		Assert.fail();
+	}
+
+	@Test
+	public void testRegisterNullServlet()
+		throws NamespaceException, ServletException {
+
+		try {
+			_bundleServletContext.registerServlet(
+				"Servlet A", Arrays.asList("/a"), null, null, _httpContext);
+		}
+		catch (IllegalArgumentException iae) {
+			return;
+		}
+
+		Assert.fail();
+	}
+
+	@Test
+	public void testRegisterResource() throws NamespaceException {
+		registerResource("JS Servlet", "/js");
+	}
+
+	@Test
+	public void testRegisterResourceDuplicatedMapping()
+		throws NamespaceException {
+
+		registerResource("CSS Servlet", "/css");
+
+		try {
+			registerResource("New CSS Servlet", "/css");
+		}
+		catch (NamespaceException ne) {
+			return;
+		}
+
+		Assert.fail();
+	}
+
+	@Test
+	public void testRegisterResourceInvalidName() throws NamespaceException {
+		try {
+			registerResource("Bad Name/", "/js");
+		}
+		catch (IllegalArgumentException iae) {
+			return;
+		}
+
+		Assert.fail();
+	}
+
+	@Test
+	public void testRegisterServletContextAttributeListener() {
+		registerListener(_servletContextAttributeListener);
+	}
+
+	@Test
+	public void testRegisterServletContextListener() {
+		registerListener(_servletContextListener);
+	}
+
+	@Test
+	public void testRegisterServletMappingTwice()
+		throws NamespaceException, ServletException {
+
+		registerServlet("Original Servlet", "/a");
+
+		try {
+			registerServlet("New Servlet", "/a");
+		}
+		catch (NamespaceException ne) {
+			return;
+		}
+
+		Assert.fail();
+	}
+
+	@Test
+	public void testRegisterServletMultipleMapping()
+		throws NamespaceException, ServletException {
+
+		registerServlet("Servlet A", "/a", "/b", "/c");
+	}
+
+	@Test
+	public void testRegisterServletRequestAttributeListener() {
+		List<ServletRequestAttributeListener> servletRequestAttributeListeners =
+			_bundleServletContext.getServletRequestAttributeListeners();
+
+		int initialSize = servletRequestAttributeListeners.size();
+
+		registerListener(_servletRequestAttributeListener);
+
+		servletRequestAttributeListeners =
+			_bundleServletContext.getServletRequestAttributeListeners();
+
+		Assert.assertEquals(
+			initialSize + 1, servletRequestAttributeListeners.size());
+	}
+
+	@Test
+	public void testRegisterServletRequestListener() {
+		List<ServletRequestListener> servletRequestListeners =
+			_bundleServletContext.getServletRequestListeners();
+
+		int initialSize = servletRequestListeners.size();
+
+		registerListener(_servletRequestListener);
+
+		servletRequestListeners =
+			_bundleServletContext.getServletRequestListeners();
+
+		Assert.assertEquals(initialSize + 1, servletRequestListeners.size());
+	}
+
+	@Test
+	public void testRegisterServletSingleMapping()
+		throws NamespaceException, ServletException {
+
+		registerServlet("Servlet B", "/a");
+	}
+
+	@Test
+	public void testUnegisterHttpSessionAttributeListener() {
+		unregisterListener(_httpSessionAttributeListener);
+	}
+
+	@Test
+	public void testUnegisterServletContextListener() {
+		unregisterListener(_servletContextListener);
+	}
+
+	@Test
+	public void testUnregisterExistingServlet()
+		throws NamespaceException, ServletException {
+
+		String servletName = "Servlet A";
+
+		registerServlet(servletName, "/a");
+
+		_bundleServletContext.unregisterServlet(servletName);
+
+		Servlet servlet = _bundleServletContext.getServlet(servletName);
+
+		Assert.assertNull(servlet);
+	}
+
+	@Test
+	public void testUnregisterHttpSessionActivationListener() {
+		unregisterListener(_httpSessionActivationListener);
+	}
+
+	@Test
+	public void testUnregisterHttpSessionBindingListener() {
+		unregisterListener(_httpSessionBindingListener);
+	}
+
+	@Test
+	public void testUnregisterHttpSessionListener() {
+		unregisterListener(_httpSessionListener);
+	}
+
+	@Test
+	public void testUnregisterNonExistingServlet() {
+		String servletName = "Nonexisting Servlet";
+
+		_bundleServletContext.unregisterServlet(servletName);
+
+		Servlet servlet = _bundleServletContext.getServlet(servletName);
+
+		Assert.assertNull(servlet);
+	}
+
+	@Test
+	public void testUnregisterServletContextAttributeListener() {
+		registerListener(_servletContextAttributeListener);
+	}
+
+	@Test
+	public void testUnregisterServletRequestAttributeListener() {
+		List<ServletRequestAttributeListener> servletRequestAttributeListeners =
+			_bundleServletContext.getServletRequestAttributeListeners();
+
+		int initialSize = servletRequestAttributeListeners.size();
+
+		registerListener(_servletRequestAttributeListener);
+
+		unregisterListener(_servletRequestAttributeListener);
+
+		servletRequestAttributeListeners =
+			_bundleServletContext.getServletRequestAttributeListeners();
+
+		Assert.assertEquals(
+			initialSize, servletRequestAttributeListeners.size());
+	}
+
+	@Test
+	public void testUnregisterServletRequestListener() {
+		List<ServletRequestListener> servletRequestListeners =
+			_bundleServletContext.getServletRequestListeners();
+
+		int initialSize = servletRequestListeners.size();
+
+		registerListener(_servletRequestListener);
+
+		unregisterListener(_servletRequestListener);
+
+		servletRequestListeners =
+			_bundleServletContext.getServletRequestListeners();
+
+		Assert.assertEquals(initialSize, servletRequestListeners.size());
+	}
+
+	protected void mockBundleWiring() {
+		when(
+			_bundle.adapt(BundleWiring.class)
+		).thenReturn(
+			_bundleWiring
+		);
+
+		Class<?> clazz = getClass();
+
+		when(
+			_bundleWiring.getClassLoader()
+		).thenReturn(
+			clazz.getClassLoader()
+		);
+	}
+
+	protected void registerFilter(
+			String filterName, Filter filter,
+			Map<String, String> initParameters, String ... urlPatterns)
+		throws NamespaceException, ServletException {
+
+		mockBundleWiring();
+
+		_bundleServletContext.registerFilter(
+			filterName, Arrays.asList(urlPatterns), filter, initParameters,
+			_httpContext);
+
+		verifyBundleWiring();
+	}
+
+	protected void registerFilter(String filterName, String ... urlPatterns)
+		throws NamespaceException, ServletException {
+
+		registerFilter(filterName, _filter, null, urlPatterns);
+	}
+
+	protected void registerListener(Object listener) {
+		mockBundleWiring();
+
+		_bundleServletContext.registerListener(listener, null, _httpContext);
+
+		verifyBundleWiring();
+	}
+
+	protected void registerResource(String servletName, String alias)
+		throws NamespaceException {
+
+		mockBundleWiring();
+
+		_bundleServletContext.registerResources(
+			alias, servletName, _httpContext);
+
+		Servlet servlet = _bundleServletContext.getServlet(servletName);
+
+		Assert.assertNotNull(servlet);
+
+		Assert.assertTrue(servlet instanceof ResourceServlet);
+
+		verifyBundleWiring();
+	}
+
+	protected void registerServlet(String servletName, String ... urlPatterns)
+		throws NamespaceException, ServletException {
+
+		mockBundleWiring();
+
+		when(
+			_servlet.getServletConfig()
+		).thenReturn(
+			new MockServletConfig(servletName)
+		);
+
+		_bundleServletContext.registerServlet(
+			servletName, Arrays.asList(urlPatterns), _servlet, null,
+			_httpContext);
+
+		Servlet servlet = _bundleServletContext.getServlet(servletName);
+
+		Assert.assertNotNull(servlet);
+
+		Assert.assertEquals(
+			servletName, servlet.getServletConfig().getServletName());
+
+		Mockito.verify(_servlet).getServletConfig();
+
+		verifyBundleWiring();
+	}
+
+	protected void unregisterListener(Object listener) {
+		mockBundleWiring();
+
+		_bundleServletContext.unregisterListener(listener);
+
+		verifyBundleWiring();
+	}
+
+	protected void verifyBundleWiring() {
+		Bundle bundle = Mockito.verify(_bundle);
+
+		bundle.adapt(BundleWiring.class);
+
+		BundleWiring bundleWiring = Mockito.verify(_bundleWiring);
+
+		bundleWiring.getClassLoader();
+	}
+
+	@Mock
+	private Bundle _bundle;
+
+	private BundleServletContext _bundleServletContext;
+
+	@Mock
+	private BundleWiring _bundleWiring;
+
+	@Mock
+	private Filter _filter;
+
+	@Mock
+	private HttpContext _httpContext;
+
+	@Mock
+	private HttpSessionActivationListener _httpSessionActivationListener;
+
+	@Mock
+	private HttpSessionAttributeListener _httpSessionAttributeListener;
+
+	@Mock
+	private HttpSessionBindingListener _httpSessionBindingListener;
+
+	@Mock
+	private HttpSessionListener _httpSessionListener;
+
+	@Mock
+	private Servlet _servlet;
+
+	@Mock
+	private ServletContext _servletContext;
+
+	@Mock
+	private ServletContextAttributeListener _servletContextAttributeListener;
+
+	@Mock
+	private ServletContextListener _servletContextListener;
+
+	@Mock
+	private ServletRequestAttributeListener _servletRequestAttributeListener;
+
+	@Mock
+	private ServletRequestListener _servletRequestListener;
+
+	private class MockLoggingFilter extends MockFilter {
+
+		public MockLoggingFilter(String message) {
+			_message = message;
+
+			_logger.setLevel(Level.INFO);
+		}
+
+
+		public void doFilter(
+			ServletRequest servletRequest, ServletResponse servletResponse,
+			FilterChain filterChain) {
+
+			_logger.info(_message);
+		}
+
+		private Logger _logger = Logger.getLogger(
+			MockLoggingFilter.class.getName());
+		private String _message;
+
+	}
+
+	private class MockLoggingServlet extends MockServlet {
+
+		public MockLoggingServlet(String message) {
+			_message = message;
+
+			_logger.setLevel(Level.INFO);
+		}
+
+
+		public void service(
+			ServletRequest servletRequest, ServletResponse servletResponse) {
+
+			_logger.info(_message);
+		}
+
+		private Logger _logger = Logger.getLogger(
+			MockLoggingServlet.class.getName());
+		private String _message;
+
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockFilter.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockFilter.java
new file mode 100644
index 0000000..d296195
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockFilter.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.mock;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+/**
+ * @author Miguel Pastor
+ */
+public class MockFilter implements Filter {
+
+
+	public void destroy() {
+	}
+
+
+	public void doFilter(
+		ServletRequest servletRequest, ServletResponse servletResponse,
+		FilterChain filterChain) {
+	}
+
+
+	public void init(FilterConfig filterConfig) {
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockServlet.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockServlet.java
new file mode 100644
index 0000000..42a2637
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockServlet.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.mock;
+
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+/**
+ * @author Miguel Pastor
+ */
+public class MockServlet extends GenericServlet {
+
+
+	public void service(
+		ServletRequest servletRequest, ServletResponse servletResponse) {
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockServletContextListener.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockServletContextListener.java
new file mode 100644
index 0000000..9b94adc
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/mock/MockServletContextListener.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.mock;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * @author Miguel Pastor
+ */
+public class MockServletContextListener implements ServletContextListener {
+
+
+	public void contextDestroyed(ServletContextEvent servletContextEvent) {
+	}
+
+
+	public void contextInitialized(ServletContextEvent servletContextEvent) {
+	}
+
+}
\ No newline at end of file
diff --git a/shared/portal-http-service/test/unit/com/liferay/portal/http/service/test/MockBundle.java b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/test/MockBundle.java
new file mode 100644
index 0000000..7415c2e
--- /dev/null
+++ b/shared/portal-http-service/test/unit/com/liferay/portal/http/service/test/MockBundle.java
@@ -0,0 +1,191 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.http.service.test;
+
+import com.liferay.portal.kernel.util.StringPool;
+
+import java.io.File;
+import java.io.InputStream;
+
+import java.net.URL;
+
+import java.security.cert.X509Certificate;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Version;
+
+/**
+ * @author Miguel Pastor
+ */
+public class MockBundle implements Bundle {
+
+
+	public <A> A adapt(Class<A> clazz) {
+		return null;
+	}
+
+
+	public int compareTo(Bundle bundle) {
+		return 0;
+	}
+
+
+	public Enumeration<URL> findEntries(
+		String path, String filePattern, boolean recurse) {
+
+		return Collections.enumeration(new ArrayList<URL>());
+	}
+
+
+	public BundleContext getBundleContext() {
+		return null;
+	}
+
+
+	public long getBundleId() {
+		return 0;
+	}
+
+
+	public File getDataFile(String fileName) {
+		return null;
+	}
+
+
+	public URL getEntry(String path) {
+		return null;
+	}
+
+
+	public Enumeration<String> getEntryPaths(String path) {
+		return Collections.enumeration(new ArrayList<String>());
+	}
+
+
+	public Dictionary<String, String> getHeaders() {
+		return new Hashtable<String, String>();
+	}
+
+
+	public Dictionary<String, String> getHeaders(String locale) {
+		return new Hashtable<String, String>();
+	}
+
+
+	public long getLastModified() {
+		return 0;
+	}
+
+
+	public String getLocation() {
+		return StringPool.BLANK;
+	}
+
+
+	public ServiceReference<?>[] getRegisteredServices() {
+		return new ServiceReference<?>[0];
+	}
+
+
+	public URL getResource(String name) {
+		return null;
+	}
+
+
+	public Enumeration<URL> getResources(String name) {
+		return Collections.enumeration(new ArrayList<URL>());
+	}
+
+
+	public ServiceReference<?>[] getServicesInUse() {
+		return new ServiceReference<?>[0];
+	}
+
+
+	public Map<X509Certificate, List<X509Certificate>> getSignerCertificates(
+		int signersType) {
+
+		return Collections.emptyMap();
+	}
+
+
+	public int getState() {
+		return Bundle.ACTIVE;
+	}
+
+
+	public String getSymbolicName() {
+		return "bundle";
+	}
+
+
+	public Version getVersion() {
+		return Version.emptyVersion;
+	}
+
+
+	public boolean hasPermission(Object permission) {
+		return false;
+	}
+
+
+	public Class<?> loadClass(String className) throws ClassNotFoundException {
+		Class<?> clazz = getClass();
+
+		ClassLoader classLoader = clazz.getClassLoader();
+
+		return classLoader.loadClass(className);
+	}
+
+
+	public void start() {
+		start(0);
+	}
+
+
+	public void start(int options) {
+	}
+
+
+	public void stop() {
+	}
+
+
+	public void stop(int options) {
+	}
+
+
+	public void uninstall() {
+	}
+
+
+	public void update() {
+	}
+
+
+	public void update(InputStream inputStream) {
+	}
+
+}
\ No newline at end of file
diff --git a/source-formatter.properties b/source-formatter.properties
new file mode 100644
index 0000000..618e996
--- /dev/null
+++ b/source-formatter.properties
@@ -0,0 +1,106 @@
+##
+## Exclusions
+##
+
+    #
+    # Input a list of comma delimited paths that will be excluded by the source
+    # formatter.
+    #
+    source.formatter.excludes=\
+        **/.git/**,\
+        **/bin/**,\
+        **/classes/**,\
+        **/test-classes/**,\
+        **/test-coverage/**,\
+        **/test-results/**,\
+        **/tmp/**
+
+    #
+    # Input a list of comma delimited file names that should be ignored when
+    # applying diamond operators.
+    #
+    diamond.operator.excludes.files=\
+        portlets/wsrp-portlet/docroot/WEB-INF/src/com/liferay/wsrp/util/WSRPConsumerManagerFactory.java,\
+        webs/kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/runtime/util/ScriptingContextBuilderImpl.java
+
+    #
+    # Input a list of comma delimited file names that are allowed to call
+    # session.createSQLQuery instead of session.createSynchronizedSQLQuery. See
+    # LPS-42599.
+    #
+    hibernate.sql.query.excludes=
+
+    #
+    # Input a list of comma delimited file names that are allowed to have
+    # unalphabetized Java terms. In addition these files are allowed to have
+    # nonfinal variables that are capitalized.
+    #
+    javaterm.sort.excludes=
+
+    #
+    # Input a list of comma delimited file names that are allowed to surpass the
+    # 80 column limit.
+    #
+    line.length.excludes=\
+        portlets/calendar-portlet/docroot/WEB-INF/src/com/liferay/calendar/lar/CalendarPortletDataHandler.java@132
+
+    #
+    # Input a list of comma delimited portlet XML files names that are allowed
+    # to have non-numerical portlet-name elements.
+    #
+    numerical.portlet.name.element.excludes=
+
+    #
+    # Input a list of comma delimited paths that are allowed to run outside the
+    # portal. For files that match any of these paths, we skip source formatting
+    # rules that enforce calling portal methods.
+    #
+    run.outside.portal.excludes=
+
+    #
+    # Input a list of comma delimited file names that are allowed to use
+    # java.security.SecureRandom. See LPS-39508.
+    #
+    secure.random.excludes=
+
+    #
+    # Input a list of comma delimited file names that are allowed to have
+    # nonstatic _log variables.
+    #
+    static.log.excludes=
+
+    #
+    # Input a list of comma delimited XML file names that are allowed to have
+    # lines that start with spaces.
+    #
+    xml.excludes=\
+        portlets/sample-struts-liferay-portlet/docroot/WEB-INF/validator-rules.xml,\
+        portlets/sample-struts-portlet/docroot/WEB-INF/validator-rules.xml,\
+        webs/solr4-web/docroot/WEB-INF/conf/solrconfig.xml
+
+##
+## Miscellaneous
+##
+
+    #
+    # Specify incorrect and excpected parameters for the methods
+    # LanguageUtil.get and LanguageUtil.format. See LPS-47682.
+    #
+    languageutil.expected.parameter=pageContext
+    languageutil.incorrect.parameter=request
+
+    #
+    # Set this property to true to add the release version to deprecated Java
+    # terms.
+    #
+    add.missing.deprecation.release.version=false
+
+##
+## Portal Compat
+##
+
+    #
+    # Set this property to true to force plugins to use classes from the portal
+    # compat JAR if possible.
+    #
+    use.portal.compat.import=true
\ No newline at end of file
diff --git a/themes/build-common-theme.xml b/themes/build-common-theme.xml
new file mode 100644
index 0000000..385ad8e
--- /dev/null
+++ b/themes/build-common-theme.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-theme">
+	<import file="../build-common-plugin.xml" />
+</project>
\ No newline at end of file
diff --git a/themes/build.xml b/themes/build.xml
new file mode 100644
index 0000000..b77ffb6
--- /dev/null
+++ b/themes/build.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="themes" basedir="." default="deploy">
+	<import file="../build-common-plugins.xml" />
+
+	<target name="create">
+		<if>
+			<or>
+				<not>
+					<isset property="theme.display.name" />
+				</not>
+				<not>
+					<isset property="theme.name" />
+				</not>
+			</or>
+			<then>
+				<fail>This task must be called by the create script.</fail>
+			</then>
+		</if>
+
+		<property name="theme.parent.dir" value="${user.dir}" />
+		<property name="theme.dir" value="${theme.parent.dir}/${theme.name}-theme" />
+
+		<if>
+			<available file="${theme.dir}" />
+			<then>
+				<fail>${theme.name}-theme already exists.</fail>
+			</then>
+		</if>
+
+		<copy todir="${theme.dir}">
+			<fileset
+				dir="${sdk.dir}/tools/templates/theme_tmpl"
+			/>
+		</copy>
+
+		<mkdir dir="${theme.dir}/docroot/_diffs" />
+		<mkdir dir="${theme.dir}/docroot/WEB-INF/src/resources-importer/document_library/documents" />
+		<mkdir dir="${theme.dir}/docroot/WEB-INF/src/resources-importer/journal/articles" />
+		<mkdir dir="${theme.dir}/docroot/WEB-INF/src/resources-importer/journal/structures" />
+		<mkdir dir="${theme.dir}/docroot/WEB-INF/src/resources-importer/journal/templates" />
+
+		<replace dir="${theme.dir}">
+			<replacefilter token="@plugin.type.dir@" value="${plugin.type.dir}" />
+			<replacefilter token="@theme.display.name@" value="${theme.display.name}" />
+			<replacefilter token="@theme.name@" value="${theme.name}" />
+		</replace>
+	</target>
+</project>
\ No newline at end of file
diff --git a/themes/create.bat b/themes/create.bat
new file mode 100644
index 0000000..30f910d
--- /dev/null
+++ b/themes/create.bat
@@ -0,0 +1,25 @@
+@echo off
+
+if "" == "%1" goto errorCreate
+
+if "" == "%2" goto errorCreate
+
+call ant -Dtheme.name=%1 -Dtheme.display.name=%2 create
+
+rem call ant deploy
+
+goto end
+
+:errorCreate
+	echo.
+	echo Usage: create.bat hello-world "Hello World"
+	echo.
+	echo The first hello-world is your theme id. A new directory will be created based
+	echo on the theme id.
+	echo.
+	echo The second "Hello World" is the theme's display name. The quotation marks are
+	echo only needed because there is a space in the display name.
+
+	goto end
+
+:end
\ No newline at end of file
diff --git a/themes/create.sh b/themes/create.sh
new file mode 100644
index 0000000..01abe6a
--- /dev/null
+++ b/themes/create.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#set -x
+
+if [ $# -lt 2 ]; then
+	echo
+	echo Usage: ./create.sh hello-world \"Hello World\"
+	echo
+	echo The first hello-world is your theme id. A new directory will be created based
+	echo on the theme id.
+	echo
+	echo The second \"Hello World\" is the theme\'s display name. The quotation marks are
+	echo only needed because there is a space in the display name.
+
+	exit 127
+fi
+
+ant -Dtheme.name=$1 -Dtheme.display.name=\"$2\" create
+
+#ant deploy
+
+exit 0
\ No newline at end of file
diff --git a/themes/merge.bat b/themes/merge.bat
new file mode 100644
index 0000000..f0a4594
--- /dev/null
+++ b/themes/merge.bat
@@ -0,0 +1,15 @@
+@echo off
+
+if "" == "%1" goto errorMerge
+
+call ant -Dtheme.name=%1 merge
+
+goto end
+
+:errorMerge
+	echo.
+	echo Usage: merge.bat hello-world
+
+	goto end
+
+:end
\ No newline at end of file
diff --git a/themes/readme.txt b/themes/readme.txt
new file mode 100644
index 0000000..55e64f5
--- /dev/null
+++ b/themes/readme.txt
@@ -0,0 +1,3 @@
+To view more information about developing themes, please view this wiki entry:
+
+http://www.liferay.com/web/guest/community/wiki/-/wiki/Main/Themes#section-Themes-DevelopingATheme
\ No newline at end of file
diff --git a/tools/templates/ear_tmpl/modules/META-INF/application.xml b/tools/templates/ear_tmpl/modules/META-INF/application.xml
new file mode 100644
index 0000000..d08f65d
--- /dev/null
+++ b/tools/templates/ear_tmpl/modules/META-INF/application.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<application
+	id="Application_ID" version="1.4"
+	xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+>
+	<display-name>Liferay Portal</display-name>
+</application>
\ No newline at end of file
diff --git a/tools/templates/ext_tmpl/build.xml b/tools/templates/ext_tmpl/build.xml
new file mode 100644
index 0000000..d2cd075
--- /dev/null
+++ b/tools/templates/ext_tmpl/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="@ext.name@-ext" basedir="." default="deploy">
+	<import file="@plugin.type.dir@/build-common-ext.xml" />
+</project>
\ No newline at end of file
diff --git a/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/liferay-portlet-ext.xml b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/liferay-portlet-ext.xml
new file mode 100644
index 0000000..e1a6a9b
--- /dev/null
+++ b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/liferay-portlet-ext.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
+
+<liferay-portlet-app>
+</liferay-portlet-app>
\ No newline at end of file
diff --git a/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/portlet-ext.xml b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/portlet-ext.xml
new file mode 100644
index 0000000..11a6e3e
--- /dev/null
+++ b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/portlet-ext.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0">
+</portlet-app>
\ No newline at end of file
diff --git a/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/struts-config-ext.xml b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/struts-config-ext.xml
new file mode 100644
index 0000000..989a32c
--- /dev/null
+++ b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/struts-config-ext.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
+
+<struts-config>
+	<action-mappings>
+	</action-mappings>
+</struts-config>
\ No newline at end of file
diff --git a/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/tiles-defs-ext.xml b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/tiles-defs-ext.xml
new file mode 100644
index 0000000..8d8c8de
--- /dev/null
+++ b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/tiles-defs-ext.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
+
+<tiles-definitions>
+	<definition name="portlet.ext" extends="portlet" />
+</tiles-definitions>
\ No newline at end of file
diff --git a/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/web.xml b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..7d8c082
--- /dev/null
+++ b/tools/templates/ext_tmpl/docroot/WEB-INF/ext-web/docroot/WEB-INF/web.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+</web-app>
\ No newline at end of file
diff --git a/tools/templates/ext_tmpl/docroot/WEB-INF/liferay-plugin-package.properties b/tools/templates/ext_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..a74c747
--- /dev/null
+++ b/tools/templates/ext_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,11 @@
+name=@ext.display.name@
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
\ No newline at end of file
diff --git a/tools/templates/hook_tmpl/build.xml b/tools/templates/hook_tmpl/build.xml
new file mode 100644
index 0000000..b7ff356
--- /dev/null
+++ b/tools/templates/hook_tmpl/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="@hook.name@-hook" basedir="." default="deploy">
+	<import file="@plugin.type.dir@/build-common-hook.xml" />
+</project>
\ No newline at end of file
diff --git a/tools/templates/hook_tmpl/docroot/WEB-INF/liferay-hook.xml b/tools/templates/hook_tmpl/docroot/WEB-INF/liferay-hook.xml
new file mode 100644
index 0000000..984d2e7
--- /dev/null
+++ b/tools/templates/hook_tmpl/docroot/WEB-INF/liferay-hook.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
+
+<hook>
+</hook>
\ No newline at end of file
diff --git a/tools/templates/hook_tmpl/docroot/WEB-INF/liferay-plugin-package.properties b/tools/templates/hook_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..ddfc009
--- /dev/null
+++ b/tools/templates/hook_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,11 @@
+name=@hook.display.name@
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
\ No newline at end of file
diff --git a/tools/templates/hook_tmpl/ivy.xml b/tools/templates/hook_tmpl/ivy.xml
new file mode 100644
index 0000000..2f9047f
--- /dev/null
+++ b/tools/templates/hook_tmpl/ivy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="@hook.name@-hook" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/hook_tmpl/test/integration/arquillian.xml b/tools/templates/hook_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/hook_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/layouttpl_tmpl/build.xml b/tools/templates/layouttpl_tmpl/build.xml
new file mode 100644
index 0000000..32519e1
--- /dev/null
+++ b/tools/templates/layouttpl_tmpl/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="@layouttpl.name@-layouttpl" basedir="." default="deploy">
+	<property name="plugin.version" value="1" />
+
+	<import file="@plugin.type.dir@/build-common-layouttpl.xml" />
+</project>
\ No newline at end of file
diff --git a/tools/templates/layouttpl_tmpl/docroot/WEB-INF/liferay-layout-templates.xml b/tools/templates/layouttpl_tmpl/docroot/WEB-INF/liferay-layout-templates.xml
new file mode 100644
index 0000000..be3b906
--- /dev/null
+++ b/tools/templates/layouttpl_tmpl/docroot/WEB-INF/liferay-layout-templates.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE layout-templates PUBLIC "-//Liferay//DTD Layout Templates 6.2.0//EN" "http://www.liferay.com/dtd/liferay-layout-templates_6_2_0.dtd">
+
+<layout-templates>
+	<custom>
+		<layout-template id="@layouttpl.template.name@" name="@layouttpl.display.name@">
+			<template-path>/@layouttpl.template.name@.tpl</template-path>
+			<wap-template-path>/@layouttpl.template.name@.wap.tpl</wap-template-path>
+			<thumbnail-path>/@layouttpl.template.name@.png</thumbnail-path>
+		</layout-template>
+	</custom>
+</layout-templates>
\ No newline at end of file
diff --git a/tools/templates/layouttpl_tmpl/docroot/WEB-INF/liferay-plugin-package.properties b/tools/templates/layouttpl_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..35bc9b6
--- /dev/null
+++ b/tools/templates/layouttpl_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,11 @@
+name=@layouttpl.display.name@
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
\ No newline at end of file
diff --git a/tools/templates/layouttpl_tmpl/docroot/blank_columns.png b/tools/templates/layouttpl_tmpl/docroot/blank_columns.png
new file mode 100644
index 0000000..159d0d7
Binary files /dev/null and b/tools/templates/layouttpl_tmpl/docroot/blank_columns.png differ
diff --git a/tools/templates/layouttpl_tmpl/docroot/blank_columns.tpl b/tools/templates/layouttpl_tmpl/docroot/blank_columns.tpl
new file mode 100644
index 0000000..e69de29
diff --git a/tools/templates/layouttpl_tmpl/docroot/blank_columns.wap.tpl b/tools/templates/layouttpl_tmpl/docroot/blank_columns.wap.tpl
new file mode 100644
index 0000000..e69de29
diff --git a/tools/templates/pom_tmpl/template.pom b/tools/templates/pom_tmpl/template.pom
new file mode 100644
index 0000000..5048c66
--- /dev/null
+++ b/tools/templates/pom_tmpl/template.pom
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<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"
+>
+	<artifactId>${ivy.pom.artifactId}</artifactId>
+	<description>${ivy.pom.description}</description>
+	<developers>
+		<developer>
+			<name>${ivy.pom.developer.name}</name>
+			<organization>${ivy.pom.developer.organization}</organization>
+			<organizationUrl>${ivy.pom.developer.organizationUrl}</organizationUrl>
+		</developer>
+	</developers>
+	<groupId>${ivy.pom.groupId}</groupId>
+	<licenses>
+		<license>
+			<name>${ivy.pom.license.name}</name>
+			<url>${ivy.pom.license.url}</url>
+		</license>
+	</licenses>
+	<modelVersion>4.0.0</modelVersion>
+	<name>${ivy.pom.name}</name>
+	<packaging>${ivy.pom.packaging}</packaging>
+	<scm>
+		<connection>${ivy.pom.scm.connection}</connection>
+		<developerConnection>${ivy.pom.scm.developerConnection}</developerConnection>
+		<url>${ivy.pom.scm.url}</url>
+	</scm>
+	<url>${ivy.pom.url}</url>
+	<version>${ivy.pom.version}</version>
+</project>
\ No newline at end of file
diff --git a/tools/templates/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml b/tools/templates/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..0044e53
--- /dev/null
+++ b/tools/templates/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<web-app
+	version="2.5"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+>
+	<context-param>
+		<param-name>com.sun.faces.expressionFactory</param-name>
+		<param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
+	</context-param>
+	<context-param>
+		<param-name>javax.faces.PROJECT_STAGE</param-name>
+		<param-value>Development</param-value>
+	</context-param>
+	<context-param>
+		<param-name>org.icefaces.mandatoryResourceConfiguration</param-name>
+		<param-value>none</param-value>
+	</context-param>
+	<context-param>
+		<param-name>org.icefaces.uniqueResourceURLs</param-name>
+		<param-value>false</param-value>
+	</context-param>
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+</web-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_icefaces_tmpl/docroot/views/view.xhtml b/tools/templates/portlet_icefaces_tmpl/docroot/views/view.xhtml
new file mode 100644
index 0000000..4662781
--- /dev/null
+++ b/tools/templates/portlet_icefaces_tmpl/docroot/views/view.xhtml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ace="http://www.icefaces.org/icefaces/components"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:icecore="http://www.icefaces.org/icefaces/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
+	<h:head />
+	<h:body>
+		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
+	</h:body>
+</f:view>
\ No newline at end of file
diff --git a/tools/templates/portlet_icefaces_tmpl/ivy.xml b/tools/templates/portlet_icefaces_tmpl/ivy.xml
new file mode 100644
index 0000000..4f9d58c
--- /dev/null
+++ b/tools/templates/portlet_icefaces_tmpl/ivy.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="portlet_icefaces_tmpl" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="icefaces" org="org.icefaces" rev="3.3.0" />
+		<dependency name="icefaces-ace" org="org.icefaces" rev="3.3.0" />
+		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
+		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="liferay-faces-bridge-api" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-bridge-impl" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-portal" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-util" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_icefaces_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_icefaces_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_icefaces_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/faces-config.xml b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/faces-config.xml
new file mode 100644
index 0000000..d629bec
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/faces-config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<faces-config
+	version="2.1"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"
+>
+	<lifecycle>
+		<phase-listener>com.liferay.faces.util.lifecycle.DebugPhaseListener</phase-listener>
+	</lifecycle>
+</faces-config>
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/liferay-hook.xml b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/liferay-hook.xml
new file mode 100644
index 0000000..d650376
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/liferay-hook.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
+
+<hook>
+	<language-properties>Language_en_US.properties</language-properties>
+</hook>
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/src/Language_en_US.properties b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/src/Language_en_US.properties
new file mode 100644
index 0000000..a2c08a6
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/src/Language_en_US.properties
@@ -0,0 +1 @@
+@portlet.name@-hello-world=Hello @portlet.display.name@!
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/src/log4j.properties b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/src/log4j.properties
new file mode 100644
index 0000000..bdb36e3
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/src/log4j.properties
@@ -0,0 +1,8 @@
+log4j.rootLogger=INFO, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+
+log4j.logger.com.liferay.faces.util.lifecycle.DebugPhaseListener=DEBUG
+log4j.logger.com.liferay.sample=DEBUG
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/web.xml b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..2602df3
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<web-app
+	version="2.5"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+>
+	<context-param>
+		<param-name>com.sun.faces.expressionFactory</param-name>
+		<param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
+	</context-param>
+	<context-param>
+		<param-name>javax.faces.PROJECT_STAGE</param-name>
+		<param-value>Development</param-value>
+	</context-param>
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+</web-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/weblogic.xml b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/weblogic.xml
new file mode 100644
index 0000000..8190f53
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/WEB-INF/weblogic.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<wls:weblogic-web-app
+	xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd http://xmlns.oracle.com/weblogic/weblogic-web-app http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd"
+>
+	<wls:container-descriptor>
+		<wls:prefer-application-packages>
+			<wls:package-name>com.sun.xml.bind.*</wls:package-name>
+			<wls:package-name>org.apache.commons.fileupload.*</wls:package-name>
+			<wls:package-name>org.apache.xerces.*</wls:package-name>
+		</wls:prefer-application-packages>
+		<wls:optimistic-serialization>true</wls:optimistic-serialization>
+		<wls:show-archived-real-path-enabled>true</wls:show-archived-real-path-enabled>
+	</wls:container-descriptor>
+	<wls:library-ref>
+		<wls:library-name>jsf</wls:library-name>
+	</wls:library-ref>
+</wls:weblogic-web-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/css/main.css b/tools/templates/portlet_jsf_tmpl/docroot/css/main.css
new file mode 100644
index 0000000..eca0c22
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/css/main.css
@@ -0,0 +1,12 @@
+.portlet-msg-error {
+	font-style: italic;
+	font-weight: bold;
+	margin: 1px 0px 0px 0px;
+	padding: 1px 5px 1px 24px;
+}
+
+.portlet-msg-info {
+	font-style: italic;
+	margin: 1px 0px 0px 0px;
+	padding: 1px 5px 1px 24px;
+}
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/docroot/views/view.xhtml b/tools/templates/portlet_jsf_tmpl/docroot/views/view.xhtml
new file mode 100644
index 0000000..a2c5359
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/docroot/views/view.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
+	<h:head />
+	<h:body>
+		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
+	</h:body>
+</f:view>
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/ivy.xml b/tools/templates/portlet_jsf_tmpl/ivy.xml
new file mode 100644
index 0000000..fb48321
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/ivy.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="portlet_jsf_tmpl" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
+		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="liferay-faces-bridge-api" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-bridge-impl" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-portal" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-util" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_jsf_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_jsf_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_jsf_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/portlet_liferay_faces_alloy_tmpl/docroot/views/view.xhtml b/tools/templates/portlet_liferay_faces_alloy_tmpl/docroot/views/view.xhtml
new file mode 100644
index 0000000..98cd440
--- /dev/null
+++ b/tools/templates/portlet_liferay_faces_alloy_tmpl/docroot/views/view.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:aui="http://liferay.com/faces/aui"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
+	<h:head />
+	<h:body>
+		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
+	</h:body>
+</f:view>
\ No newline at end of file
diff --git a/tools/templates/portlet_liferay_faces_alloy_tmpl/ivy.xml b/tools/templates/portlet_liferay_faces_alloy_tmpl/ivy.xml
new file mode 100644
index 0000000..77fc6b3
--- /dev/null
+++ b/tools/templates/portlet_liferay_faces_alloy_tmpl/ivy.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="portlet_liferay_faces_alloy_tmpl" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
+		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="liferay-faces-alloy" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-bridge-api" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-bridge-impl" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-portal" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-util" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_liferay_faces_alloy_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_liferay_faces_alloy_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_liferay_faces_alloy_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/portlet_primefaces_tmpl/docroot/views/view.xhtml b/tools/templates/portlet_primefaces_tmpl/docroot/views/view.xhtml
new file mode 100644
index 0000000..aa6e886
--- /dev/null
+++ b/tools/templates/portlet_primefaces_tmpl/docroot/views/view.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
+	<h:head />
+	<h:body>
+		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
+	</h:body>
+</f:view>
\ No newline at end of file
diff --git a/tools/templates/portlet_primefaces_tmpl/ivy.xml b/tools/templates/portlet_primefaces_tmpl/ivy.xml
new file mode 100644
index 0000000..52cc6c0
--- /dev/null
+++ b/tools/templates/portlet_primefaces_tmpl/ivy.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="portlet_primefaces_tmpl" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
+		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="liferay-faces-bridge-api" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-bridge-impl" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-portal" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-util" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="org.primefaces.primefaces" org="com.liferay" rev="3.5" />
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_primefaces_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_primefaces_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_primefaces_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml b/tools/templates/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..33c14d6
--- /dev/null
+++ b/tools/templates/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<web-app
+	version="2.5"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+>
+	<context-param>
+		<param-name>com.sun.faces.expressionFactory</param-name>
+		<param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
+	</context-param>
+	<context-param>
+		<param-name>javax.faces.PROJECT_STAGE</param-name>
+		<param-value>Development</param-value>
+	</context-param>
+	<context-param>
+		<param-name>org.richfaces.resourceMapping.enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>Resource Servlet</servlet-name>
+		<servlet-class>org.richfaces.webapp.ResourceServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Resource Servlet</servlet-name>
+		<url-pattern>/org.richfaces.resources/*</url-pattern>
+	</servlet-mapping>
+</web-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_richfaces_tmpl/docroot/WEB-INF/weblogic.xml b/tools/templates/portlet_richfaces_tmpl/docroot/WEB-INF/weblogic.xml
new file mode 100644
index 0000000..e72d7ab
--- /dev/null
+++ b/tools/templates/portlet_richfaces_tmpl/docroot/WEB-INF/weblogic.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<wls:weblogic-web-app
+	xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd http://xmlns.oracle.com/weblogic/weblogic-web-app http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd"
+>
+	<wls:container-descriptor>
+		<wls:prefer-application-packages>
+			<wls:package-name>com.sun.xml.bind.*</wls:package-name>
+			<wls:package-name>org.apache.commons.fileupload.*</wls:package-name>
+			<wls:package-name>org.apache.xerces.*</wls:package-name>
+		</wls:prefer-application-packages>
+		<wls:optimistic-serialization>true</wls:optimistic-serialization>
+		<wls:show-archived-real-path-enabled>true</wls:show-archived-real-path-enabled>
+	</wls:container-descriptor>
+	<wls:library-ref>
+		<wls:library-name>jsf</wls:library-name>
+	</wls:library-ref>
+	<wls:library-ref>
+		<wls:library-name>richfaces</wls:library-name>
+	</wls:library-ref>
+</wls:weblogic-web-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_richfaces_tmpl/docroot/views/view.xhtml b/tools/templates/portlet_richfaces_tmpl/docroot/views/view.xhtml
new file mode 100644
index 0000000..d47378b
--- /dev/null
+++ b/tools/templates/portlet_richfaces_tmpl/docroot/views/view.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:rich="http://richfaces.org/rich"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
+	<h:head />
+	<h:body>
+		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
+	</h:body>
+</f:view>
\ No newline at end of file
diff --git a/tools/templates/portlet_richfaces_tmpl/ivy.xml b/tools/templates/portlet_richfaces_tmpl/ivy.xml
new file mode 100644
index 0000000..2b0162c
--- /dev/null
+++ b/tools/templates/portlet_richfaces_tmpl/ivy.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="portlet_richfaces_tmpl" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency name="cssparser" org="net.sourceforge.cssparser" rev="0.9.5" />
+		<dependency name="guava" org="com.google.guava" rev="10.0.1" />
+		<dependency name="jboss-el" org="org.jboss.el" rev="2.0.1.GA" />
+		<dependency name="jsf-api" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="jsf-impl" org="com.sun.faces" rev="2.1.21" />
+		<dependency name="jsr305" org="com.google.code.findbugs" rev="1.3.9" />
+		<dependency name="liferay-faces-bridge-api" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-bridge-impl" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-portal" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="liferay-faces-util" org="com.liferay.faces" rev="3.2.4-ga5" />
+		<dependency name="richfaces-components-api" org="org.richfaces.ui" rev="4.3.2.Final" />
+		<dependency name="richfaces-components-ui" org="org.richfaces.ui" rev="4.3.2.Final" />
+		<dependency name="richfaces-core-api" org="org.richfaces.core" rev="4.3.2.Final" />
+		<dependency name="richfaces-core-impl" org="org.richfaces.core" rev="4.3.2.Final" />
+		<dependency name="sac" org="org.w3c.css" rev="1.3" />
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_richfaces_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_richfaces_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_richfaces_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/jsp/view.jsp b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/jsp/view.jsp
new file mode 100644
index 0000000..9b66701
--- /dev/null
+++ b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/jsp/view.jsp
@@ -0,0 +1,23 @@
+<%--
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+--%>
+
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+This is the <b>@portlet.display.name@</b> portlet.<br />
+
+<c:out escapeXml="true" value="${releaseInfo}" />.
\ No newline at end of file
diff --git a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/spring-context/portlet-application-context.xml b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/spring-context/portlet-application-context.xml
new file mode 100644
index 0000000..ba3abf7
--- /dev/null
+++ b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/spring-context/portlet-application-context.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"
+>
+	<context:annotation-config />
+
+	<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="contentType" value="text/html;charset=UTF-8" />
+		<property name="prefix" value="/WEB-INF/jsp/" />
+		<property name="suffix" value=".jsp" />
+		<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/spring-context/portlet-context.xml b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/spring-context/portlet-context.xml
new file mode 100644
index 0000000..0b0ae59
--- /dev/null
+++ b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/spring-context/portlet-context.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<beans
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+>
+	<context:component-scan base-package="@portlet.java.package.name@.**" />
+</beans>
\ No newline at end of file
diff --git a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/src/PortletViewController.java b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/src/PortletViewController.java
new file mode 100644
index 0000000..58ccfba
--- /dev/null
+++ b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/src/PortletViewController.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package @portlet.java.package.name@;
+
+import com.liferay.portal.kernel.util.ReleaseInfo;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.portlet.bind.annotation.RenderMapping;
+
+@Controller
+@RequestMapping("VIEW")
+public class @portlet.java.class.name@PortletViewController {
+
+	@RenderMapping
+	public String question(Model model) {
+		model.addAttribute("releaseInfo", ReleaseInfo.getReleaseInfo());
+
+		return "@portlet.name@/view";
+	}
+
+}
\ No newline at end of file
diff --git a/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/web.xml b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..3412378
--- /dev/null
+++ b/tools/templates/portlet_spring_mvc_tmpl/docroot/WEB-INF/web.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<web-app
+	version="2.5"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/spring-context/portlet-application-context.xml</param-value>
+	</context-param>
+	<servlet>
+		<servlet-name>ViewRendererServlet</servlet-name>
+		<servlet-class>org.springframework.web.servlet.ViewRendererServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>ViewRendererServlet</servlet-name>
+		<url-pattern>/WEB-INF/servlet/view</url-pattern>
+	</servlet-mapping>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+</web-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_spring_mvc_tmpl/ivy.xml b/tools/templates/portlet_spring_mvc_tmpl/ivy.xml
new file mode 100644
index 0000000..95a8d44
--- /dev/null
+++ b/tools/templates/portlet_spring_mvc_tmpl/ivy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="@portlet.name@-portlet" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.3.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_spring_mvc_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_spring_mvc_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_spring_mvc_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/build.xml b/tools/templates/portlet_tmpl/build.xml
new file mode 100644
index 0000000..35a70c0
--- /dev/null
+++ b/tools/templates/portlet_tmpl/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="@portlet.name@-portlet" basedir="." default="deploy">
+	<import file="@plugin.type.dir@/build-common-portlet.xml" />
+</project>
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-display.xml b/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-display.xml
new file mode 100644
index 0000000..8dec0ee
--- /dev/null
+++ b/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-display.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
+
+<display>
+	<category name="category.sample">
+		<portlet id="@portlet.name@" />
+	</category>
+</display>
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-plugin-package.properties b/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..952b1da
--- /dev/null
+++ b/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,11 @@
+name=@portlet.display.name@
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-portlet.xml b/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-portlet.xml
new file mode 100644
index 0000000..f8cc2fb
--- /dev/null
+++ b/tools/templates/portlet_tmpl/docroot/WEB-INF/liferay-portlet.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
+
+<liferay-portlet-app>
+	<portlet>
+		<portlet-name>@portlet.name@</portlet-name>
+		<icon>/icon.png</icon>
+		<header-portlet-css>/css/main.css</header-portlet-css>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
+		<css-class-wrapper>@portlet.name@-portlet</css-class-wrapper>
+	</portlet>
+	<role-mapper>
+		<role-name>administrator</role-name>
+		<role-link>Administrator</role-link>
+	</role-mapper>
+	<role-mapper>
+		<role-name>guest</role-name>
+		<role-link>Guest</role-link>
+	</role-mapper>
+	<role-mapper>
+		<role-name>power-user</role-name>
+		<role-link>Power User</role-link>
+	</role-mapper>
+	<role-mapper>
+		<role-name>user</role-name>
+		<role-link>User</role-link>
+	</role-mapper>
+</liferay-portlet-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/docroot/WEB-INF/portlet.xml b/tools/templates/portlet_tmpl/docroot/WEB-INF/portlet.xml
new file mode 100644
index 0000000..c8b498b
--- /dev/null
+++ b/tools/templates/portlet_tmpl/docroot/WEB-INF/portlet.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0">
+	<portlet>
+		<portlet-name>@portlet.name@</portlet-name>
+		<display-name>@portlet.display.name@</display-name>
+		<portlet-class>com.liferay.util.bridges.mvc.MVCPortlet</portlet-class>
+		<init-param>
+			<name>view-template</name>
+			<value>/view.jsp</value>
+		</init-param>
+		<expiration-cache>0</expiration-cache>
+		<supports>
+			<mime-type>text/html</mime-type>
+		</supports>
+		<portlet-info>
+			<title>@portlet.display.name@</title>
+			<short-title>@portlet.display.name@</short-title>
+			<keywords>@portlet.display.name@</keywords>
+		</portlet-info>
+		<security-role-ref>
+			<role-name>administrator</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>guest</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>power-user</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>user</role-name>
+		</security-role-ref>
+	</portlet>
+</portlet-app>
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/docroot/css/main.css b/tools/templates/portlet_tmpl/docroot/css/main.css
new file mode 100644
index 0000000..e69de29
diff --git a/tools/templates/portlet_tmpl/docroot/icon.png b/tools/templates/portlet_tmpl/docroot/icon.png
new file mode 100644
index 0000000..807b862
Binary files /dev/null and b/tools/templates/portlet_tmpl/docroot/icon.png differ
diff --git a/tools/templates/portlet_tmpl/docroot/js/main.js b/tools/templates/portlet_tmpl/docroot/js/main.js
new file mode 100644
index 0000000..e69de29
diff --git a/tools/templates/portlet_tmpl/docroot/view.jsp b/tools/templates/portlet_tmpl/docroot/view.jsp
new file mode 100644
index 0000000..1b3ecef
--- /dev/null
+++ b/tools/templates/portlet_tmpl/docroot/view.jsp
@@ -0,0 +1,21 @@
+<%
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+%>
+
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+
+<portlet:defineObjects />
+
+This is the <b>@portlet.display.name@</b> portlet.
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/ivy.xml b/tools/templates/portlet_tmpl/ivy.xml
new file mode 100644
index 0000000..e0efb00
--- /dev/null
+++ b/tools/templates/portlet_tmpl/ivy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="@portlet.name@-portlet" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/portlet_vaadin_tmpl/docroot/WEB-INF/src/Application.java b/tools/templates/portlet_vaadin_tmpl/docroot/WEB-INF/src/Application.java
new file mode 100644
index 0000000..4da9fd2
--- /dev/null
+++ b/tools/templates/portlet_vaadin_tmpl/docroot/WEB-INF/src/Application.java
@@ -0,0 +1,20 @@
+package @portlet.java.package.name@;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+
+@SuppressWarnings("serial")
+public class @portlet.java.class.name@Application extends Application {
+
+	public void init() {
+		Window window = new Window();
+
+		setMainWindow(window);
+
+		Label label = new Label("Hello @portlet.java.class.name@!");
+
+		window.addComponent(label);
+	}
+
+}
\ No newline at end of file
diff --git a/tools/templates/portlet_vaadin_tmpl/ivy.xml b/tools/templates/portlet_vaadin_tmpl/ivy.xml
new file mode 100644
index 0000000..e0efb00
--- /dev/null
+++ b/tools/templates/portlet_vaadin_tmpl/ivy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<ivy-module
+	version="2.0"
+	xmlns:m2="http://ant.apache.org/ivy/maven"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+>
+	<info module="@portlet.name@-portlet" organisation="com.liferay">
+		<extends extendType="configurations,description,info" location="${sdk.dir}/ivy.xml" module="com.liferay.sdk" organisation="com.liferay" revision="latest.integration" />
+	</info>
+
+	<dependencies defaultconf="default">
+		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
+		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
+		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0-SNAPSHOT" />
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/tools/templates/portlet_vaadin_tmpl/test/integration/arquillian.xml b/tools/templates/portlet_vaadin_tmpl/test/integration/arquillian.xml
new file mode 100644
index 0000000..e67be6c
--- /dev/null
+++ b/tools/templates/portlet_vaadin_tmpl/test/integration/arquillian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<arquillian
+	xmlns="http://jboss.org/schema/arquillian"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"
+>
+	<container default="true" qualifier="tomcat">
+		<configuration>
+			<property name="jmxPort">@jmx.remote.port@</property>
+			<property name="pass">@app.server.tomcat.manager.password@</property>
+			<property name="user">@app.server.tomcat.manager.user@</property>
+		</configuration>
+	</container>
+</arquillian>
\ No newline at end of file
diff --git a/tools/templates/theme_tmpl/build.xml b/tools/templates/theme_tmpl/build.xml
new file mode 100644
index 0000000..79e16ea
--- /dev/null
+++ b/tools/templates/theme_tmpl/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="@theme.name@-theme" basedir="." default="deploy">
+	<property name="theme.parent" value="_styled" />
+
+	<import file="@plugin.type.dir@/build-common-theme.xml" />
+</project>
\ No newline at end of file
diff --git a/tools/templates/theme_tmpl/docroot/WEB-INF/liferay-plugin-package.properties b/tools/templates/theme_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..538a330
--- /dev/null
+++ b/tools/templates/theme_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,16 @@
+name=@theme.display.name@
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
+
+#required-deployment-contexts=\
+#    resources-importer-web
+
+resources-importer-developer-mode-enabled=true
\ No newline at end of file
diff --git a/tools/templates/theme_tmpl/docroot/WEB-INF/src/resources-importer/readme.txt b/tools/templates/theme_tmpl/docroot/WEB-INF/src/resources-importer/readme.txt
new file mode 100644
index 0000000..bc25439
--- /dev/null
+++ b/tools/templates/theme_tmpl/docroot/WEB-INF/src/resources-importer/readme.txt
@@ -0,0 +1,2 @@
+See http://www.liferay.com/community/wiki/-/wiki/Main/Resources+Importer+Web
+for more information about the Resources Importer.
\ No newline at end of file
diff --git a/tools/templates/theme_tmpl/docroot/WEB-INF/src/resources-importer/sitemap.json b/tools/templates/theme_tmpl/docroot/WEB-INF/src/resources-importer/sitemap.json
new file mode 100644
index 0000000..f8b26ec
--- /dev/null
+++ b/tools/templates/theme_tmpl/docroot/WEB-INF/src/resources-importer/sitemap.json
@@ -0,0 +1,22 @@
+{
+	"layoutTemplateId": "2_columns_ii",
+	"privatePages": [
+		{
+			"columns": [
+				[
+					{
+						"portletId": "58"
+					}
+				],
+				[
+					{
+						"portletId": "47"
+					}
+				]
+			],
+			"friendlyURL": "/home",
+			"name": "Welcome",
+			"title": "Welcome"
+		}
+	]
+}
\ No newline at end of file
diff --git a/tools/templates/web_tmpl/build.xml b/tools/templates/web_tmpl/build.xml
new file mode 100644
index 0000000..9054f23
--- /dev/null
+++ b/tools/templates/web_tmpl/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="@web.name@-web" basedir="." default="deploy">
+	<import file="@plugin.type.dir@/build-common-web.xml" />
+</project>
\ No newline at end of file
diff --git a/tools/templates/web_tmpl/docroot/WEB-INF/liferay-plugin-package.properties b/tools/templates/web_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..4858466
--- /dev/null
+++ b/tools/templates/web_tmpl/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,11 @@
+name=@web.display.name@
+module-group-id=liferay
+module-incremental-version=1
+tags=
+short-description=
+long-description=
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
\ No newline at end of file
diff --git a/webs/build-common-web.xml b/webs/build-common-web.xml
new file mode 100644
index 0000000..de785db
--- /dev/null
+++ b/webs/build-common-web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="build-common-web">
+	<import file="../build-common-plugin.xml" />
+</project>
\ No newline at end of file
diff --git a/webs/build.xml b/webs/build.xml
new file mode 100644
index 0000000..243ff76
--- /dev/null
+++ b/webs/build.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="webs" basedir="." default="deploy">
+	<import file="../build-common-plugins.xml" />
+
+	<target name="create">
+		<if>
+			<or>
+				<not>
+					<isset property="web.display.name" />
+				</not>
+				<not>
+					<isset property="web.name" />
+				</not>
+			</or>
+			<then>
+				<fail>This task must be called by the create script.</fail>
+			</then>
+		</if>
+
+		<property name="web.parent.dir" value="${user.dir}" />
+		<property name="web.dir" value="${web.parent.dir}/${web.name}-web" />
+
+		<if>
+			<available file="${web.dir}" />
+			<then>
+				<fail>${web.name}-web already exists.</fail>
+			</then>
+		</if>
+
+		<copy todir="${web.dir}">
+			<fileset
+				dir="${sdk.dir}/tools/templates/web_tmpl"
+			/>
+		</copy>
+
+		<replace dir="${web.dir}">
+			<replacefilter token="@plugin.type.dir@" value="${plugin.type.dir}" />
+			<replacefilter token="@web.display.name@" value="${web.display.name}" />
+			<replacefilter token="@web.name@" value="${web.name}" />
+		</replace>
+	</target>
+</project>
\ No newline at end of file
diff --git a/webs/create.bat b/webs/create.bat
new file mode 100644
index 0000000..499aaf6
--- /dev/null
+++ b/webs/create.bat
@@ -0,0 +1,25 @@
+@echo off
+
+if "" == "%1" goto errorCreate
+
+if "" == "%2" goto errorCreate
+
+call ant -Dweb.name=%1 -Dweb.display.name=%2 create
+
+rem call ant deploy
+
+goto end
+
+:errorCreate
+	echo.
+	echo Usage: create.bat hello-world "Hello World"
+	echo.
+	echo The first hello-world is your web id. A new directory will be created based on
+	echo the web id.
+	echo.
+	echo The second "Hello World" is the web's display name. The quotation marks are only
+	echo needed because there is a space in the display name.
+
+	goto end
+
+:end
\ No newline at end of file
diff --git a/webs/create.sh b/webs/create.sh
new file mode 100644
index 0000000..9db709f
--- /dev/null
+++ b/webs/create.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#set -x
+
+if [ $# -lt 2 ]; then
+	echo
+	echo Usage: ./create.sh hello-world \"Hello World\"
+	echo
+	echo The first hello-world is your web id. A new directory will be created based on
+	echo the web id.
+	echo
+	echo The second \"Hello World\" is the web\'s display name. The quotation marks are only
+	echo needed because there is a space in the display name.
+
+	exit 127
+fi
+
+ant -Dweb.name=$1 -Dweb.display.name=\"$2\" create
+
+#ant deploy
+
+exit 0
\ No newline at end of file
diff --git a/webs/resources-importer-web/.classpath b/webs/resources-importer-web/.classpath
new file mode 100644
index 0000000..76705bb
--- /dev/null
+++ b/webs/resources-importer-web/.classpath
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<classpath>
+	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="docroot/WEB-INF/src" />
+	<classpathentry kind="src" path="/portal-6.2.x" />
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/activation.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/annotations.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/jsp-api.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/mail.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/development/servlet-api.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/global/portlet.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/portal/commons-logging.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/lib/portal/log4j.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/portal-service/portal-service.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/util-bridges/util-bridges.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/util-java/util-java.jar" />
+	<classpathentry kind="lib" path="/portal-6.2.x/util-taglib/util-taglib.jar" />
+	<classpathentry kind="output" path="bin" />
+</classpath>
\ No newline at end of file
diff --git a/webs/resources-importer-web/.project b/webs/resources-importer-web/.project
new file mode 100644
index 0000000..fe51b93
--- /dev/null
+++ b/webs/resources-importer-web/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>resources-importer-web-6.2.x</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1669365750347</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/webs/resources-importer-web/build.xml b/webs/resources-importer-web/build.xml
new file mode 100644
index 0000000..1de3913
--- /dev/null
+++ b/webs/resources-importer-web/build.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE project>
+
+<project name="resources-importer-web" basedir="." default="deploy">
+	<import file="../build-common-web.xml" />
+</project>
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/META-INF/custom_jsps/html/portlet/journal/article_toolbar.jsp b/webs/resources-importer-web/docroot/META-INF/custom_jsps/html/portlet/journal/article_toolbar.jsp
new file mode 100644
index 0000000..ce194d6
--- /dev/null
+++ b/webs/resources-importer-web/docroot/META-INF/custom_jsps/html/portlet/journal/article_toolbar.jsp
@@ -0,0 +1,56 @@
+<%--
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+--%>
+
+<%@ include file="/html/portlet/journal/article_toolbar.portal.jsp" %>
+
+<%
+String structureId = BeanParamUtil.getString(article, request, "structureId");
+%>
+
+<c:if test="<%= (article != null) && Validator.isNotNull(structureId) %>">
+	<aui:script use="aui-base">
+		var toolbar = A.Widget.getByNode('#<portlet:namespace />articleToolbar');
+
+		toolbar.add(
+			{
+				icon: 'icon-download',
+				label: '<%= UnicodeLanguageUtil.get(pageContext, "download") %>',
+				on: {
+					click: function(event) {
+						event.domEvent.preventDefault();
+
+						var downloadArticleContent = Liferay.Util.openWindow(
+							{
+								dialog: {
+									bodyContent: '<pre><%= HtmlUtil.escapeJS(HtmlUtil.escape(article.getContent())) %></pre>',
+									modal: true
+								},
+								id: '<portlet:namespace />articleDownload',
+								title: '<%= HtmlUtil.escapeJS(article.getTitle(locale)) %>'
+							}
+						);
+					}
+				}
+			}
+		);
+	</aui:script>
+
+	<style type="text/css">
+		.portlet-journal .article-toolbar .icon-download {
+			background-image: none;
+		}
+	</style>
+</c:if>
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/liferay-hook.xml b/webs/resources-importer-web/docroot/WEB-INF/liferay-hook.xml
new file mode 100644
index 0000000..46e222c
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/liferay-hook.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
+
+<hook>
+	<custom-jsp-dir>/META-INF/custom_jsps</custom-jsp-dir>
+</hook>
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/liferay-plugin-package.properties b/webs/resources-importer-web/docroot/WEB-INF/liferay-plugin-package.properties
new file mode 100644
index 0000000..aadab6a
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/liferay-plugin-package.properties
@@ -0,0 +1,11 @@
+name=Resources Importer
+module-group-id=liferay
+module-incremental-version=5
+tags=configuration, lar, layout, package, theme, web content
+short-description=
+long-description=The Resources Importer app allows front-end developers to package web content, portlet configurations, and layouts together in a theme without saving it as a compiled LAR file thereby allowing for greater flexibility in its usage between Liferay Portal versions.<br /><br />This app will automatically create associated content when other plugins are deployed that are configured to make use of the Resources Importer app.<br /><br />This app installs as a Liferay service.
+change-log=
+page-url=http://www.liferay.com
+author=Liferay, Inc.
+licenses=LGPL
+liferay-versions=6.2.0+
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.changelog b/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.changelog
new file mode 100644
index 0000000..a88fa5b
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.changelog
@@ -0,0 +1,24 @@
+#
+# Module Incremental Version 1
+#
+c963f942b6ec873cc7ed9ca15d9c2ad000368ca8^..98f9ca2060df0a3ad6732e8b102a51eac5928be9=LPS-30463 LPS-30553 LPS-30592 LPS-31923 LPS-32328 LPS-32688 LPS-32853 LPS-32875 LPS-33103 LPS-33847 LPS-35230 LPS-35353 LPS-35834 LPS-35909 LPS-35910 LPS-36044 LPS-36506 LPS-37416 LPS-37425 LPS-39182 LPS-39703 LPS-40805 LPS-41113
+
+#
+# Module Incremental Version 2
+#
+98f9ca2060df0a3ad6732e8b102a51eac5928be9^..a2a4d325e51f0c122bca4a743c60ddbc74999b4b=LPS-42647 LPS-43599
+
+#
+# Module Incremental Version 3
+#
+a2a4d325e51f0c122bca4a743c60ddbc74999b4b^..ff5ec9072eae81e08dfd219ba55adab7b7bd14dc=LPS-43927 LPS-43961
+
+#
+# Module Incremental Version 4
+#
+ff5ec9072eae81e08dfd219ba55adab7b7bd14dc^..8953b6381dbc36c8430e8840e980f314f86fbb12=LPS-31355 LPS-49570 LPS-50385 LPS-50395 LPS-50735 LPS-50736 LPS-50774 LPS-50808 LPS-50859 LPS-51096 LPS-51109 LPS-51131 LPS-51135
+
+#
+# Module Incremental Version 5
+#
+8953b6381dbc36c8430e8840e980f314f86fbb12^..52292217d9bc0381332e1b87bad950b164eabdcb=LPS-52760 LPS-54241 LPS-54292 LPS-54576 LPS-55202 LPS-56930 LPS-57090 LPS-60723
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.changelog.md5 b/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.changelog.md5
new file mode 100644
index 0000000..d8872e0
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.changelog.md5
@@ -0,0 +1 @@
+8387878b2856a4e32f1795b32f9fff04
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.properties b/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.properties
new file mode 100644
index 0000000..c44bca4
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/liferay-releng.properties
@@ -0,0 +1,9 @@
+bundle=true
+category=Utility
+demo-url=
+dependent-apps=
+labs=true
+marketplace=true
+public=true
+support-url=
+supported=false
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/javadocs-all.xml b/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/javadocs-all.xml
new file mode 100644
index 0000000..a26b2cc
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/javadocs-all.xml
@@ -0,0 +1,1169 @@
+<?xml version="1.0"?>
+
+<javadocs>
+	<javadoc>
+		<name>ResourcesImporterHotDeployMessageListener</name>
+		<type>com.liferay.resourcesimporter.messaging.ResourcesImporterHotDeployMessageListener</type>
+		<author><![CDATA[Ryan Park]]></author>
+		<author><![CDATA[Raymond Augé]]></author>
+		<method>
+			<name>getFileSystemImporter</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getLARImporter</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getPluginPackageProperties</name>
+			<param>
+				<name>servletContext</name>
+				<type>javax.servlet.ServletContext</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getResourceImporter</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>initialize</name>
+			<param>
+				<name>message</name>
+				<type>com.liferay.portal.kernel.messaging.Message</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>onDeploy</name>
+			<param>
+				<name>message</name>
+				<type>com.liferay.portal.kernel.messaging.Message</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<field>
+			<name>_RESOURCES_DIR</name>
+		</field>
+		<field>
+			<name>_log</name>
+		</field>
+	</javadoc>
+	<javadoc>
+		<name>BaseImporter</name>
+		<type>com.liferay.resourcesimporter.util.BaseImporter</type>
+		<author><![CDATA[Brian Wing Shun Chan]]></author>
+		<author><![CDATA[Raymond Augé]]></author>
+		<method>
+			<name>afterPropertiesSet</name>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>getGroupId</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getTargetClassPK</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getTargetValueMap</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>isExisting</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>setCompanyId</name>
+			<param>
+				<name>companyId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setResourcesDir</name>
+			<param>
+				<name>resourcesDir</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setServletContext</name>
+			<param>
+				<name>servletContext</name>
+				<type>javax.servlet.ServletContext</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setServletContextName</name>
+			<param>
+				<name>servletContextName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setTargetClassName</name>
+			<param>
+				<name>targetClassName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setTargetValue</name>
+			<param>
+				<name>targetValue</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>getLayoutSetPrototype</name>
+			<param>
+				<name>companyId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>name</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<field>
+			<name>companyId</name>
+		</field>
+		<field>
+			<name>existing</name>
+		</field>
+		<field>
+			<name>groupId</name>
+		</field>
+		<field>
+			<name>resourcesDir</name>
+		</field>
+		<field>
+			<name>servletContext</name>
+		</field>
+		<field>
+			<name>servletContextName</name>
+		</field>
+		<field>
+			<name>targetClassName</name>
+		</field>
+		<field>
+			<name>targetClassPK</name>
+		</field>
+		<field>
+			<name>targetValue</name>
+		</field>
+		<field>
+			<name>userId</name>
+		</field>
+	</javadoc>
+	<javadoc>
+		<name>FileSystemImporter</name>
+		<type>com.liferay.resourcesimporter.util.FileSystemImporter</type>
+		<author><![CDATA[Ryan Park]]></author>
+		<author><![CDATA[Raymond Augé]]></author>
+		<method>
+			<name>importResources</name>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDDMStructures</name>
+			<param>
+				<name>parentDDMStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>structuresDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDDMStructures</name>
+			<param>
+				<name>parentDDMStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>inputStream</name>
+				<type>java.io.InputStream</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDDMTemplates</name>
+			<param>
+				<name>ddmStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>templatesDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDDMTemplates</name>
+			<param>
+				<name>ddmStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>inputStream</name>
+				<type>java.io.InputStream</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFileEntries</name>
+			<param>
+				<name>fileEntriesDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFileEntry</name>
+			<param>
+				<name>parentFolderId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>file</name>
+				<type>java.io.File</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFileEntry</name>
+			<param>
+				<name>parentFolderId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>inputStream</name>
+				<type>java.io.InputStream</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>length</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFolder</name>
+			<param>
+				<name>parentFolderId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>folder</name>
+				<type>java.io.File</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFolder</name>
+			<param>
+				<name>parentFolderId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>folderName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addJournalArticles</name>
+			<param>
+				<name>ddmStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>ddmTemplateKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>articlesDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addJournalArticles</name>
+			<param>
+				<name>ddmStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>ddmTemplateKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>inputStream</name>
+				<type>java.io.InputStream</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addLayout</name>
+			<param>
+				<name>privateLayout</name>
+				<type>boolean</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>parentLayoutId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>layoutJSONObject</name>
+				<type>com.liferay.portal.kernel.json.JSONObject</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addLayoutColumn</name>
+			<param>
+				<name>layout</name>
+				<type>com.liferay.portal.model.Layout</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>columnId</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>columnJSONArray</name>
+				<type>com.liferay.portal.kernel.json.JSONArray</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addLayoutColumnPortlet</name>
+			<param>
+				<name>layout</name>
+				<type>com.liferay.portal.model.Layout</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>columnId</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>portletJSONObject</name>
+				<type>com.liferay.portal.kernel.json.JSONObject</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addLayoutColumns</name>
+			<param>
+				<name>layout</name>
+				<type>com.liferay.portal.model.Layout</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>columnPrefix</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>columnsJSONArray</name>
+				<type>com.liferay.portal.kernel.json.JSONArray</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addLayouts</name>
+			<param>
+				<name>privateLayout</name>
+				<type>boolean</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>parentLayoutId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>layoutsJSONArray</name>
+				<type>com.liferay.portal.kernel.json.JSONArray</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>doImportResources</name>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>getDDMTemplateLanguage</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getDefaultPortletJSONObject</name>
+			<param>
+				<name>journalArticleId</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getInputStream</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>getJournalId</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getJSONArrayAsStringArray</name>
+			<param>
+				<name>jsonObject</name>
+				<type>com.liferay.portal.kernel.json.JSONObject</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>key</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getJSONObject</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>getMap</name>
+			<param>
+				<name>locale</name>
+				<type>java.util.Locale</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>value</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getMap</name>
+			<param>
+				<name>value</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>isJournalStructureXSD</name>
+			<param>
+				<name>xsd</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>listFiles</name>
+			<param>
+				<name>dir</name>
+				<type>java.io.File</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>processJournalArticleContent</name>
+			<param>
+				<name>content</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>replaceFileEntryURL</name>
+			<param>
+				<name>content</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>setServiceContext</name>
+			<param>
+				<name>name</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setupAssets</name>
+			<param>
+				<name>assetsJSONArray</name>
+				<type>com.liferay.portal.kernel.json.JSONArray</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setupAssets</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>setupSettings</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>setupSitemap</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>updateLayoutSetThemeId</name>
+			<param>
+				<name>sitemapJSONObject</name>
+				<type>com.liferay.portal.kernel.json.JSONObject</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<field>
+			<name>serviceContext</name>
+		</field>
+		<field>
+			<name>_DL_DOCUMENTS_DIR_NAME</name>
+		</field>
+		<field>
+			<name>_JOURNAL_ARTICLES_DIR_NAME</name>
+		</field>
+		<field>
+			<name>_JOURNAL_DDM_STRUCTURES_DIR_NAME</name>
+		</field>
+		<field>
+			<name>_JOURNAL_DDM_TEMPLATES_DIR_NAME</name>
+		</field>
+		<field>
+			<name>_assetJSONObjectMap</name>
+		</field>
+		<field>
+			<name>_defaultLayoutTemplateId</name>
+		</field>
+		<field>
+			<name>_fileEntries</name>
+		</field>
+		<field>
+			<name>_fileEntryPattern</name>
+		</field>
+		<field>
+			<name>_resourcesDir</name>
+		</field>
+	</javadoc>
+	<javadoc>
+		<name>Importer</name>
+		<type>com.liferay.resourcesimporter.util.Importer</type>
+		<author><![CDATA[Brian Wing Shun Chan]]></author>
+		<author><![CDATA[Raymond Augé]]></author>
+		<method>
+			<name>afterPropertiesSet</name>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>getGroupId</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>getTargetClassPK</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>importResources</name>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>isExisting</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<method>
+			<name>setCompanyId</name>
+			<param>
+				<name>companyId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setResourcesDir</name>
+			<param>
+				<name>resourcesDir</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setServletContext</name>
+			<param>
+				<name>servletContext</name>
+				<type>javax.servlet.ServletContext</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setServletContextName</name>
+			<param>
+				<name>servletContextName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setTargetClassName</name>
+			<param>
+				<name>className</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setTargetValue</name>
+			<param>
+				<name>targetValue</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+	</javadoc>
+	<javadoc>
+		<name>ImporterException</name>
+		<type>com.liferay.resourcesimporter.util.ImporterException</type>
+		<author><![CDATA[Brian Wing Shun Chan]]></author>
+		<method>
+			<name>ImporterException</name>
+		</method>
+		<method>
+			<name>ImporterException</name>
+			<param>
+				<name>msg</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>ImporterException</name>
+			<param>
+				<name>msg</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>cause</name>
+				<type>java.lang.Throwable</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>ImporterException</name>
+			<param>
+				<name>cause</name>
+				<type>java.lang.Throwable</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+	</javadoc>
+	<javadoc>
+		<name>LARImporter</name>
+		<type>com.liferay.resourcesimporter.util.LARImporter</type>
+		<author><![CDATA[Ryan Park]]></author>
+		<author><![CDATA[Raymond Augé]]></author>
+		<method>
+			<name>importResources</name>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>setLARFile</name>
+			<param>
+				<name>file</name>
+				<type>java.io.File</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setLARInputStream</name>
+			<param>
+				<name>inputStream</name>
+				<type>java.io.InputStream</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setPrivateLARInputStream</name>
+			<param>
+				<name>privateLARInputStream</name>
+				<type>java.io.InputStream</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>setPublicLARInputStream</name>
+			<param>
+				<name>publicLARInputStream</name>
+				<type>java.io.InputStream</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+		</method>
+		<method>
+			<name>getParameterMap</name>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+		</method>
+		<field>
+			<name>_log</name>
+		</field>
+		<field>
+			<name>_privateLARInputStream</name>
+		</field>
+		<field>
+			<name>_publicLARInputStream</name>
+		</field>
+	</javadoc>
+	<javadoc>
+		<name>ResourceImporter</name>
+		<type>com.liferay.resourcesimporter.util.ResourceImporter</type>
+		<author><![CDATA[Raymond Augé]]></author>
+		<author><![CDATA[Ryan Park]]></author>
+		<method>
+			<name>importResources</name>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDDMStructures</name>
+			<param>
+				<name>parentStructureId</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>structuresDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDDMTemplates</name>
+			<param>
+				<name>ddmStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>templatesDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFileEntries</name>
+			<param>
+				<name>fileEntriesDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFileEntry</name>
+			<param>
+				<name>resourcePath</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addDLFolder</name>
+			<param>
+				<name>parentFolderId</name>
+				<type>long</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>resourcePath</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>addJournalArticles</name>
+			<param>
+				<name>ddmStructureKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>ddmTemplateKey</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<param>
+				<name>articlesDirName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<method>
+			<name>getInputStream</name>
+			<param>
+				<name>fileName</name>
+				<type>java.lang.String</type>
+				<comment><![CDATA[]]></comment>
+			</param>
+			<return>
+				<comment><![CDATA[]]></comment>
+			</return>
+			<throws>
+				<name>Exception</name>
+				<type>java.lang.Exception</type>
+				<comment><![CDATA[]]></comment>
+			</throws>
+		</method>
+		<field>
+			<name>_folderIds</name>
+		</field>
+	</javadoc>
+</javadocs>
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/javadocs-rt.xml b/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/javadocs-rt.xml
new file mode 100644
index 0000000..eb07e2a
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/javadocs-rt.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<javadocs></javadocs>
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/messaging-spring.xml b/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/messaging-spring.xml
new file mode 100644
index 0000000..3550b19
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/META-INF/messaging-spring.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<beans
+	default-destroy-method="destroy"
+	default-init-method="afterPropertiesSet"
+	xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+
+	<!-- Destinations -->
+
+	<bean id="destination.resources_importer" class="com.liferay.portal.kernel.messaging.SerialDestination">
+		<property name="name" value="liferay/resources_importer" />
+	</bean>
+
+	<!-- Listeners -->
+
+	<bean id="messageListener.hot_deploy" class="com.liferay.resourcesimporter.messaging.ResourcesImporterHotDeployMessageListener" />
+
+	<!-- Configurator -->
+
+	<bean id="messagingConfigurator" class="com.liferay.portal.kernel.messaging.config.PluginMessagingConfigurator">
+		<property name="destinations">
+			<list>
+				<ref bean="destination.resources_importer" />
+			</list>
+		</property>
+		<property name="messageListeners">
+			<map key-type="java.lang.String" value-type="java.util.List">
+				<entry key="liferay/hot_deploy">
+					<list value-type="com.liferay.portal.kernel.messaging.MessageListener">
+						<ref bean="messageListener.hot_deploy" />
+					</list>
+				</entry>
+			</map>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/messaging/ResourcesImporterHotDeployMessageListener.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/messaging/ResourcesImporterHotDeployMessageListener.java
new file mode 100644
index 0000000..fa76492
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/messaging/ResourcesImporterHotDeployMessageListener.java
@@ -0,0 +1,182 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.messaging;
+
+import com.liferay.portal.kernel.lar.ExportImportThreadLocal;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.messaging.HotDeployMessageListener;
+import com.liferay.portal.kernel.messaging.Message;
+import com.liferay.portal.kernel.messaging.MessageBusUtil;
+import com.liferay.portal.kernel.servlet.ServletContextPool;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.Company;
+import com.liferay.portal.security.auth.CompanyThreadLocal;
+import com.liferay.portal.service.CompanyLocalServiceUtil;
+import com.liferay.resourcesimporter.util.Importer;
+import com.liferay.resourcesimporter.util.ImporterException;
+import com.liferay.resourcesimporter.util.ImporterFactory;
+import com.liferay.resourcesimporter.util.PluginPackageProperties;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Ryan Park
+ * @author Raymond Augé
+ */
+public class ResourcesImporterHotDeployMessageListener
+	extends HotDeployMessageListener {
+
+	protected void initialize(Message message) throws Exception {
+		String servletContextName = message.getString("servletContextName");
+
+		ServletContext servletContext = ServletContextPool.get(
+			servletContextName);
+
+		if (servletContext == null) {
+			return;
+		}
+
+		PluginPackageProperties pluginPackageProperties =
+			new PluginPackageProperties(servletContext);
+
+		String resourcesDir = pluginPackageProperties.getResourcesDir();
+
+		if ((servletContext.getResource(
+				ImporterFactory.RESOURCES_DIR) == null) &&
+			(servletContext.getResource(
+				ImporterFactory.TEMPLATES_DIR) == null) &&
+			Validator.isNull(resourcesDir)) {
+
+			return;
+		}
+
+		List<Company> companies = CompanyLocalServiceUtil.getCompanies();
+
+		try {
+			ExportImportThreadLocal.setLayoutImportInProcess(true);
+			ExportImportThreadLocal.setPortletImportInProcess(true);
+
+			for (Company company : companies) {
+				importResources(
+					company, servletContext, pluginPackageProperties,
+					message.getResponseId());
+			}
+		}
+		finally {
+			ExportImportThreadLocal.setLayoutImportInProcess(false);
+			ExportImportThreadLocal.setPortletImportInProcess(false);
+		}
+	}
+
+
+	protected void onDeploy(Message message) throws Exception {
+		initialize(message);
+	}
+
+	private void importResources(
+			Company company, ServletContext servletContext,
+			PluginPackageProperties pluginPackageProperties,
+			String messageResponseId)
+		throws Exception {
+
+		long companyId = CompanyThreadLocal.getCompanyId();
+
+		try {
+			CompanyThreadLocal.setCompanyId(company.getCompanyId());
+
+			ImporterFactory importerFactory = ImporterFactory.getInstance();
+
+			Importer importer = importerFactory.createImporter(
+				company.getCompanyId(), servletContext,
+				pluginPackageProperties);
+
+			if (!importer.isDeveloperModeEnabled() && importer.isExisting() &&
+				!importer.isCompanyGroup()) {
+
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"Group or layout set prototype already exists " +
+							"for company " + company.getWebId());
+				}
+
+				return;
+			}
+
+			long startTime = 0;
+
+			if (_log.isInfoEnabled()) {
+				startTime = System.currentTimeMillis();
+			}
+
+			importer.importResources();
+
+			if (_log.isInfoEnabled()) {
+				long endTime = System.currentTimeMillis() - startTime;
+
+				_log.info(
+					"Importing resources from " +
+						servletContext.getServletContextName() +
+						" to group " + importer.getGroupId() + " takes " +
+							endTime + " ms");
+			}
+
+			Message message = new Message();
+
+			message.put("companyId", company.getCompanyId());
+			message.put(
+				"servletContextName", servletContext.getServletContextName());
+			message.put("targetClassName", importer.getTargetClassName());
+			message.put("targetClassPK", importer.getTargetClassPK());
+
+			if (Validator.isNotNull(messageResponseId)) {
+				Map<String, Object> responseMap = new HashMap<String, Object>();
+
+				responseMap.put("groupId", importer.getTargetClassPK());
+
+				message.setPayload(responseMap);
+
+				message.setResponseId(messageResponseId);
+			}
+
+			MessageBusUtil.sendMessage("liferay/resources_importer", message);
+		}
+		catch (ImporterException ie) {
+			Message message = new Message();
+
+			message.put("companyId", company.getCompanyId());
+			message.put("error", ie.getMessage());
+			message.put(
+				"servletContextName", servletContext.getServletContextName());
+			message.put(
+				"targetClassName",
+				pluginPackageProperties.getTargetClassName());
+			message.put("targetClassPK", 0);
+
+			MessageBusUtil.sendMessage("liferay/resources_importer", message);
+		}
+		finally {
+			CompanyThreadLocal.setCompanyId(companyId);
+		}
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(
+		ResourcesImporterHotDeployMessageListener.class);
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/BaseImporter.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/BaseImporter.java
new file mode 100644
index 0000000..7da8627
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/BaseImporter.java
@@ -0,0 +1,292 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import com.liferay.portal.kernel.dao.orm.QueryUtil;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.model.Group;
+import com.liferay.portal.model.GroupConstants;
+import com.liferay.portal.model.Layout;
+import com.liferay.portal.model.LayoutConstants;
+import com.liferay.portal.model.LayoutPrototype;
+import com.liferay.portal.model.LayoutSetPrototype;
+import com.liferay.portal.model.LayoutTypePortlet;
+import com.liferay.portal.model.User;
+import com.liferay.portal.service.GroupLocalServiceUtil;
+import com.liferay.portal.service.LayoutLocalServiceUtil;
+import com.liferay.portal.service.LayoutPrototypeLocalServiceUtil;
+import com.liferay.portal.service.LayoutSetPrototypeLocalServiceUtil;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.UserLocalServiceUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Brian Wing Shun Chan
+ * @author Raymond Augé
+ */
+public abstract class BaseImporter implements Importer {
+
+
+	public void afterPropertiesSet() throws Exception {
+		User user = UserLocalServiceUtil.getDefaultUser(companyId);
+
+		userId = user.getUserId();
+
+		if (isCompanyGroup()) {
+			return;
+		}
+
+		Group group = null;
+
+		if (targetClassName.equals(LayoutSetPrototype.class.getName())) {
+			LayoutSetPrototype layoutSetPrototype = getLayoutSetPrototype(
+				companyId, targetValue);
+
+			if (layoutSetPrototype != null) {
+				existing = true;
+			}
+			else {
+				layoutSetPrototype =
+					LayoutSetPrototypeLocalServiceUtil.addLayoutSetPrototype(
+						userId, companyId, getTargetValueMap(),
+						StringPool.BLANK, true, true, new ServiceContext());
+			}
+
+			group = layoutSetPrototype.getGroup();
+
+			targetClassPK = layoutSetPrototype.getLayoutSetPrototypeId();
+		}
+		else if (targetClassName.equals(Group.class.getName())) {
+			if (targetValue.equals(GroupConstants.GLOBAL)) {
+				group = GroupLocalServiceUtil.getCompanyGroup(companyId);
+			}
+			else if (targetValue.equals(GroupConstants.GUEST)) {
+				group = GroupLocalServiceUtil.getGroup(
+					companyId, GroupConstants.GUEST);
+
+				List<Layout> layouts = LayoutLocalServiceUtil.getLayouts(
+					group.getGroupId(), false,
+					LayoutConstants.DEFAULT_PARENT_LAYOUT_ID, false, 0, 1);
+
+				if (!layouts.isEmpty()) {
+					Layout layout = layouts.get(0);
+
+					LayoutTypePortlet layoutTypePortlet =
+						(LayoutTypePortlet)layout.getLayoutType();
+
+					List<String> portletIds = layoutTypePortlet.getPortletIds();
+
+					if (portletIds.size() != 2) {
+						existing = true;
+					}
+
+					for (String portletId : portletIds) {
+						if (!portletId.equals("47") &&
+							!portletId.equals("58")) {
+
+							existing = true;
+						}
+					}
+				}
+			}
+			else {
+				group = GroupLocalServiceUtil.fetchGroup(
+					companyId, targetValue);
+
+				if (group != null) {
+					existing = true;
+				}
+				else {
+					group = GroupLocalServiceUtil.addGroup(
+						userId, GroupConstants.DEFAULT_PARENT_GROUP_ID,
+						StringPool.BLANK,
+						GroupConstants.DEFAULT_PARENT_GROUP_ID,
+						GroupConstants.DEFAULT_LIVE_GROUP_ID, targetValue,
+						StringPool.BLANK, GroupConstants.TYPE_SITE_OPEN, true,
+						GroupConstants.DEFAULT_MEMBERSHIP_RESTRICTION, null,
+						true, true, new ServiceContext());
+				}
+			}
+
+			targetClassPK = group.getGroupId();
+		}
+
+		if (group != null) {
+			groupId = group.getGroupId();
+		}
+	}
+
+
+	public long getGroupId() {
+		return groupId;
+	}
+
+
+	public String getTargetClassName() {
+		return targetClassName;
+	}
+
+
+	public long getTargetClassPK() {
+		return targetClassPK;
+	}
+
+	public Map<Locale, String> getTargetValueMap() {
+		Map<Locale, String> targetValueMap = new HashMap<Locale, String>();
+
+		Locale locale = LocaleUtil.getDefault();
+
+		targetValueMap.put(locale, targetValue);
+
+		return targetValueMap;
+	}
+
+
+	public boolean isCompanyGroup() throws Exception {
+		Group group = GroupLocalServiceUtil.fetchGroup(groupId);
+
+		if (group == null) {
+			return false;
+		}
+
+		return group.isCompany();
+	}
+
+
+	public boolean isDeveloperModeEnabled() {
+		return developerModeEnabled;
+	}
+
+
+	public boolean isExisting() {
+		return existing;
+	}
+
+
+	public void setAppendVersion(boolean appendVersion) {
+		this.appendVersion = appendVersion;
+	}
+
+
+	public void setCompanyId(long companyId) {
+		this.companyId = companyId;
+	}
+
+
+	public void setDeveloperModeEnabled(boolean developerModeEnabled) {
+		this.developerModeEnabled = developerModeEnabled;
+	}
+
+
+	public void setGroupId(long groupId) {
+		this.groupId = groupId;
+	}
+
+
+	public void setResourcesDir(String resourcesDir) {
+		this.resourcesDir = resourcesDir;
+	}
+
+
+	public void setServletContext(ServletContext servletContext) {
+		this.servletContext = servletContext;
+	}
+
+
+	public void setServletContextName(String servletContextName) {
+		this.servletContextName = servletContextName;
+	}
+
+
+	public void setTargetClassName(String targetClassName) {
+		this.targetClassName = targetClassName;
+	}
+
+
+	public void setTargetValue(String targetValue) {
+		this.targetValue = targetValue;
+	}
+
+
+	public void setUpdateModeEnabled(boolean updateModeEnabled) {
+		this.updateModeEnabled = updateModeEnabled;
+	}
+
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	protected LayoutPrototype getLayoutPrototype(long companyId, String name)
+		throws SystemException {
+
+		Locale locale = LocaleUtil.getDefault();
+
+		List<LayoutPrototype> layoutPrototypes =
+			LayoutPrototypeLocalServiceUtil.search(
+				companyId, null, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+
+		for (LayoutPrototype layoutPrototype : layoutPrototypes) {
+			if (name.equals(layoutPrototype.getName(locale))) {
+				return layoutPrototype;
+			}
+		}
+
+		return null;
+	}
+
+	protected LayoutSetPrototype getLayoutSetPrototype(
+			long companyId, String name)
+		throws Exception {
+
+		Locale locale = LocaleUtil.getDefault();
+
+		List<LayoutSetPrototype> layoutSetPrototypes =
+			LayoutSetPrototypeLocalServiceUtil.search(
+				companyId, null, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+
+		for (LayoutSetPrototype layoutSetPrototype : layoutSetPrototypes) {
+			if (name.equals(layoutSetPrototype.getName(locale))) {
+				return layoutSetPrototype;
+			}
+		}
+
+		return null;
+	}
+
+	protected boolean appendVersion;
+	protected long companyId;
+	protected boolean developerModeEnabled;
+	protected boolean existing;
+	protected long groupId;
+	protected String resourcesDir;
+	protected ServletContext servletContext;
+	protected String servletContextName;
+	protected String targetClassName;
+	protected long targetClassPK;
+	protected String targetValue;
+	protected boolean updateModeEnabled;
+	protected long userId;
+	protected String version;
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java
new file mode 100644
index 0000000..f795d19
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/FileSystemImporter.java
@@ -0,0 +1,1885 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import com.liferay.portal.kernel.dao.orm.QueryUtil;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.json.JSONArray;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.lar.ExportImportThreadLocal;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.repository.model.FileEntry;
+import com.liferay.portal.kernel.search.Indexer;
+import com.liferay.portal.kernel.search.IndexerRegistryUtil;
+import com.liferay.portal.kernel.search.SearchEngineUtil;
+import com.liferay.portal.kernel.search.SearchException;
+import com.liferay.portal.kernel.template.TemplateConstants;
+import com.liferay.portal.kernel.util.ArrayUtil;
+import com.liferay.portal.kernel.util.FileUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.LocalizationUtil;
+import com.liferay.portal.kernel.util.MimeTypesUtil;
+import com.liferay.portal.kernel.util.PropsKeys;
+import com.liferay.portal.kernel.util.PropsUtil;
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import com.liferay.portal.kernel.xml.Attribute;
+import com.liferay.portal.kernel.xml.Document;
+import com.liferay.portal.kernel.xml.Element;
+import com.liferay.portal.kernel.xml.SAXReaderUtil;
+import com.liferay.portal.model.Group;
+import com.liferay.portal.model.Layout;
+import com.liferay.portal.model.LayoutConstants;
+import com.liferay.portal.model.LayoutPrototype;
+import com.liferay.portal.model.LayoutSet;
+import com.liferay.portal.model.LayoutSetPrototype;
+import com.liferay.portal.model.LayoutTypePortlet;
+import com.liferay.portal.model.LayoutTypePortletConstants;
+import com.liferay.portal.model.PortletConstants;
+import com.liferay.portal.model.Theme;
+import com.liferay.portal.service.LayoutLocalServiceUtil;
+import com.liferay.portal.service.LayoutPrototypeLocalServiceUtil;
+import com.liferay.portal.service.LayoutSetLocalServiceUtil;
+import com.liferay.portal.service.LayoutSetPrototypeLocalServiceUtil;
+import com.liferay.portal.service.RepositoryLocalServiceUtil;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portal.service.ServiceContextThreadLocal;
+import com.liferay.portal.service.ThemeLocalServiceUtil;
+import com.liferay.portal.util.PortalUtil;
+import com.liferay.portal.util.PortletKeys;
+import com.liferay.portlet.PortletPreferencesFactoryUtil;
+import com.liferay.portlet.asset.model.AssetCategory;
+import com.liferay.portlet.asset.model.AssetEntry;
+import com.liferay.portlet.asset.model.AssetTag;
+import com.liferay.portlet.asset.service.AssetTagLocalServiceUtil;
+import com.liferay.portlet.blogs.model.BlogsEntry;
+import com.liferay.portlet.documentlibrary.DuplicateFileException;
+import com.liferay.portlet.documentlibrary.model.DLFileEntry;
+import com.liferay.portlet.documentlibrary.model.DLFolder;
+import com.liferay.portlet.documentlibrary.model.DLFolderConstants;
+import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
+import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil;
+import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil;
+import com.liferay.portlet.documentlibrary.util.DLUtil;
+import com.liferay.portlet.dynamicdatalists.model.DDLRecordSet;
+import com.liferay.portlet.dynamicdatamapping.model.DDMStructure;
+import com.liferay.portlet.dynamicdatamapping.model.DDMStructureConstants;
+import com.liferay.portlet.dynamicdatamapping.model.DDMTemplate;
+import com.liferay.portlet.dynamicdatamapping.model.DDMTemplateConstants;
+import com.liferay.portlet.dynamicdatamapping.service.DDMStructureLocalServiceUtil;
+import com.liferay.portlet.dynamicdatamapping.service.DDMTemplateLocalServiceUtil;
+import com.liferay.portlet.journal.model.JournalArticle;
+import com.liferay.portlet.journal.model.JournalArticleConstants;
+import com.liferay.portlet.journal.service.JournalArticleLocalServiceUtil;
+import com.liferay.portlet.journal.service.JournalArticleServiceUtil;
+import com.liferay.portlet.journal.util.JournalConverterUtil;
+import com.liferay.portlet.wiki.model.WikiPage;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.Serializable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.portlet.PortletPreferences;
+
+/**
+ * @author Ryan Park
+ * @author Raymond Augé
+ */
+public class FileSystemImporter extends BaseImporter {
+
+
+	public void importResources() throws Exception {
+		_resourcesDir = new File(resourcesDir);
+
+		if (!_resourcesDir.isDirectory() || !_resourcesDir.canRead()) {
+			throw new IllegalArgumentException(
+				"Unaccessible resource directory " + resourcesDir);
+		}
+
+		doImportResources();
+	}
+
+	protected void addApplicationDisplayTemplate(
+			String script, File file, long classNameId)
+		throws PortalException, SystemException {
+
+		String fileName = FileUtil.stripExtension(file.getName());
+
+		String name = getName(fileName);
+
+		DDMTemplate ddmTemplate = DDMTemplateLocalServiceUtil.fetchTemplate(
+			groupId, classNameId, getKey(fileName));
+
+		if (ddmTemplate != null) {
+			if (!developerModeEnabled) {
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"DDM template with name " + name + " and version " +
+							version + " already exists");
+				}
+
+				return;
+			}
+
+			if (!updateModeEnabled) {
+				DDMTemplateLocalServiceUtil.deleteTemplate(ddmTemplate);
+			}
+		}
+
+		try {
+			if (!updateModeEnabled || (ddmTemplate == null)) {
+				DDMTemplateLocalServiceUtil.addTemplate(
+					userId, groupId, classNameId, 0, getKey(fileName),
+					getMap(name), null,
+					DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY,
+					StringPool.BLANK, getDDMTemplateLanguage(file.getName()),
+					script, true, false, StringPool.BLANK, null,
+					serviceContext);
+			}
+			else {
+				DDMTemplateLocalServiceUtil.updateTemplate(
+					ddmTemplate.getTemplateId(), ddmTemplate.getClassPK(),
+					getMap(name), null,
+					DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY,
+					StringPool.BLANK, getDDMTemplateLanguage(file.getName()),
+					script, ddmTemplate.getCacheable(), serviceContext);
+			}
+		}
+		catch (PortalException e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn(
+					"Unable to import application display template " +
+						file.getName(),
+					e);
+			}
+
+			throw e;
+		}
+	}
+
+	protected void addApplicationDisplayTemplate(
+			String parentDirName, String dirName, long classNameId)
+		throws Exception {
+
+		File dir = new File(
+			_resourcesDir, parentDirName + StringPool.SLASH + dirName);
+
+		if (!dir.isDirectory() || !dir.canRead()) {
+			return;
+		}
+
+		File[] files = listFiles(dir);
+
+		for (File file : files) {
+			String script = StringUtil.read(getInputStream(file));
+
+			if (Validator.isNull(script)) {
+				continue;
+			}
+
+			addApplicationDisplayTemplate(script, file, classNameId);
+		}
+	}
+
+	protected void addApplicationDisplayTemplates(String dirName)
+		throws Exception {
+
+		for (Object[] applicationDisplayTemplateType :
+				_APPLICATION_DISPLAY_TEMPLATE_TYPES) {
+
+			Class<?> clazz = (Class<?>)applicationDisplayTemplateType[1];
+
+			addApplicationDisplayTemplate(
+				dirName, (String)applicationDisplayTemplateType[0],
+				PortalUtil.getClassNameId(clazz));
+		}
+	}
+
+	protected void addDDLDisplayTemplates(
+			String ddmStructureKey, String dirName, String fileName)
+		throws Exception {
+
+		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.getStructure(
+			groupId, PortalUtil.getClassNameId(DDLRecordSet.class),
+			ddmStructureKey);
+
+		File dir = new File(
+			_resourcesDir, dirName + StringPool.SLASH + fileName);
+
+		if (!dir.isDirectory() || !dir.canRead()) {
+			return;
+		}
+
+		File[] files = listFiles(dir);
+
+		for (File file : files) {
+			String script = StringUtil.read(getInputStream(file));
+
+			if (Validator.isNull(script)) {
+				return;
+			}
+
+			addDDMTemplate(
+				groupId, ddmStructure.getStructureId(), file.getName(),
+				getDDMTemplateLanguage(file.getName()), script,
+				DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, null);
+		}
+	}
+
+	protected void addDDLFormTemplates(
+			String ddmStructureKey, String dirName, String fileName)
+		throws Exception {
+
+		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.getStructure(
+			groupId, PortalUtil.getClassNameId(DDLRecordSet.class),
+			ddmStructureKey);
+
+		File dir = new File(
+			_resourcesDir, dirName + StringPool.SLASH + fileName);
+
+		if (!dir.isDirectory() || !dir.canRead()) {
+			return;
+		}
+
+		File[] files = listFiles(dir);
+
+		for (File file : files) {
+			String script = StringUtil.read(getInputStream(file));
+
+			if (Validator.isNull(script)) {
+				return;
+			}
+
+			addDDMTemplate(
+				groupId, ddmStructure.getStructureId(), file.getName(), "xsd",
+				script, DDMTemplateConstants.TEMPLATE_TYPE_FORM,
+				DDMTemplateConstants.TEMPLATE_MODE_CREATE);
+		}
+	}
+
+	protected void addDDLStructures(String dirName) throws Exception {
+		File dir = new File(_resourcesDir, dirName);
+
+		if (!dir.isDirectory() || !dir.canRead()) {
+			return;
+		}
+
+		File[] files = listFiles(dir);
+
+		for (File file : files) {
+			String fileName = FileUtil.stripExtension(file.getName());
+
+			addDDMStructures(fileName, getInputStream(file));
+		}
+	}
+
+	protected void addDDMStructures(String fileName, InputStream inputStream)
+		throws Exception {
+
+		fileName = FileUtil.stripExtension(fileName);
+
+		String name = getName(fileName);
+
+		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.fetchStructure(
+			groupId, PortalUtil.getClassNameId(DDLRecordSet.class),
+			getKey(fileName));
+
+		if (ddmStructure != null) {
+			if (!developerModeEnabled) {
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"DDM structure with name " + name + " and version " +
+							version + " already exists");
+				}
+
+				return;
+			}
+
+			if (!updateModeEnabled) {
+				DDMStructureLocalServiceUtil.deleteDDMStructure(ddmStructure);
+			}
+		}
+
+		try {
+			if (!updateModeEnabled || (ddmStructure == null)) {
+				ddmStructure = DDMStructureLocalServiceUtil.addStructure(
+					userId, groupId,
+					DDMStructureConstants.DEFAULT_PARENT_STRUCTURE_ID,
+					PortalUtil.getClassNameId(DDLRecordSet.class),
+					getKey(fileName), getMap(name), null,
+					StringUtil.read(inputStream),
+					PropsUtil.get(PropsKeys.DYNAMIC_DATA_LISTS_STORAGE_TYPE),
+					DDMStructureConstants.TYPE_DEFAULT, serviceContext);
+			}
+			else {
+				ddmStructure = DDMStructureLocalServiceUtil.updateStructure(
+					ddmStructure.getStructureId(),
+					DDMStructureConstants.DEFAULT_PARENT_STRUCTURE_ID,
+					getMap(name), null, StringUtil.read(inputStream),
+					serviceContext);
+			}
+		}
+		catch (Exception e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import DDM structure " + fileName, e);
+			}
+
+			throw e;
+		}
+
+		addDDLDisplayTemplates(
+			ddmStructure.getStructureKey(),
+			_DDL_STRUCTURE_DISPLAY_TEMPLATE_DIR_NAME, fileName);
+
+		addDDLFormTemplates(
+			ddmStructure.getStructureKey(),
+			_DDL_STRUCTURE_FORM_TEMPLATE_DIR_NAME, fileName);
+	}
+
+	protected void addDDMStructures(
+			String parentDDMStructureKey, String dirName)
+		throws Exception {
+
+		File dir = new File(_resourcesDir, dirName);
+
+		if (!dir.isDirectory() || !dir.canRead()) {
+			return;
+		}
+
+		File[] files = listFiles(dir);
+
+		for (File file : files) {
+			InputStream inputStream = null;
+
+			try {
+				inputStream = new BufferedInputStream(
+					new FileInputStream(file));
+
+				addDDMStructures(
+					parentDDMStructureKey, file.getName(), inputStream);
+			}
+			finally {
+				if (inputStream != null) {
+					inputStream.close();
+				}
+			}
+		}
+	}
+
+	protected void addDDMStructures(
+			String parentDDMStructureKey, String fileName,
+			InputStream inputStream)
+		throws Exception {
+
+		fileName = FileUtil.stripExtension(fileName);
+
+		String name = getName(fileName);
+
+		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.fetchStructure(
+			groupId, PortalUtil.getClassNameId(JournalArticle.class),
+			getKey(fileName));
+
+		if (ddmStructure != null) {
+			if (!developerModeEnabled) {
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"DDM structure with name " + name + " and version " +
+							version + " already exists");
+				}
+
+				return;
+			}
+
+			if (!updateModeEnabled) {
+				DDMStructureLocalServiceUtil.deleteDDMStructure(ddmStructure);
+			}
+		}
+
+		String xsd = StringUtil.read(inputStream);
+
+		if (isJournalStructureXSD(xsd)) {
+			xsd = JournalConverterUtil.getDDMXSD(xsd);
+		}
+
+		setServiceContext(fileName);
+
+		try {
+			if (!updateModeEnabled || (ddmStructure == null)) {
+				ddmStructure = DDMStructureLocalServiceUtil.addStructure(
+					userId, groupId, parentDDMStructureKey,
+					PortalUtil.getClassNameId(JournalArticle.class),
+					getKey(fileName), getMap(name), null, xsd,
+					PropsUtil.get(PropsKeys.JOURNAL_ARTICLE_STORAGE_TYPE),
+					DDMStructureConstants.TYPE_DEFAULT, serviceContext);
+			}
+			else {
+				DDMStructure parentStructure =
+					DDMStructureLocalServiceUtil.fetchStructure(
+						groupId,
+						PortalUtil.getClassNameId(JournalArticle.class),
+						parentDDMStructureKey);
+
+				long parentDDMStructureId =
+					DDMStructureConstants.DEFAULT_PARENT_STRUCTURE_ID;
+
+				if (parentStructure != null) {
+					parentDDMStructureId = parentStructure.getStructureId();
+				}
+
+				ddmStructure = DDMStructureLocalServiceUtil.updateStructure(
+					ddmStructure.getStructureId(), parentDDMStructureId,
+					getMap(name), null, xsd, serviceContext);
+			}
+		}
+		catch (PortalException e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import DDM structure " + fileName, e);
+			}
+
+			throw e;
+		}
+
+		_ddmStructures.add(ddmStructure.getStructureKey());
+
+		addDDMTemplates(
+			ddmStructure.getStructureKey(),
+			_JOURNAL_DDM_TEMPLATES_DIR_NAME + fileName);
+
+		if (Validator.isNull(parentDDMStructureKey)) {
+			addDDMStructures(
+				ddmStructure.getStructureKey(),
+				_JOURNAL_DDM_STRUCTURES_DIR_NAME + fileName);
+		}
+	}
+
+	protected void addDDMTemplate(
+			long templateGroupId, long ddmStructureId, String fileName,
+			String language, String script, String type, String mode)
+		throws Exception {
+
+		fileName = FileUtil.getShortFileName(fileName);
+
+		fileName = FileUtil.stripExtension(fileName);
+
+		String name = getName(fileName);
+
+		DDMTemplate ddmTemplate = DDMTemplateLocalServiceUtil.fetchTemplate(
+			groupId, PortalUtil.getClassNameId(DDMStructure.class),
+			getKey(fileName));
+
+		if (ddmTemplate != null) {
+			if (!developerModeEnabled) {
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"DDM template with name " + name + " and version " +
+							version + " already exists");
+				}
+
+				return;
+			}
+
+			if (!updateModeEnabled) {
+				DDMTemplateLocalServiceUtil.deleteTemplate(ddmTemplate);
+			}
+		}
+
+		try {
+			if (!updateModeEnabled || (ddmTemplate == null)) {
+				DDMTemplateLocalServiceUtil.addTemplate(
+					userId, templateGroupId,
+					PortalUtil.getClassNameId(DDMStructure.class),
+					ddmStructureId, getKey(fileName), getMap(name), null, type,
+					mode, language, script, true, false, StringPool.BLANK, null,
+					serviceContext);
+			}
+			else {
+				DDMTemplateLocalServiceUtil.updateTemplate(
+					ddmTemplate.getTemplateId(),
+					PortalUtil.getClassNameId(DDMStructure.class), getMap(name),
+					null, DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, null,
+					language, script, ddmTemplate.getCacheable(),
+					serviceContext);
+			}
+		}
+		catch (PortalException e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import DDM template " + fileName, e);
+			}
+
+			throw e;
+		}
+	}
+
+	protected void addDDMTemplates(String ddmStructureKey, String dirName)
+		throws Exception {
+
+		File dir = new File(_resourcesDir, dirName);
+
+		if (!dir.isDirectory() || !dir.canRead()) {
+			return;
+		}
+
+		File[] files = listFiles(dir);
+
+		for (File file : files) {
+			InputStream inputStream = null;
+
+			try {
+				inputStream = new BufferedInputStream(
+					new FileInputStream(file));
+
+				addDDMTemplates(ddmStructureKey, file.getName(), inputStream);
+			}
+			finally {
+				if (inputStream != null) {
+					inputStream.close();
+				}
+			}
+		}
+	}
+
+	protected void addDDMTemplates(
+			String ddmStructureKey, String fileName, InputStream inputStream)
+		throws Exception {
+
+		String language = getDDMTemplateLanguage(fileName);
+
+		fileName = FileUtil.stripExtension(fileName);
+
+		String name = getName(fileName);
+
+		String xsl = StringUtil.read(inputStream);
+
+		setServiceContext(fileName);
+
+		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.getStructure(
+			groupId, PortalUtil.getClassNameId(JournalArticle.class),
+			ddmStructureKey);
+
+		DDMTemplate ddmTemplate = DDMTemplateLocalServiceUtil.fetchTemplate(
+			groupId, PortalUtil.getClassNameId(DDMStructure.class),
+			getKey(fileName));
+
+		if (ddmTemplate != null) {
+			if (!developerModeEnabled) {
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"DDM template with name " + name + " and version " +
+							version + " already exists");
+				}
+
+				return;
+			}
+
+			if (!updateModeEnabled) {
+				DDMTemplateLocalServiceUtil.deleteTemplate(ddmTemplate);
+			}
+		}
+
+		try {
+			if (!updateModeEnabled || (ddmTemplate == null)) {
+				ddmTemplate = DDMTemplateLocalServiceUtil.addTemplate(
+					userId, groupId,
+					PortalUtil.getClassNameId(DDMStructure.class),
+					ddmStructure.getStructureId(), getKey(fileName),
+					getMap(name), null,
+					DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, null, language,
+					replaceFileEntryURL(xsl), true, false, null, null,
+					serviceContext);
+			}
+			else {
+				ddmTemplate = DDMTemplateLocalServiceUtil.updateTemplate(
+					ddmTemplate.getTemplateId(),
+					PortalUtil.getClassNameId(DDMStructure.class), getMap(name),
+					null, DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, null,
+					language, replaceFileEntryURL(xsl),
+					ddmTemplate.getCacheable(), serviceContext);
+			}
+		}
+		catch (PortalException e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import DDM template " + fileName, e);
+			}
+
+			throw e;
+		}
+
+		addJournalArticles(
+			ddmStructureKey, ddmTemplate.getTemplateKey(),
+			_JOURNAL_ARTICLES_DIR_NAME + fileName);
+	}
+
+	protected void addDLFileEntries(String dirName) throws Exception {
+		File dir = new File(_resourcesDir, dirName);
+
+		if (!dir.isDirectory()|| !dir.canRead()) {
+			return;
+		}
+
+		File[] files = dir.listFiles();
+
+		if (ArrayUtil.isEmpty(files)) {
+			return;
+		}
+
+		for (File file : files) {
+			if (file.isDirectory()) {
+				addDLFolder(DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, file);
+			}
+			else {
+				addDLFileEntry(
+					DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, file);
+			}
+		}
+	}
+
+	protected void addDLFileEntry(long parentFolderId, File file)
+		throws Exception {
+
+		InputStream inputStream = null;
+
+		try {
+			inputStream = new BufferedInputStream(new FileInputStream(file));
+
+			addDLFileEntry(
+				parentFolderId, file.getName(), inputStream, file.length());
+		}
+		finally {
+			if (inputStream != null) {
+				inputStream.close();
+			}
+		}
+	}
+
+	protected void addDLFileEntry(
+			long parentFolderId, String fileName, InputStream inputStream,
+			long length)
+		throws Exception {
+
+		String title = FileUtil.stripExtension(fileName);
+
+		setServiceContext(fileName);
+
+		FileEntry fileEntry = null;
+
+		try {
+			try {
+				fileEntry = DLAppLocalServiceUtil.addFileEntry(
+					userId, groupId, parentFolderId, fileName,
+					MimeTypesUtil.getContentType(fileName), title,
+					StringPool.BLANK, StringPool.BLANK, inputStream, length,
+					serviceContext);
+			}
+			catch (DuplicateFileException dfe) {
+				fileEntry = DLAppLocalServiceUtil.getFileEntry(
+					groupId, parentFolderId, title);
+
+				String previousVersion = fileEntry.getVersion();
+
+				fileEntry = DLAppLocalServiceUtil.updateFileEntry(
+					userId, fileEntry.getFileEntryId(), fileName,
+					MimeTypesUtil.getContentType(fileName), title,
+					StringPool.BLANK, StringPool.BLANK, true, inputStream,
+					length, serviceContext);
+
+				DLFileEntryLocalServiceUtil.deleteFileVersion(
+					fileEntry.getUserId(), fileEntry.getFileEntryId(),
+					previousVersion);
+			}
+		}
+		catch (PortalException e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import DL file entry " + fileName, e);
+			}
+
+			throw e;
+		}
+
+		addPrimaryKey(DLFileEntry.class.getName(), fileEntry.getPrimaryKey());
+
+		_fileEntries.put(fileName, fileEntry);
+	}
+
+	protected long addDLFolder(long parentFolderId, File folder)
+		throws Exception {
+
+		long folderId = addDLFolder(parentFolderId, folder.getName());
+
+		File[] files = folder.listFiles();
+
+		if (ArrayUtil.isEmpty(files)) {
+			return folderId;
+		}
+
+		for (File file : files) {
+			if (file.isDirectory()) {
+				addDLFolder(folderId, file);
+			}
+			else {
+				addDLFileEntry(folderId, file);
+			}
+		}
+
+		return folderId;
+	}
+
+	protected long addDLFolder(long parentFolderId, String folderName)
+		throws Exception {
+
+		DLFolder dlFolder = DLFolderLocalServiceUtil.fetchFolder(
+			groupId, parentFolderId, folderName);
+
+		if (dlFolder == null) {
+			dlFolder = DLFolderLocalServiceUtil.addFolder(
+				userId, groupId, groupId, false, parentFolderId, folderName,
+				null, false, serviceContext);
+		}
+
+		addPrimaryKey(DLFolder.class.getName(), dlFolder.getPrimaryKey());
+
+		return dlFolder.getFolderId();
+	}
+
+	protected void addJournalArticles(
+			String ddmStructureKey, String ddmTemplateKey, String dirName)
+		throws Exception {
+
+		File dir = new File(_resourcesDir, dirName);
+
+		if (!dir.isDirectory() || !dir.canRead()) {
+			return;
+		}
+
+		File[] files = listFiles(dir);
+
+		for (File file : files) {
+			InputStream inputStream = null;
+
+			try {
+				inputStream = new BufferedInputStream(
+					new FileInputStream(file));
+
+				addJournalArticles(
+					ddmStructureKey, ddmTemplateKey, file.getName(),
+					inputStream);
+			}
+			finally {
+				if (inputStream != null) {
+					inputStream.close();
+				}
+			}
+		}
+	}
+
+	protected void addJournalArticles(
+			String ddmStructureKey, String ddmTemplateKey, String fileName,
+			InputStream inputStream)
+		throws Exception {
+
+		String title = FileUtil.stripExtension(fileName);
+
+		JSONObject assetJSONObject = _assetJSONObjectMap.get(fileName);
+
+		Map<Locale, String> descriptionMap = null;
+
+		boolean indexable = true;
+
+		if (assetJSONObject != null) {
+			String abstractSummary = assetJSONObject.getString(
+				"abstractSummary");
+
+			descriptionMap = getMap(abstractSummary);
+
+			indexable = GetterUtil.getBoolean(
+				assetJSONObject.getString("indexable"), true);
+		}
+
+		String content = StringUtil.read(inputStream);
+
+		content = processJournalArticleContent(content);
+
+		Locale articleDefaultLocale = LocaleUtil.fromLanguageId(
+			LocalizationUtil.getDefaultLanguageId(content));
+
+		boolean smallImage = false;
+		String smallImageURL = StringPool.BLANK;
+
+		if (assetJSONObject != null) {
+			String smallImageFileName = assetJSONObject.getString("smallImage");
+
+			if (Validator.isNotNull(smallImageFileName)) {
+				smallImage = true;
+
+				FileEntry fileEntry = _fileEntries.get(smallImageFileName);
+
+				if (fileEntry != null) {
+					smallImageURL = DLUtil.getPreviewURL(
+						fileEntry, fileEntry.getFileVersion(), null,
+						StringPool.BLANK);
+				}
+			}
+		}
+
+		setServiceContext(fileName);
+
+		String journalArticleId = getJournalId(fileName);
+
+		JournalArticle journalArticle =
+			JournalArticleLocalServiceUtil.fetchLatestArticle(
+				groupId, journalArticleId, WorkflowConstants.STATUS_ANY);
+
+		try {
+			if (journalArticle == null) {
+				journalArticle = JournalArticleLocalServiceUtil.addArticle(
+					userId, groupId, 0, 0, 0, journalArticleId, false,
+					JournalArticleConstants.VERSION_DEFAULT,
+					getMap(articleDefaultLocale, title), descriptionMap,
+					content, "general", ddmStructureKey, ddmTemplateKey,
+					StringPool.BLANK, 1, 1, 2010, 0, 0, 0, 0, 0, 0, 0, true, 0,
+					0, 0, 0, 0, true, indexable, smallImage, smallImageURL,
+					null, new HashMap<String, byte[]>(), StringPool.BLANK,
+					serviceContext);
+			}
+			else {
+				journalArticle =
+					JournalArticleLocalServiceUtil.updateArticle(
+						userId, groupId, 0, journalArticleId,
+						journalArticle.getVersion(),
+						getMap(articleDefaultLocale, title), descriptionMap,
+						content, "general", ddmStructureKey, ddmTemplateKey,
+						StringPool.BLANK, 1, 1, 2010, 0, 0, 0, 0, 0, 0, 0, true,
+						0, 0, 0, 0, 0, true, indexable, smallImage,
+						smallImageURL, null, new HashMap<String, byte[]>(),
+						StringPool.BLANK, serviceContext);
+			}
+
+			JournalArticleLocalServiceUtil.updateStatus(
+				userId, groupId, journalArticle.getArticleId(),
+				journalArticle.getVersion(), WorkflowConstants.STATUS_APPROVED,
+				StringPool.BLANK, new HashMap<String, Serializable>(),
+				serviceContext);
+		}
+		catch (PortalException e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import journal article " + fileName, e);
+			}
+
+			throw e;
+		}
+
+		addPrimaryKey(
+			JournalArticle.class.getName(), journalArticle.getPrimaryKey());
+	}
+
+	protected void addLayout(
+			boolean privateLayout, long parentLayoutId,
+			JSONObject layoutJSONObject)
+		throws Exception {
+
+		if (targetClassName.equals(LayoutSetPrototype.class.getName())) {
+			privateLayout = true;
+		}
+
+		Map<Locale, String> nameMap = getMap(layoutJSONObject, "name");
+		Map<Locale, String> titleMap = getMap(layoutJSONObject, "title");
+
+		String type = layoutJSONObject.getString("type");
+
+		if (Validator.isNull(type)) {
+			type = LayoutConstants.TYPE_PORTLET;
+		}
+
+		String typeSettings = layoutJSONObject.getString("typeSettings");
+
+		boolean hidden = layoutJSONObject.getBoolean("hidden");
+
+		Map<Locale, String> friendlyURLMap = new HashMap<Locale, String>();
+
+		String friendlyURL = layoutJSONObject.getString("friendlyURL");
+
+		if (Validator.isNotNull(friendlyURL) &&
+			!friendlyURL.startsWith(StringPool.SLASH)) {
+
+			friendlyURL = StringPool.SLASH + friendlyURL;
+		}
+
+		friendlyURLMap.put(LocaleUtil.getDefault(), friendlyURL);
+
+		ServiceContext serviceContext = new ServiceContext();
+
+		serviceContext.setCompanyId(companyId);
+		serviceContext.setScopeGroupId(groupId);
+		serviceContext.setUserId(userId);
+
+		ServiceContextThreadLocal.pushServiceContext(serviceContext);
+
+		try {
+			String layoutPrototypeName = layoutJSONObject.getString(
+				"layoutPrototypeName");
+
+			String layoutPrototypeUuid = null;
+
+			if (Validator.isNotNull(layoutPrototypeName)) {
+				LayoutPrototype layoutPrototype = getLayoutPrototype(
+					companyId, layoutPrototypeName);
+
+				layoutPrototypeUuid = layoutPrototype.getUuid();
+			}
+			else {
+				layoutPrototypeUuid = layoutJSONObject.getString(
+					"layoutPrototypeUuid");
+			}
+
+			if (Validator.isNotNull(layoutPrototypeUuid)) {
+				boolean layoutPrototypeLinkEnabled = GetterUtil.getBoolean(
+					layoutJSONObject.getString("layoutPrototypeLinkEnabled"),
+					false);
+
+				serviceContext.setAttribute(
+					"layoutPrototypeLinkEnabled", layoutPrototypeLinkEnabled);
+
+				serviceContext.setAttribute(
+					"layoutPrototypeUuid", layoutPrototypeUuid);
+			}
+
+			Layout layout = LayoutLocalServiceUtil.fetchLayoutByFriendlyURL(
+				groupId, privateLayout, friendlyURL);
+
+			if (layout != null) {
+				if (!developerModeEnabled) {
+					if (_log.isInfoEnabled()) {
+						_log.info(
+							"Layout with friendly URL " + friendlyURL +
+								" already exists");
+				}
+
+					return;
+				}
+
+				if (!updateModeEnabled) {
+					LayoutLocalServiceUtil.deleteLayout(layout);
+				}
+			}
+
+			if (!updateModeEnabled || (layout == null)) {
+				layout = LayoutLocalServiceUtil.addLayout(
+					userId, groupId, privateLayout, parentLayoutId, nameMap,
+					titleMap, null, null, null, type, typeSettings, hidden,
+					friendlyURLMap, serviceContext);
+			}
+			else {
+				layout = LayoutLocalServiceUtil.updateLayout(
+					groupId, privateLayout, layout.getLayoutId(),
+					parentLayoutId, nameMap, titleMap,
+					layout.getDescriptionMap(), layout.getKeywordsMap(),
+					layout.getRobotsMap(), type, hidden, friendlyURLMap,
+					layout.getIconImage(), null, serviceContext);
+			}
+
+			LayoutTypePortlet layoutTypePortlet =
+				(LayoutTypePortlet)layout.getLayoutType();
+
+			String layoutTemplateId = layoutJSONObject.getString(
+				"layoutTemplateId", _defaultLayoutTemplateId);
+
+			if (Validator.isNotNull(layoutTemplateId)) {
+				layoutTypePortlet.setLayoutTemplateId(
+					userId, layoutTemplateId, false);
+			}
+
+			JSONArray columnsJSONArray = layoutJSONObject.getJSONArray(
+				"columns");
+
+			addLayoutColumns(
+				layout, LayoutTypePortletConstants.COLUMN_PREFIX,
+				columnsJSONArray);
+
+			LayoutLocalServiceUtil.updateLayout(
+				groupId, layout.isPrivateLayout(), layout.getLayoutId(),
+				layout.getTypeSettings());
+
+			JSONArray layoutsJSONArray = layoutJSONObject.getJSONArray(
+				"layouts");
+
+			addLayouts(privateLayout, layout.getLayoutId(), layoutsJSONArray);
+		}
+		catch (Exception e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import layout " + layoutJSONObject, e);
+			}
+
+			throw e;
+		}
+		finally {
+			ServiceContextThreadLocal.popServiceContext();
+		}
+	}
+
+	protected void addLayoutColumn(
+			Layout layout, String columnId, JSONArray columnJSONArray)
+		throws Exception {
+
+		if (columnJSONArray == null) {
+			return;
+		}
+
+		for (int i = 0; i < columnJSONArray.length(); i++) {
+			JSONObject portletJSONObject = columnJSONArray.getJSONObject(i);
+
+			if (portletJSONObject == null) {
+				String journalArticleId = getJournalId(
+					columnJSONArray.getString(i));
+
+				portletJSONObject = getDefaultPortletJSONObject(
+					journalArticleId);
+			}
+
+			addLayoutColumnPortlet(layout, columnId, portletJSONObject);
+		}
+	}
+
+	protected void addLayoutColumnPortlet(
+			Layout layout, String columnId, JSONObject portletJSONObject)
+		throws Exception {
+
+		LayoutTypePortlet layoutTypePortlet =
+			(LayoutTypePortlet)layout.getLayoutType();
+
+		String rootPortletId = portletJSONObject.getString("portletId");
+
+		if (Validator.isNull(rootPortletId)) {
+			throw new ImporterException("portletId is not specified");
+		}
+
+		String portletId = layoutTypePortlet.addPortletId(
+			userId, rootPortletId, columnId, -1, false);
+
+		if (portletId == null) {
+			return;
+		}
+
+		JSONObject portletPreferencesJSONObject =
+			portletJSONObject.getJSONObject("portletPreferences");
+
+		if ((portletPreferencesJSONObject == null) ||
+			(portletPreferencesJSONObject.length() == 0)) {
+
+			return;
+		}
+
+		PortletPreferences portletSetup =
+			PortletPreferencesFactoryUtil.getLayoutPortletSetup(
+				layout, portletId);
+
+		Iterator<String> iterator = portletPreferencesJSONObject.keys();
+
+		while (iterator.hasNext()) {
+			String key = iterator.next();
+
+			String value = portletPreferencesJSONObject.getString(key);
+
+			if (rootPortletId.equals(PortletKeys.JOURNAL_CONTENT) &&
+				key.equals("articleId")) {
+
+				value = getJournalId(value);
+			}
+
+			portletSetup.setValue(key, value);
+		}
+
+		portletSetup.store();
+
+		if (rootPortletId.equals(PortletKeys.NESTED_PORTLETS)) {
+			JSONArray columnsJSONArray =
+				portletPreferencesJSONObject.getJSONArray("columns");
+
+			StringBundler sb = new StringBundler(4);
+
+			sb.append(StringPool.UNDERLINE);
+			sb.append(portletId);
+			sb.append(StringPool.DOUBLE_UNDERLINE);
+			sb.append(LayoutTypePortletConstants.COLUMN_PREFIX);
+
+			addLayoutColumns(layout, sb.toString(), columnsJSONArray);
+		}
+	}
+
+	protected void addLayoutColumns(
+			Layout layout, String columnPrefix, JSONArray columnsJSONArray)
+		throws Exception {
+
+		if (columnsJSONArray == null) {
+			return;
+		}
+
+		for (int i = 0; i < columnsJSONArray.length(); i++) {
+			JSONArray columnJSONArray = columnsJSONArray.getJSONArray(i);
+
+			addLayoutColumn(layout, columnPrefix + (i + 1), columnJSONArray);
+		}
+	}
+
+	protected void addLayoutPrototype(InputStream inputStream)
+		throws Exception {
+
+		String content = StringUtil.read(inputStream);
+
+		if (Validator.isNull(content)) {
+			return;
+		}
+
+		JSONObject jsonObject = JSONFactoryUtil.createJSONObject(content);
+
+		JSONObject layoutTemplateJSONObject = jsonObject.getJSONObject(
+			"layoutTemplate");
+
+		Map<Locale, String> nameMap = getMap(
+			layoutTemplateJSONObject.getString("name"));
+
+		String name = nameMap.get(Locale.getDefault());
+
+		Map<Locale, String> descriptionMap = getMap(
+			layoutTemplateJSONObject, "description");
+
+		String uuid = layoutTemplateJSONObject.getString("uuid");
+
+		LayoutPrototype layoutPrototype = getLayoutPrototype(companyId, name);
+
+		if (layoutPrototype != null) {
+			if (!developerModeEnabled) {
+				if (_log.isInfoEnabled()) {
+					_log.info(
+						"Layout prototype with name " + name +
+							" already exists for company " + companyId);
+				}
+
+				return;
+			}
+
+			if (!updateModeEnabled) {
+				LayoutPrototypeLocalServiceUtil.deleteLayoutPrototype(
+					layoutPrototype);
+			}
+		}
+
+		ServiceContext serviceContext = new ServiceContext();
+
+		serviceContext.setCompanyId(companyId);
+		serviceContext.setUserId(userId);
+
+		if (Validator.isNotNull(uuid)) {
+			serviceContext.setUuid(uuid);
+		}
+
+		try {
+			if (!updateModeEnabled || (layoutPrototype == null)) {
+				layoutPrototype =
+					LayoutPrototypeLocalServiceUtil.addLayoutPrototype(
+						userId, companyId, getMap(name),
+						descriptionMap.get(LocaleUtil.getDefault()), true,
+						serviceContext);
+			}
+			else {
+				layoutPrototype =
+					LayoutPrototypeLocalServiceUtil.updateLayoutPrototype(
+						layoutPrototype.getLayoutPrototypeId(), getMap(name),
+						descriptionMap.get(LocaleUtil.getDefault()),
+						layoutPrototype.isActive(), serviceContext);
+			}
+		}
+		catch (Exception e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to import layout prototype " + name, e);
+			}
+
+			throw e;
+		}
+
+		JSONArray columnsJSONArray = layoutTemplateJSONObject.getJSONArray(
+			"columns");
+
+		Layout layout = layoutPrototype.getLayout();
+
+		addLayoutColumns(
+			layout, LayoutTypePortletConstants.COLUMN_PREFIX, columnsJSONArray);
+
+		LayoutLocalServiceUtil.updateLayout(
+			layout.getGroupId(), layout.isPrivateLayout(), layout.getLayoutId(),
+			layout.getTypeSettings());
+	}
+
+	protected void addLayoutPrototype(String dirName) throws Exception {
+		File layoutTemplatesDir = new File(_resourcesDir, dirName);
+
+		if (!layoutTemplatesDir.isDirectory() ||
+			!layoutTemplatesDir.canRead()) {
+
+			return;
+		}
+
+		File[] files = listFiles(layoutTemplatesDir);
+
+		for (File file : files) {
+			addLayoutPrototype(getInputStream(file));
+		}
+	}
+
+	protected void addLayouts(
+			boolean privateLayout, long parentLayoutId,
+			JSONArray layoutsJSONArray)
+		throws Exception {
+
+		if (layoutsJSONArray == null) {
+			return;
+		}
+
+		for (int i = 0; i < layoutsJSONArray.length(); i++) {
+			JSONObject layoutJSONObject = layoutsJSONArray.getJSONObject(i);
+
+			addLayout(privateLayout, parentLayoutId, layoutJSONObject);
+		}
+	}
+
+	protected void addPrimaryKey(String className, long primaryKey) {
+		Set<Long> primaryKeys = _primaryKeys.get(className);
+
+		if (primaryKeys == null) {
+			primaryKeys = new HashSet<Long>();
+
+			_primaryKeys.put(className, primaryKeys);
+		}
+
+		primaryKeys.add(primaryKey);
+	}
+
+	protected void doImportResources() throws Exception {
+		serviceContext = new ServiceContext();
+
+		serviceContext.setAddGroupPermissions(true);
+		serviceContext.setAddGuestPermissions(true);
+		serviceContext.setScopeGroupId(groupId);
+
+		boolean indexReadOnly = SearchEngineUtil.isIndexReadOnly();
+
+		boolean layoutImportInProcess =
+			ExportImportThreadLocal.isLayoutImportInProcess();
+		boolean portletImportInProcess =
+			ExportImportThreadLocal.isPortletImportInProcess();
+
+		try {
+			SearchEngineUtil.setIndexReadOnly(true);
+
+			setUpAssets("assets.json");
+			setUpSettings("settings.json");
+			setUpSitemap("sitemap.json");
+
+			SearchEngineUtil.setIndexReadOnly(false);
+
+			ExportImportThreadLocal.setLayoutImportInProcess(false);
+			ExportImportThreadLocal.setPortletImportInProcess(false);
+
+			long startTime = System.currentTimeMillis();
+
+			if (_log.isDebugEnabled()) {
+				_log.debug("Commence indexing");
+			}
+
+			index();
+
+			if (_log.isDebugEnabled()) {
+				_log.debug(
+					"Indexing completed in " +
+						(System.currentTimeMillis() - startTime) + "ms");
+			}
+		}
+		finally {
+			SearchEngineUtil.setIndexReadOnly(indexReadOnly);
+
+			ExportImportThreadLocal.setLayoutImportInProcess(
+				layoutImportInProcess);
+			ExportImportThreadLocal.setPortletImportInProcess(
+				portletImportInProcess);
+		}
+	}
+
+	protected String getDDMTemplateLanguage(String fileName) {
+		String extension = FileUtil.getExtension(fileName);
+
+		if (extension.equals(TemplateConstants.LANG_TYPE_CSS) ||
+			extension.equals(TemplateConstants.LANG_TYPE_FTL) ||
+			extension.equals(TemplateConstants.LANG_TYPE_VM) ||
+			extension.equals(TemplateConstants.LANG_TYPE_XSL)) {
+
+			return extension;
+		}
+
+		return TemplateConstants.LANG_TYPE_VM;
+	}
+
+	protected JSONObject getDefaultPortletJSONObject(String journalArticleId) {
+		JSONObject portletJSONObject = JSONFactoryUtil.createJSONObject();
+
+		portletJSONObject.put("portletId", PortletKeys.JOURNAL_CONTENT);
+
+		JSONObject portletPreferencesJSONObject =
+			JSONFactoryUtil.createJSONObject();
+
+		portletPreferencesJSONObject.put("articleId", journalArticleId);
+		portletPreferencesJSONObject.put("groupId", groupId);
+		portletPreferencesJSONObject.put("portletSetupShowBorders", false);
+
+		portletJSONObject.put(
+			"portletPreferences", portletPreferencesJSONObject);
+
+		return portletJSONObject;
+	}
+
+	protected InputStream getInputStream(File file) throws Exception {
+		if (!file.exists() || file.isDirectory() || !file.canRead()) {
+			return null;
+		}
+
+		return new BufferedInputStream(new FileInputStream(file));
+	}
+
+	protected InputStream getInputStream(String fileName) throws Exception {
+		File file = new File(_resourcesDir, fileName);
+
+		return getInputStream(file);
+	}
+
+	protected String getJournalId(String fileName) {
+		String id = FileUtil.stripExtension(fileName);
+
+		id = StringUtil.toUpperCase(id);
+
+		return StringUtil.replace(id, StringPool.SPACE, StringPool.DASH);
+	}
+
+	protected String[] getJSONArrayAsStringArray(
+		JSONObject jsonObject, String key) {
+
+		JSONArray jsonArray = jsonObject.getJSONArray(key);
+
+		if (jsonArray != null) {
+			return ArrayUtil.toStringArray(jsonArray);
+		}
+
+		return new String[0];
+	}
+
+	protected JSONObject getJSONObject(String fileName) throws Exception {
+		String json = null;
+
+		InputStream inputStream = getInputStream(fileName);
+
+		if (inputStream == null) {
+			return null;
+		}
+
+		try {
+			json = StringUtil.read(inputStream);
+		}
+		finally {
+			inputStream.close();
+		}
+
+		json = StringUtil.replace(
+			json, new String[] {"${companyId}", "${groupId}", "${userId}"},
+			new String[] {
+				String.valueOf(companyId), String.valueOf(groupId),
+				String.valueOf(userId)
+			});
+
+		return JSONFactoryUtil.createJSONObject(json);
+	}
+
+	protected String getKey(String name) {
+		name = StringUtil.replace(name, StringPool.SPACE, StringPool.DASH);
+
+		name = StringUtil.toUpperCase(name);
+
+		if (appendVersion) {
+			name = name + StringPool.DASH + version;
+		}
+
+		return name;
+	}
+
+	protected Map<Locale, String> getMap(
+		JSONObject layoutJSONObject, String name) {
+
+		Map<Locale, String> map = new HashMap<Locale, String>();
+
+		JSONObject jsonObject = layoutJSONObject.getJSONObject(
+			name.concat("Map"));
+
+		if (jsonObject != null) {
+			map = (Map<Locale, String>)LocalizationUtil.deserialize(jsonObject);
+
+			if (!map.containsKey(LocaleUtil.getDefault())) {
+				Collection<String> values = map.values();
+
+				Iterator<String> iterator = values.iterator();
+
+				map.put(LocaleUtil.getDefault(), iterator.next());
+			}
+		}
+		else {
+			String value = layoutJSONObject.getString(name);
+
+			map.put(LocaleUtil.getDefault(), value);
+		}
+
+		return map;
+	}
+
+	protected Map<Locale, String> getMap(Locale locale, String value) {
+		Map<Locale, String> map = new HashMap<Locale, String>();
+
+		map.put(locale, value);
+
+		return map;
+	}
+
+	protected Map<Locale, String> getMap(String value) {
+		return getMap(LocaleUtil.getDefault(), value);
+	}
+
+	protected String getName(String name) {
+		if (!appendVersion) {
+			return name;
+		}
+
+		return name + " - " + version;
+	}
+
+	protected void index() throws Exception {
+		for (Map.Entry<String, Set<Long>> primaryKeysEntry :
+				_primaryKeys.entrySet()) {
+
+			String className = primaryKeysEntry.getKey();
+
+			Set<Long> primaryKeys = primaryKeysEntry.getValue();
+
+			Indexer indexer = IndexerRegistryUtil.getIndexer(className);
+
+			if (indexer == null) {
+				if (_log.isWarnEnabled()) {
+					_log.warn(
+						"No indexer within the IndexerRegistry for: " +
+							className);
+				}
+
+				continue;
+			}
+
+			if (_log.isDebugEnabled()) {
+				_log.debug("Indexing: " + className);
+			}
+
+			for (long primaryKey : primaryKeys) {
+				try {
+					indexer.reindex(className, primaryKey);
+				}
+				catch (SearchException e) {
+					if (_log.isWarnEnabled()) {
+						_log.warn(
+							"Cannot index entry: className=" + className +
+								", primaryKey=" + primaryKey,
+							e);
+					}
+				}
+			}
+		}
+
+		if (_ddmStructures.isEmpty()) {
+			return;
+		}
+
+		Set<Long> primaryKeys = _primaryKeys.get(
+			JournalArticle.class.getName());
+
+		Indexer indexer = IndexerRegistryUtil.getIndexer(
+			JournalArticle.class.getName());
+
+		for (String ddmStructureKey : _ddmStructures) {
+			List<JournalArticle> journalArticles =
+				JournalArticleServiceUtil.getArticlesByStructureId(
+					getGroupId(), ddmStructureKey, QueryUtil.ALL_POS,
+					QueryUtil.ALL_POS, null);
+
+			for (JournalArticle journalArticle : journalArticles) {
+				if ((primaryKeys != null) &&
+					primaryKeys.contains(journalArticle.getPrimaryKey())) {
+
+					continue;
+				}
+
+				try {
+					indexer.reindex(
+						JournalArticle.class.getName(),
+						journalArticle.getPrimaryKey());
+				}
+				catch (SearchException e) {
+					if (_log.isWarnEnabled()) {
+						_log.warn(
+							"Cannot index entry: className=" +
+								JournalArticle.class.getName() +
+								", primaryKey=" +
+								journalArticle.getPrimaryKey(),
+							e);
+					}
+				}
+			}
+		}
+	}
+
+	protected boolean isJournalStructureXSD(String xsd) throws Exception {
+		Document document = SAXReaderUtil.read(xsd);
+
+		Element rootElement = document.getRootElement();
+
+		Attribute availableLocalesAttribute = rootElement.attribute(
+			"available-locales");
+
+		if (availableLocalesAttribute == null) {
+			return true;
+		}
+
+		return false;
+	}
+
+	protected File[] listFiles(File dir) {
+		File[] files = dir.listFiles();
+
+		if (files == null) {
+			return new File[0];
+		}
+
+		List<File> filesList = new ArrayList<File>();
+
+		for (File file : files) {
+			if (file.isFile()) {
+				filesList.add(file);
+			}
+		}
+
+		return filesList.toArray(new File[filesList.size()]);
+	}
+
+	protected String processJournalArticleContent(String content)
+		throws Exception {
+
+		content = replaceFileEntryURL(content);
+
+		if (content.contains("<?xml version=\"1.0\"")) {
+			return content;
+		}
+
+		StringBundler sb = new StringBundler(13);
+
+		sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		sb.append("<root available-locales=\"");
+		sb.append(LocaleUtil.getDefault());
+		sb.append("\" default-locale=\"");
+		sb.append(LocaleUtil.getDefault());
+		sb.append("\">");
+		sb.append("<static-content language-id=\"");
+		sb.append(LocaleUtil.getDefault());
+		sb.append("\">");
+		sb.append("<![CDATA[");
+		sb.append(content);
+		sb.append("]]>");
+		sb.append("</static-content></root>");
+
+		return sb.toString();
+	}
+
+	protected String replaceFileEntryURL(String content) throws Exception {
+		Matcher matcher = _fileEntryPattern.matcher(content);
+
+		while (matcher.find()) {
+			String fileName = matcher.group(1);
+
+			FileEntry fileEntry = _fileEntries.get(fileName);
+
+			String fileEntryURL = StringPool.BLANK;
+
+			if (fileEntry != null) {
+				fileEntryURL = DLUtil.getPreviewURL(
+					fileEntry, fileEntry.getFileVersion(), null,
+					StringPool.BLANK);
+			}
+
+			content = matcher.replaceFirst(fileEntryURL);
+
+			matcher.reset(content);
+		}
+
+		return content;
+	}
+
+	protected void setServiceContext(String name) {
+		JSONObject assetJSONObject = _assetJSONObjectMap.get(name);
+
+		String[] assetTagNames = null;
+
+		if (assetJSONObject != null) {
+			assetTagNames = getJSONArrayAsStringArray(assetJSONObject, "tags");
+		}
+
+		serviceContext.setAssetTagNames(assetTagNames);
+	}
+
+	protected void setUpAssets(JSONArray assetsJSONArray) {
+		if (assetsJSONArray == null) {
+			return;
+		}
+
+		for (int i = 0; i < assetsJSONArray.length(); i++) {
+			JSONObject assetJSONObject = assetsJSONArray.getJSONObject(i);
+
+			String name = assetJSONObject.getString("name");
+
+			_assetJSONObjectMap.put(name, assetJSONObject);
+		}
+	}
+
+	protected void setUpAssets(String fileName) throws Exception {
+		if (!updateModeEnabled && !isCompanyGroup()) {
+			List<AssetTag> assetTags = AssetTagLocalServiceUtil.getGroupTags(
+				groupId);
+
+			for (AssetTag assetTag : assetTags) {
+				AssetTagLocalServiceUtil.deleteAssetTag(assetTag);
+			}
+
+			RepositoryLocalServiceUtil.deleteRepositories(groupId);
+
+			JournalArticleLocalServiceUtil.deleteArticles(groupId);
+
+			DDMTemplateLocalServiceUtil.deleteTemplates(groupId);
+
+			DDMStructureLocalServiceUtil.deleteStructures(groupId);
+		}
+
+		JSONObject jsonObject = getJSONObject(fileName);
+
+		if (jsonObject != null) {
+			JSONArray assetsJSONArray = jsonObject.getJSONArray("assets");
+
+			setUpAssets(assetsJSONArray);
+		}
+
+		addDLFileEntries(_DL_DOCUMENTS_DIR_NAME);
+
+		addApplicationDisplayTemplates(_APPLICATION_DISPLAY_TEMPLATE_DIR_NAME);
+
+		addDDLStructures(_DDL_STRUCTURE_DIR_NAME);
+
+		addDDMStructures(StringPool.BLANK, _JOURNAL_DDM_STRUCTURES_DIR_NAME);
+
+		addDDMTemplates(StringPool.BLANK, _JOURNAL_DDM_TEMPLATES_DIR_NAME);
+
+		addJournalArticles(
+			StringPool.BLANK, StringPool.BLANK, _JOURNAL_ARTICLES_DIR_NAME);
+
+		addLayoutPrototype(_LAYOUT_PROTOTYPE_DIR_NAME);
+	}
+
+	protected void setUpSettings(String fileName) throws Exception {
+		if (targetClassName.equals(Group.class.getName())) {
+			return;
+		}
+
+		JSONObject jsonObject = getJSONObject(fileName);
+
+		if (jsonObject == null) {
+			return;
+		}
+
+		LayoutSetPrototype layoutSetPrototype =
+			LayoutSetPrototypeLocalServiceUtil.getLayoutSetPrototype(
+				getTargetClassPK());
+
+		String layoutSetPrototypeSettings = jsonObject.getString(
+			"layoutSetPrototypeSettings", StringPool.BLANK);
+
+		layoutSetPrototype.setSettings(layoutSetPrototypeSettings);
+
+		LayoutSetPrototypeLocalServiceUtil.updateLayoutSetPrototype(
+			layoutSetPrototype);
+	}
+
+	protected void setUpSitemap(String fileName) throws Exception {
+		if (!updateModeEnabled) {
+			LayoutLocalServiceUtil.deleteLayouts(
+				groupId, true, new ServiceContext());
+
+			LayoutLocalServiceUtil.deleteLayouts(
+				groupId, false, new ServiceContext());
+		}
+
+		JSONObject jsonObject = getJSONObject(fileName);
+
+		if (jsonObject == null) {
+			return;
+		}
+
+		_defaultLayoutTemplateId = jsonObject.getString(
+			"layoutTemplateId", StringPool.BLANK);
+
+		updateLayoutSetThemeId(jsonObject);
+
+		JSONArray layoutsJSONArray = jsonObject.getJSONArray("layouts");
+
+		if (layoutsJSONArray != null) {
+			addLayouts(
+				false, LayoutConstants.DEFAULT_PARENT_LAYOUT_ID,
+				layoutsJSONArray);
+		}
+		else {
+			JSONArray publicPagesJSONArray = jsonObject.getJSONArray(
+				"publicPages");
+
+			if (publicPagesJSONArray != null) {
+				addLayouts(
+					false, LayoutConstants.DEFAULT_PARENT_LAYOUT_ID,
+					publicPagesJSONArray);
+			}
+
+			JSONArray privatePagesJSONArray = jsonObject.getJSONArray(
+				"privatePages");
+
+			if (privatePagesJSONArray != null) {
+				addLayouts(
+					true, LayoutConstants.DEFAULT_PARENT_LAYOUT_ID,
+					privatePagesJSONArray);
+			}
+		}
+	}
+
+	protected void updateLayoutSetThemeId(JSONObject sitemapJSONObject)
+		throws Exception {
+
+		String themeId = sitemapJSONObject.getString("themeId");
+
+		if (Validator.isNotNull(themeId)) {
+			Theme theme = ThemeLocalServiceUtil.fetchTheme(companyId, themeId);
+
+			if (theme == null) {
+				themeId = null;
+			}
+		}
+
+		if (Validator.isNull(themeId)) {
+			int pos = servletContextName.indexOf("-theme");
+
+			if (pos != -1) {
+				themeId =
+					servletContextName.substring(0, pos) +
+						PortletConstants.WAR_SEPARATOR + servletContextName;
+
+				themeId = PortalUtil.getJsSafePortletId(themeId);
+
+				Theme theme = ThemeLocalServiceUtil.fetchTheme(
+					companyId, themeId);
+
+				if (theme == null) {
+					themeId = null;
+				}
+			}
+		}
+
+		if (Validator.isNotNull(themeId)) {
+			LayoutSetLocalServiceUtil.updateLookAndFeel(
+				groupId, themeId, null, null, false);
+		}
+	}
+
+	protected ServiceContext serviceContext;
+
+	private static final String _APPLICATION_DISPLAY_TEMPLATE_DIR_NAME =
+		"/templates/application_display";
+
+	private static final Object[][] _APPLICATION_DISPLAY_TEMPLATE_TYPES =
+		new Object[][] {
+			{"asset_category", AssetCategory.class},
+			{"asset_entry", AssetEntry.class}, {"asset_tag", AssetTag.class},
+			{"blogs_entry", BlogsEntry.class},
+			{"document_library",FileEntry.class}, {"site_map", LayoutSet.class},
+			{"wiki_page", WikiPage.class}
+		};
+
+	private static final String _DDL_STRUCTURE_DIR_NAME =
+		"/templates/dynamic_data_list/structure";
+
+	private static final String _DDL_STRUCTURE_DISPLAY_TEMPLATE_DIR_NAME =
+		"/templates/dynamic_data_list/display_template";
+
+	private static final String _DDL_STRUCTURE_FORM_TEMPLATE_DIR_NAME =
+		"/templates/dynamic_data_list/form_template";
+
+	private static final String _DL_DOCUMENTS_DIR_NAME =
+		"/document_library/documents/";
+
+	private static final String _JOURNAL_ARTICLES_DIR_NAME =
+		"/journal/articles/";
+
+	private static final String _JOURNAL_DDM_STRUCTURES_DIR_NAME =
+		"/journal/structures/";
+
+	private static final String _JOURNAL_DDM_TEMPLATES_DIR_NAME =
+		"/journal/templates/";
+
+	private static final String _LAYOUT_PROTOTYPE_DIR_NAME = "/templates/page";
+
+	private static Log _log = LogFactoryUtil.getLog(FileSystemImporter.class);
+
+	private Map<String, JSONObject> _assetJSONObjectMap =
+		new HashMap<String, JSONObject>();
+	private Set<String> _ddmStructures = new HashSet<String>();
+	private String _defaultLayoutTemplateId;
+	private Map<String, FileEntry> _fileEntries =
+		new HashMap<String, FileEntry>();
+	private Pattern _fileEntryPattern = Pattern.compile(
+		"\\[\\$FILE=([^\\$]+)\\$\\]");
+	private Map<String, Set<Long>> _primaryKeys =
+		new HashMap<String, Set<Long>>();
+	private File _resourcesDir;
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/Importer.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/Importer.java
new file mode 100644
index 0000000..8719c3c
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/Importer.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Brian Wing Shun Chan
+ * @author Raymond Augé
+ */
+public interface Importer {
+
+	public void afterPropertiesSet() throws Exception;
+
+	public long getGroupId();
+
+	public String getTargetClassName();
+
+	public long getTargetClassPK();
+
+	public void importResources() throws Exception;
+
+	public boolean isCompanyGroup() throws Exception;
+
+	public boolean isDeveloperModeEnabled();
+
+	public boolean isExisting();
+
+	public void setAppendVersion(boolean appendVersion);
+
+	public void setCompanyId(long companyId);
+
+	public void setDeveloperModeEnabled(boolean developerModeEnabled);
+
+	public void setGroupId(long groupId);
+
+	public void setResourcesDir(String resourcesDir);
+
+	public void setServletContext(ServletContext servletContext);
+
+	public void setServletContextName(String servletContextName);
+
+	public void setTargetClassName(String className);
+
+	public void setTargetValue(String targetValue);
+
+	public void setUpdateModeEnabled(boolean updateModeEnabled);
+
+	public void setVersion(String version);
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ImporterException.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ImporterException.java
new file mode 100644
index 0000000..ba2bd25
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ImporterException.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import com.liferay.portal.kernel.exception.PortalException;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class ImporterException extends PortalException {
+
+	public ImporterException() {
+		super();
+	}
+
+	public ImporterException(String msg) {
+		super(msg);
+	}
+
+	public ImporterException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+
+	public ImporterException(Throwable cause) {
+		super(cause);
+	}
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ImporterFactory.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ImporterFactory.java
new file mode 100644
index 0000000..f0d0511
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ImporterFactory.java
@@ -0,0 +1,177 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import com.liferay.portal.kernel.deploy.DeployManagerUtil;
+import com.liferay.portal.kernel.plugin.PluginPackage;
+import com.liferay.portal.kernel.util.TextFormatter;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.Group;
+import com.liferay.portal.service.GroupLocalServiceUtil;
+
+import java.net.URL;
+import java.net.URLConnection;
+
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Michael C. Han
+ */
+public class ImporterFactory {
+
+	public static final String RESOURCES_DIR =
+		"/WEB-INF/classes/resources-importer/";
+
+	public static final String TEMPLATES_DIR =
+		"/WEB-INF/classes/templates-importer/";
+
+	public static ImporterFactory getInstance() {
+		return _instance;
+	}
+
+	public Importer createImporter(
+			long companyId, ServletContext servletContext,
+			PluginPackageProperties pluginPackageProperties)
+		throws Exception {
+
+		String resourcesDir = pluginPackageProperties.getResourcesDir();
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			RESOURCES_DIR);
+		Set<String> templatePaths = servletContext.getResourcePaths(
+			TEMPLATES_DIR);
+
+		URL privateLARURL = null;
+		URL publicLARURL = servletContext.getResource(
+			RESOURCES_DIR.concat("archive.lar"));
+
+		if (publicLARURL == null) {
+			privateLARURL = servletContext.getResource(
+				RESOURCES_DIR.concat("private.lar"));
+
+			publicLARURL = servletContext.getResource(
+				RESOURCES_DIR.concat("public.lar"));
+		}
+
+		Importer importer = null;
+
+		if ((privateLARURL != null) || (publicLARURL != null)) {
+			LARImporter larImporter = getLARImporter();
+
+			URLConnection privateLARURLConnection = null;
+
+			if (privateLARURL != null) {
+				privateLARURLConnection = privateLARURL.openConnection();
+
+				larImporter.setPrivateLARInputStream(
+					privateLARURLConnection.getInputStream());
+			}
+
+			URLConnection publicLARURLConnection = null;
+
+			if (publicLARURL != null) {
+				publicLARURLConnection = publicLARURL.openConnection();
+
+				larImporter.setPublicLARInputStream(
+					publicLARURLConnection.getInputStream());
+			}
+
+			importer = larImporter;
+		}
+		else if ((resourcePaths != null) && !resourcePaths.isEmpty()) {
+			importer = getResourceImporter();
+
+			importer.setResourcesDir(RESOURCES_DIR);
+		}
+		else if ((templatePaths != null) && !templatePaths.isEmpty()) {
+			importer = getResourceImporter();
+
+			Group group = GroupLocalServiceUtil.getCompanyGroup(companyId);
+
+			importer.setGroupId(group.getGroupId());
+			importer.setResourcesDir(TEMPLATES_DIR);
+		}
+		else if (Validator.isNotNull(resourcesDir)) {
+			importer = getFileSystemImporter();
+
+			importer.setResourcesDir(resourcesDir);
+		}
+
+		if (importer == null) {
+			throw new ImporterException("No valid importer found");
+		}
+
+		configureImporter(
+			companyId, importer, servletContext, pluginPackageProperties);
+
+		return importer;
+	}
+
+	protected void configureImporter(
+			long companyId, Importer importer, ServletContext servletContext,
+			PluginPackageProperties pluginPackageProperties)
+		throws Exception {
+
+		importer.setAppendVersion(pluginPackageProperties.isAppendVersion());
+
+		importer.setCompanyId(companyId);
+
+		importer.setDeveloperModeEnabled(
+			pluginPackageProperties.isDeveloperModeEnabled());
+
+		importer.setServletContext(servletContext);
+		importer.setServletContextName(servletContext.getServletContextName());
+
+		importer.setTargetClassName(
+			pluginPackageProperties.getTargetClassName());
+
+		String targetValue = pluginPackageProperties.getTargetValue();
+
+		if (Validator.isNull(targetValue)) {
+			targetValue = TextFormatter.format(
+				servletContext.getServletContextName(), TextFormatter.J);
+		}
+
+		importer.setTargetValue(targetValue);
+
+		importer.setUpdateModeEnabled(
+			pluginPackageProperties.isUpdateModeEnabled());
+
+		PluginPackage pluginPackage =
+			DeployManagerUtil.getInstalledPluginPackage(
+				servletContext.getServletContextName());
+
+		importer.setVersion(pluginPackage.getVersion());
+
+		importer.afterPropertiesSet();
+	}
+
+	protected FileSystemImporter getFileSystemImporter() {
+		return new FileSystemImporter();
+	}
+
+	protected LARImporter getLARImporter() {
+		return new LARImporter();
+	}
+
+	protected ResourceImporter getResourceImporter() {
+		return new ResourceImporter();
+	}
+
+	private static ImporterFactory _instance = new ImporterFactory();
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/LARImporter.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/LARImporter.java
new file mode 100644
index 0000000..1ec4d2e
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/LARImporter.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import com.liferay.portal.kernel.lar.PortletDataHandlerKeys;
+import com.liferay.portal.kernel.lar.UserIdStrategy;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.service.LayoutLocalServiceUtil;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Ryan Park
+ * @author Raymond Augé
+ */
+public class LARImporter extends BaseImporter {
+
+
+	public void importResources() throws Exception {
+		if (_privateLARInputStream != null) {
+			LayoutLocalServiceUtil.importLayouts(
+				userId, groupId, true, getParameterMap(),
+				_privateLARInputStream);
+		}
+
+		if (_publicLARInputStream != null) {
+			LayoutLocalServiceUtil.importLayouts(
+				userId, groupId, false, getParameterMap(),
+				_publicLARInputStream);
+		}
+	}
+
+	public void setLARFile(File file) {
+		try {
+			setPublicLARInputStream(
+				new BufferedInputStream(new FileInputStream(file)));
+		}
+		catch (FileNotFoundException fnfe) {
+			_log.error(fnfe, fnfe);
+		}
+	}
+
+	public void setLARInputStream(InputStream inputStream) {
+		setPublicLARInputStream(inputStream);
+	}
+
+	public void setPrivateLARInputStream(InputStream privateLARInputStream) {
+		_privateLARInputStream = privateLARInputStream;
+	}
+
+	public void setPublicLARInputStream(InputStream publicLARInputStream) {
+		_publicLARInputStream = publicLARInputStream;
+	}
+
+	protected Map<String, String[]> getParameterMap() {
+		Map<String, String[]> parameters = new HashMap<String, String[]>();
+
+		parameters.put(
+			PortletDataHandlerKeys.DELETE_MISSING_LAYOUTS,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.DELETE_PORTLET_DATA,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.LAYOUT_SET_PROTOTYPE_LINK_ENABLED,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.LAYOUT_SET_SETTINGS,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.LAYOUTS_IMPORT_MODE,
+			new String[] {
+				PortletDataHandlerKeys.
+					LAYOUTS_IMPORT_MODE_MERGE_BY_LAYOUT_UUID
+			});
+		parameters.put(
+			PortletDataHandlerKeys.LOGO,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PERMISSIONS,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLET_ARCHIVED_SETUPS,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLET_CONFIGURATION,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLET_CONFIGURATION_ALL,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLET_DATA,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLET_DATA_ALL,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLET_SETUP_ALL,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLET_USER_PREFERENCES,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.PORTLETS_MERGE_MODE,
+			new String[] {PortletDataHandlerKeys.PORTLETS_MERGE_MODE_REPLACE});
+		parameters.put(
+			PortletDataHandlerKeys.THEME_REFERENCE,
+			new String[] {Boolean.TRUE.toString()});
+		parameters.put(
+			PortletDataHandlerKeys.USER_ID_STRATEGY,
+			new String[] {UserIdStrategy.CURRENT_USER_ID});
+
+		return parameters;
+	}
+
+	private static Log _log = LogFactoryUtil.getLog(LARImporter.class);
+
+	private InputStream _privateLARInputStream;
+	private InputStream _publicLARInputStream;
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/PluginPackageProperties.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/PluginPackageProperties.java
new file mode 100644
index 0000000..c934c3d
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/PluginPackageProperties.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.PortalRunMode;
+import com.liferay.portal.kernel.util.PropertiesUtil;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.model.LayoutSetPrototype;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.Properties;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Michael C. Han
+ */
+public class PluginPackageProperties {
+
+	public PluginPackageProperties(ServletContext servletContext)
+		throws IOException {
+
+		InputStream inputStream = servletContext.getResourceAsStream(
+			"/WEB-INF/liferay-plugin-package.properties");
+
+		if (inputStream == null) {
+			return;
+		}
+
+		String propertiesString = StringUtil.read(inputStream);
+
+		String contextPath = servletContext.getRealPath(StringPool.SLASH);
+
+		contextPath = StringUtil.replace(
+			contextPath, StringPool.BACK_SLASH, StringPool.SLASH);
+
+		propertiesString = propertiesString.replace(
+			"${context.path}", contextPath);
+
+		PropertiesUtil.load(_properties, propertiesString);
+	}
+
+	public String getProperty(String key) {
+		return _properties.getProperty(key);
+	}
+
+	public String getResourcesDir() {
+		return _properties.getProperty("resources-importer-external-dir");
+	}
+
+	public String getTargetClassName() {
+		return _properties.getProperty(
+			"resources-importer-target-class-name",
+			LayoutSetPrototype.class.getName());
+	}
+
+	public String getTargetValue() {
+		return _properties.getProperty("resources-importer-target-value");
+	}
+
+	public boolean isAppendVersion() {
+		return GetterUtil.getBoolean(
+			_properties.getProperty("resources-importer-append-version"), true);
+	}
+
+	public boolean isDeveloperModeEnabled() {
+		return GetterUtil.getBoolean(
+			_properties.getProperty(
+				"resources-importer-developer-mode-enabled")) ||
+			PortalRunMode.isTestMode();
+	}
+
+	public boolean isUpdateModeEnabled() {
+		return GetterUtil.getBoolean(
+			_properties.getProperty("resources-importer-update-mode-enabled"));
+	}
+
+	private Properties _properties = new Properties();
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ResourceImporter.java b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ResourceImporter.java
new file mode 100644
index 0000000..f602ca5
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/src/com/liferay/resourcesimporter/util/ResourceImporter.java
@@ -0,0 +1,378 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.resourcesimporter.util;
+
+import com.liferay.portal.kernel.util.FileUtil;
+import com.liferay.portal.kernel.util.StringBundler;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.util.PortalUtil;
+import com.liferay.portlet.documentlibrary.model.DLFolderConstants;
+import com.liferay.portlet.dynamicdatalists.model.DDLRecordSet;
+import com.liferay.portlet.dynamicdatamapping.model.DDMStructure;
+import com.liferay.portlet.dynamicdatamapping.model.DDMTemplateConstants;
+import com.liferay.portlet.dynamicdatamapping.service.DDMStructureLocalServiceUtil;
+
+import java.io.File;
+import java.io.InputStream;
+
+import java.net.URL;
+import java.net.URLConnection;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Raymond Augé
+ * @author Ryan Park
+ */
+public class ResourceImporter extends FileSystemImporter {
+
+
+	public void importResources() throws Exception {
+		doImportResources();
+	}
+
+
+	protected void addApplicationDisplayTemplate(
+			String parentDirName, String dirName, long classNameId)
+		throws Exception {
+
+		StringBundler sb = new StringBundler(4);
+
+		sb.append(resourcesDir);
+		sb.append(parentDirName);
+		sb.append("/");
+		sb.append(dirName);
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			sb.toString());
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			String script = StringUtil.read(urlConnection.getInputStream());
+
+			if (Validator.isNull(script)) {
+				continue;
+			}
+
+			File file = new File(resourcePath);
+
+			addApplicationDisplayTemplate(script, file, classNameId);
+		}
+	}
+
+
+	protected void addDDLDisplayTemplates(
+			String ddmStructureKey, String dirName, String fileName)
+		throws Exception {
+
+		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.getStructure(
+			groupId, PortalUtil.getClassNameId(DDLRecordSet.class),
+			ddmStructureKey);
+
+		StringBundler sb = new StringBundler(4);
+
+		sb.append(resourcesDir);
+		sb.append(dirName);
+		sb.append(StringPool.SLASH);
+		sb.append(fileName);
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			sb.toString());
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			String script = StringUtil.read(urlConnection.getInputStream());
+
+			if (Validator.isNull(script)) {
+				return;
+			}
+
+			addDDMTemplate(
+				groupId, ddmStructure.getStructureId(), resourcePath,
+				getDDMTemplateLanguage(resourcePath), script,
+				DDMTemplateConstants.TEMPLATE_TYPE_DISPLAY, StringPool.BLANK);
+		}
+	}
+
+
+	protected void addDDLFormTemplates(
+			String ddmStructureKey, String dirName, String fileName)
+		throws Exception {
+
+		DDMStructure ddmStructure = DDMStructureLocalServiceUtil.getStructure(
+			groupId, PortalUtil.getClassNameId(DDLRecordSet.class),
+			ddmStructureKey);
+
+		StringBundler sb = new StringBundler(4);
+
+		sb.append(resourcesDir);
+		sb.append(dirName);
+		sb.append(StringPool.SLASH);
+		sb.append(fileName);
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			sb.toString());
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			String script = StringUtil.read(urlConnection.getInputStream());
+
+			if (Validator.isNull(script)) {
+				return;
+			}
+
+			addDDMTemplate(
+				groupId, ddmStructure.getStructureId(), resourcePath, "xsd",
+				script, DDMTemplateConstants.TEMPLATE_TYPE_FORM,
+				DDMTemplateConstants.TEMPLATE_MODE_CREATE);
+		}
+	}
+
+
+	protected void addDDLStructures(String dirName) throws Exception {
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			resourcesDir.concat(dirName));
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			File file = new File(resourcePath);
+
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			addDDMStructures(
+				FileUtil.stripExtension(file.getName()),
+				urlConnection.getInputStream());
+		}
+	}
+
+
+	protected void addDDMStructures(String parentStructureId, String dirName)
+		throws Exception {
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			resourcesDir.concat(dirName));
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			if (resourcePath.endsWith(StringPool.SLASH)) {
+				continue;
+			}
+
+			String name = FileUtil.getShortFileName(resourcePath);
+
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			addDDMStructures(
+				parentStructureId, name, urlConnection.getInputStream());
+		}
+	}
+
+
+	protected void addDDMTemplates(String ddmStructureKey, String dirName)
+		throws Exception {
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			resourcesDir.concat(dirName));
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			if (resourcePath.endsWith(StringPool.SLASH)) {
+				continue;
+			}
+
+			String name = FileUtil.getShortFileName(resourcePath);
+
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			addDDMTemplates(
+				ddmStructureKey, name, urlConnection.getInputStream());
+		}
+	}
+
+
+	protected void addDLFileEntries(String dirName) throws Exception {
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			resourcesDir.concat(dirName));
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			if (resourcePath.endsWith(StringPool.SLASH)) {
+				addDLFolder(
+					DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, resourcePath);
+			}
+			else {
+				addDLFileEntry(resourcePath);
+			}
+		}
+	}
+
+	protected void addDLFileEntry(String resourcePath) throws Exception {
+		Long parentFolderId = _folderIds.get(
+			FileUtil.getPath(resourcePath) + StringPool.SLASH);
+
+		if (parentFolderId == null) {
+			parentFolderId = 0L;
+		}
+
+		URL url = servletContext.getResource(resourcePath);
+
+		URLConnection urlConnection = url.openConnection();
+
+		addDLFileEntry(
+			parentFolderId, FileUtil.getShortFileName(resourcePath),
+			urlConnection.getInputStream(), urlConnection.getContentLength());
+	}
+
+
+	protected long addDLFolder(long parentFolderId, String resourcePath)
+		throws Exception {
+
+		long folderId = super.addDLFolder(
+			parentFolderId,
+			FileUtil.getShortFileName(FileUtil.getPath(resourcePath)));
+
+		_folderIds.put(resourcePath, folderId);
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			resourcePath);
+
+		if ((resourcePaths == null) || resourcePaths.isEmpty()) {
+			return folderId;
+		}
+
+		for (String curResourcePath : resourcePaths) {
+			if (curResourcePath.endsWith(StringPool.SLASH)) {
+				addDLFolder(folderId, curResourcePath);
+			}
+			else {
+				addDLFileEntry(curResourcePath);
+			}
+		}
+
+		return folderId;
+	}
+
+
+	protected void addJournalArticles(
+			String ddmStructureKey, String ddmTemplateKey, String dirName)
+		throws Exception {
+
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			resourcesDir.concat(dirName));
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			if (resourcePath.endsWith(StringPool.SLASH)) {
+				continue;
+			}
+
+			String name = FileUtil.getShortFileName(resourcePath);
+
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			addJournalArticles(
+				ddmStructureKey, ddmTemplateKey, name,
+				urlConnection.getInputStream());
+		}
+	}
+
+
+	protected void addLayoutPrototype(String dirName) throws Exception {
+		Set<String> resourcePaths = servletContext.getResourcePaths(
+			resourcesDir.concat(dirName));
+
+		if (resourcePaths == null) {
+			return;
+		}
+
+		for (String resourcePath : resourcePaths) {
+			String extension = FileUtil.getExtension(resourcePath);
+
+			if (!extension.equals("json")) {
+				return;
+			}
+
+			URL url = servletContext.getResource(resourcePath);
+
+			URLConnection urlConnection = url.openConnection();
+
+			addLayoutPrototype(urlConnection.getInputStream());
+		}
+	}
+
+
+	protected InputStream getInputStream(String fileName) throws Exception {
+		URL url = servletContext.getResource(resourcesDir.concat(fileName));
+
+		if (url == null) {
+			return null;
+		}
+
+		URLConnection urlConnection = url.openConnection();
+
+		return urlConnection.getInputStream();
+	}
+
+	private Map<String, Long> _folderIds = new HashMap<String, Long>();
+
+}
\ No newline at end of file
diff --git a/webs/resources-importer-web/docroot/WEB-INF/web.xml b/webs/resources-importer-web/docroot/WEB-INF/web.xml
new file mode 100644
index 0000000..d8dae2a
--- /dev/null
+++ b/webs/resources-importer-web/docroot/WEB-INF/web.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	<context-param>
+		<param-name>portalContextConfigLocation</param-name>
+		<param-value>/WEB-INF/classes/META-INF/messaging-spring.xml</param-value>
+	</context-param>
+</web-app>
\ No newline at end of file