LPS-25761 Source formatting

matethurzo · Mar 2, 2012 · 3598aab · 3598aab
1 parent 5a22923
commit 3598aab
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 50 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -296,33 +296,6 @@ Please set the environment variable ANT_OPTS to the recommended value of
 		</then>
 	</if>
 
-	<target name="aggregate-cobertura-reports">
-		<cobertura-merge datafile="${sonar.cobertura.reportPath}">
-			<fileset dir="${project.dir}">
-				<include name="**/cobertura.ser"/>
-			</fileset>
-		</cobertura-merge>
-
-		<cobertura-report
-			datafile="${sonar.cobertura.reportPath}"
-			destdir="${sonar.cobertura.report.folder}"
-			format="${junit.cobertura.report.format}"
-		>
-			<fileset dir="${project.dir}/portal-impl/src">
-				<include name="**/*.java" />
-			</fileset>
-			<fileset dir="${project.dir}/portal-service/src">
-				<include name="**/*.java" />
-			</fileset>
-			<fileset dir="${project.dir}/util-java/src">
-				<include name="**/*.java" />
-			</fileset>
-			<fileset dir="${project.dir}/util-taglib/src">
-				<include name="**/*.java" />
-			</fileset>
-		</cobertura-report>
-	</target>
-
 	<target name="compile">
 	</target>
 
@@ -453,12 +426,31 @@ Please set the environment variable ANT_OPTS to the recommended value of
 		<setproxy proxyhost="${setproxy.proxy.host}" proxyport="${setproxy.proxy.port}" />
 	</target>
 
-	<taskdef uri="antlib:org.sonar.ant" resource="org/sonar/ant/antlib.xml">
-		<classpath path="lib/development/sonar-ant-task.jar" />
-	</taskdef>
-
 	<target name="sonar">
-		<antcall target="aggregate-cobertura-reports" />
+		<cobertura-merge datafile="${sonar.cobertura.reportPath}">
+			<fileset dir="${project.dir}">
+				<include name="**/cobertura.ser" />
+			</fileset>
+		</cobertura-merge>
+
+		<cobertura-report
+			datafile="${sonar.cobertura.reportPath}"
+			destdir="${sonar.cobertura.report.folder}"
+			format="${junit.cobertura.report.format}"
+		>
+			<fileset dir="${project.dir}/portal-impl/src">
+				<include name="**/*.java" />
+			</fileset>
+			<fileset dir="${project.dir}/portal-service/src">
+				<include name="**/*.java" />
+			</fileset>
+			<fileset dir="${project.dir}/util-java/src">
+				<include name="**/*.java" />
+			</fileset>
+			<fileset dir="${project.dir}/util-taglib/src">
+				<include name="**/*.java" />
+			</fileset>
+		</cobertura-report>
 
 		<copy todir="${sonar.surefire.reportsPath}" failonerror="false">
 			<fileset dir="${project.dir}/portal-impl/test-results">
@@ -475,7 +467,15 @@ Please set the environment variable ANT_OPTS to the recommended value of
 			</fileset>
 		</copy>
 
-		<sonar:sonar key="com.liferay:liferay-portal" version="0.1-SNAPSHOT" xmlns:sonar="antlib:org.sonar.ant" />
+		<taskdef resource="org/sonar/ant/antlib.xml" uri="antlib:org.sonar.ant">
+			<classpath path="lib/development/sonar-ant-task.jar" />
+		</taskdef>
+
+		<sonar:sonar
+			key="com.liferay:liferay-portal"
+			version="0.1-SNAPSHOT"
+			xmlns:sonar="antlib:org.sonar.ant"
+		/>
 
 		<delete dir="${sonar.cobertura.report.folder}" />
 		<delete dir="${sonar.surefire.reportsPath}" />

diff --git a/build.properties b/build.properties
@@ -29,7 +29,7 @@
 ## Classpath
 ##
 
-    classpath=${env.JAVA_HOME}/lib/tools.jar;${project.dir}/classes;${project.dir}/counter-impl/classes;${project.dir}/documentlibrary-impl/classes;${project.dir}/jdbc/classes;${project.dir}/lock-impl/classes;${project.dir}/mail-impl/classes;${project.dir}/portal-client/portal-client.jar;${project.dir}/portal-impl/classes;${project.dir}/portal-impl/test-classes/integration;${project.dir}/portal-impl/test-classes/unit;${project.dir}/portal-service/classes;${project.dir}/portal-service/test-classes/integration;${project.dir}/portal-service/test-classes/unit;${project.dir}/portal-web/docroot/WEB-INF/classes;${project.dir}/portal-web/test-classes;${project.dir}/util-bridges/classes;${project.dir}/util-java/classes;${project.dir}/util-java/test-classes/integration;${project.dir}/util-java/test-classes/unit;${project.dir}/util-taglib/classes
+    classpath=${env.JAVA_HOME}/lib/tools.jar;${project.dir}/classes;${project.dir}/portal-impl/classes;${project.dir}/portal-impl/test-classes/integration;${project.dir}/portal-impl/test-classes/unit;${project.dir}/portal-service/classes;${project.dir}/portal-service/test-classes/integration;${project.dir}/portal-service/test-classes/unit;${project.dir}/portal-web/docroot/WEB-INF/classes;${project.dir}/portal-web/test-classes;${project.dir}/util-bridges/classes;${project.dir}/util-bridges/test-classes/integration;${project.dir}/util-bridges/test-classes/unit;${project.dir}/util-java/classes;${project.dir}/util-java/test-classes/integration;${project.dir}/util-java/test-classes/unit;${project.dir}/util-taglib/classes;${project.dir}/util-taglib/test-classes/integration;${project.dir}/util-taglib/test-classes/unit
 
     classpath.jsp=${project.dir}/portal-web/classes/common
 
@@ -92,31 +92,23 @@
 ## Sonar
 ##
 
-    # Sonar database related properties
-
-    sonar.host.url=http://localhost:9000
-    sonar.jdbc.url=jdbc:mysql://localhost:3306/sonar?useUnicode=true&amp;characterEncoding=utf8
-    sonar.jdbc.driverClassName=com.mysql.jdbc.Driver
-    sonar.jdbc.username=liferay
-    sonar.jdbc.password=liferay
-
-    # Sonar mandatory properties
-
-    sonar.sources=${project.dir}/portal-service/src, ${project.dir}/portal-impl/src, ${project.dir}/util-bridges/src, ${project.dir}/util-java/src, ${project.dir}/util-taglib/src
-
-    # Sonar optional properties
-
-    sonar.binaries=${project.dir}/portal-service/classes, ${project.dir}/portal-impl/classes, ${project.dir}/util-bridges/classes, ${project.dir}/util-java/classes, ${project.dir}/util-taglib/classes
+    sonar.binaries=${project.dir}/portal-impl/classes,${project.dir}/portal-service/classes,${project.dir}/util-bridges/classes,${project.dir}/util-java/classes,${project.dir}/util-taglib/classes
     sonar.cobertura.report.folder=${project.dir}/test-coverage
     sonar.cobertura.reportPath=${sonar.cobertura.report.folder}/coverage.${junit.cobertura.report.format}
     sonar.dynamicAnalysis=reuseReports
     sonar.exclusions=java/*,javax/*
+    sonar.host.url=http://localhost:9000
     sonar.java.source=1.5
+    sonar.jdbc.driverClassName=com.mysql.jdbc.Driver
+    sonar.jdbc.url=jdbc:mysql://localhost:3306/sonar?useUnicode=true&amp;characterEncoding=utf8
+    sonar.jdbc.password=liferay
+    sonar.jdbc.username=liferay
     sonar.libraries=${project.dir}/lib/development/mysql.jar
     sonar.projectName=Liferay Portal
     sonar.projectVersion=6.2.X
+    sonar.sources=${project.dir}/portal-impl/src,${project.dir}/portal-service/src,${project.dir}/util-bridges/src,${project.dir}/util-java/src,${project.dir}/util-taglib/src
     sonar.surefire.reportsPath=${project.dir}/test-results/*.xml
-    sonar.tests=${project.dir}/portal-service/test/unit, ${project.dir}/portal-service/test/integration, ${project.dir}/portal-impl/test/unit, ${project.dir}/portal-impl/test/integration, ${project.dir}/util-bridges/test/unit, ${project.dir}/util-bridges/test/integration, ${project.dir}/util-java/test/unit, ${project.dir}/util-java/test/integration, ${project.dir}/util-taglib/test/unit, ${project.dir}/util-taglib/test/integration
+    sonar.tests=${project.dir}/portal-impl/test/integration,${project.dir}/portal-impl/test/unit,${project.dir}/portal-service/test/integration,${project.dir}/portal-service/test/unit,${project.dir}/util-bridges/test/integration,${project.dir}/util-bridges/test/unit,${project.dir}/util-java/test/integration,${project.dir}/util-java/test/unit,${project.dir}/util-taglib/test/integration,${project.dir}/util-taglib/test/unit
 
 ##
 ## Source Formatter