bluesoft-rnd · bridderb · Jul 9, 2015 · Jul 10, 2015 · Jul 10, 2015 · Jul 10, 2015
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
-.*
-target
-rebel.xml
-*~
-*.out
+.*
+target
+rebel.xml
+*~
+*.out
+/bin/
diff --git a/README.md b/README.md
@@ -1,10 +1,6 @@
-# Aperte Reports #
-## News ##
-
-*May 13, 2013: Version 2.4 released. *
-
-Check [ReleaseNotes] for changelog or proceed directly to [http://code.google.com/p/aperte-reports/downloads/list download page].
+# Aperte Reports for Liferay 6.2#
 
+#### Aperte Reports now works with Liferay 6.2! ####
 
 
 
@@ -13,6 +9,7 @@ Check [ReleaseNotes] for changelog or proceed directly to [http://code.google.co
 <img src="http://wiki.aperte-reports.googlecode.com/git/img/image1.png" align="right"/>
 ### Reporting easier than ever! ###
 
+
 Effective reporting is crucial in monitoring the operation of information systems and work of every company. Quick access to key information provided in a clear has significant impact on accuracy and speed of the decision-making.
 
 
@@ -34,13 +31,11 @@ Application Portlet technology allows you to place graphical components on an or
 All GUI elements are created as a separate components using *Vaadin* framework, allowing easy and quick use of them in any applications based on this framework or even running inside of run Java servlet container. Applications written in other technologies can use a special mechanism to generate and return reports in desired format. Such mechanism can also be used to generate application-specific documents.
 
 
-## How to start? ##
+### Aperte Reports Wiki ###
+https://github.com/bluesoft-rnd/aperte-reports/wiki
 
-  # [Installation Install] the application
-  # [Tutorial Learn] how to use it
-
-... and use it!
 
 ----
+Migration to Liferay 6.2 was supported by <a href="http://itsd-consulting.de">ITSD Consulting GmbH</a>.
 
-Work in this project is sponsored by <a href="http://portal.bluesoft.net.pl/">!BlueSoft Sp. z o.o.</a> - Polish software solution provider. Aperte Reports was known before as <a href="http://code.google.com/p/vries">Vries Reporting Dashboard</a>.
+The Aperte Reports Project is sponsored by <a href="http://portal.bluesoft.net.pl/">!BlueSoft Sp. z o.o.</a> - Polish software solution provider. Aperte Reports was known before as <a href="http://code.google.com/p/vries">Vries Reporting Dashboard</a>.
diff --git a/WebServiceDataAdapter.jar b/WebServiceDataAdapter.jar
diff --git a/aperte-reports-ui/pom.xml b/aperte-reports-ui/pom.xml
@@ -1,117 +1,175 @@
-<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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>apertereports</artifactId>
-		<groupId>org.apertereports</groupId>
-		<version>2.5-SNAPSHOT</version>
-	</parent>
-	<artifactId>aperte-reports-ui</artifactId>
-	<packaging>war</packaging>
-	<name>Portlets for uploading and generating reports</name>
-	<repositories>
-		<repository>
-			<id>vaadin-addons</id>
-			<url>http://maven.vaadin.com/vaadin-addons</url>
-		</repository>
-	</repositories>
-	<dependencies>
-		<!-- dependencies outside official maven repositories -->
-		<dependency>
-			<groupId>org.vaadin.addons</groupId>
-			<artifactId>activelink</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.vaadin.addons</groupId>
-			<artifactId>toolkit-productivity-tools</artifactId>
-			<version>1.2.0</version>
-		</dependency>
-		<!-- other dependencies -->
-		<dependency>
-			<groupId>com.liferay.portal</groupId>
-			<artifactId>portal-service</artifactId>
-			<version>6.0.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.portlet</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apertereports</groupId>
-			<artifactId>backbone</artifactId>
-			<version>2.5-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>com.vaadin</groupId>
-			<artifactId>vaadin</artifactId>
-			<version>6.7.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jruby</groupId>
-			<artifactId>jruby-complete</artifactId>
-			<version>1.5.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-all</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.gwt</groupId>
-			<artifactId>gwt-user</artifactId>
-			<version>2.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.liferay.portal</groupId>
-			<artifactId>portal-impl</artifactId>
-			<version>6.0.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> 
-				<version>2.1.0</version> <executions> <execution> <configuration> <webappDirectory>${project.build.directory}/${project.build.finalName}/VAADIN/widgetsets 
-				</webappDirectory> <extraJvmArgs>-Xmx512M -Xss1024k</extraJvmArgs> <soyc>false</soyc> 
-				</configuration> <goals> <goal>resources</goal> <goal>compile</goal> </goals> 
-				</execution> </executions> </plugin> -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>apertereports</artifactId>
+		<groupId>org.apertereports</groupId>
+		<version>2.5-SNAPSHOT</version>
+	</parent>
+	<artifactId>aperte-reports-portlet</artifactId>
+	<packaging>war</packaging>
+	<name>Portlets for uploading and generating reports</name>
+
+
+	<repositories>
+		<repository>
+			<id>liferay-releases</id>
+			<url>https://repository.liferay.com/nexus/content/repositories/liferay-releases-ce/</url>
+		</repository>
+		<repository>
+			<id>vaadin-addons</id>
+			<url>http://maven.vaadin.com/vaadin-addons</url>
+		</repository>
+		<repository>
+			<id>vaadin-snapshots</id>
+			<url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<dependencies>
+		<!-- dependencies outside official maven repositories -->
+		<dependency>
+			<groupId>org.vaadin.addons</groupId>
+			<artifactId>activelink</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.vaadin.addons</groupId>
+			<artifactId>toolkit-productivity-tools</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+		<!-- other dependencies -->
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>portal-service</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apertereports</groupId>
+			<artifactId>backbone</artifactId>
+			<version>2.5-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>stax</groupId>
+					<artifactId>stax-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin</artifactId>
+			<version>6.8.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jruby</groupId>
+			<artifactId>jruby-complete</artifactId>
+			<version>1.5.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.gwt</groupId>
+			<artifactId>gwt-user</artifactId>
+			<version>2.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>portal-impl</artifactId>
+			<version>6.2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>util-java</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.primefaces</groupId>
+			<artifactId>primefaces</artifactId>
+			<version>11.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.faces</groupId>
+			<artifactId>javax.faces-api</artifactId>
+			<version>2.2</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish</groupId>
+			<artifactId>javax.faces</artifactId>
+			<version>2.2.19</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.faces</groupId>
+			<artifactId>com.liferay.faces.bridge.ext</artifactId>
+			<version>3.0.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.faces</groupId>
+			<artifactId>com.liferay.faces.bridge.impl</artifactId>
+			<version>4.1.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.faces.patches</groupId>
+			<artifactId>com.liferay.faces.lsv.485.patch</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>