Merge remote-tracking branch 'origin/master'

Author: donarus

node-deploy/pom.xml

@@ -12,10 +12,6 @@
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
-	<properties>
-		<distDirName>dist</distDirName>
-	</properties>
-
 	<dependencies>
 		<!-- BEEN DEPENDENCIES -->
 		<dependency>
@@ -33,7 +29,7 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>${maven-assembly-plugin.version}</version>
 				<configuration>
-					<finalName>${distDirName}/bin/been</finalName>
+					<finalName>been</finalName>
 					<archive>
 						<manifest>
 							<mainClass>cz.cuni.mff.d3s.been.node.Runner</mainClass>

pom.xml

@@ -54,7 +54,7 @@
 		<maven-plugin-plugin.version>3.2</maven-plugin-plugin.version>
 		<maven-site-plugin.version>3.2</maven-site-plugin.version>
 		<maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
-                <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
+		<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
 		<maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
 		<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
 		<versions-maven-plugin.version>2.0</versions-maven-plugin.version>
@@ -71,6 +71,7 @@
 
 		<!-- ENCODING -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
 	</properties>
 
 	<dependencies>
@@ -128,7 +129,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>${maven-javadoc-plugin.version}</version>
-				<configuration>					
+				<configuration>
 					<show>package</show>
 				</configuration>
 			</plugin>
@@ -137,8 +138,9 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>${maven-javadoc-plugin.version}</version>
-				<configuration>					
+				<configuration>
 					<show>package</show>
+					<excludePackageNames>cz.cuni.mff.d3s.been.web:cz.cuni.mff.d3s.been.web.*</excludePackageNames>
 				</configuration>
 				<executions>
 					<execution>

web-interface/pom.xml

@@ -159,9 +159,9 @@
 	</properties>
 
 	<build>
+		<finalName>been-wi</finalName>
 
 		<plugins>
-
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>