diff options
| -rw-r--r-- | README.md | 14 | ||||
| -rwxr-xr-x | server/sonar-web/h2-start.sh | 3 | ||||
| -rwxr-xr-x | server/sonar-web/mysql-start.sh | 3 | ||||
| -rw-r--r-- | server/sonar-web/pom.xml | 279 | ||||
| -rwxr-xr-x | server/sonar-web/postgresql-start.sh | 3 | ||||
| -rw-r--r-- | server/sonar-web/src/dev/sonar.properties | 1 |
6 files changed, 0 insertions, 303 deletions
diff --git a/README.md b/README.md index 9a0fbc212d1..951fdb35bef 100644 --- a/README.md +++ b/README.md @@ -13,19 +13,6 @@ Put your technical debt under control. For more information please see: * Install Maven 3.0.5 or greater * Execute `build.sh`. ZIP file of application is generated into sonar-application/target/ -### Edit Ruby Code - -The development mode is used to edit Ruby on Rails code. The application is automatically reloaded when Ruby files are saved. It avoids restarting the server. Changes are reloaded on the fly. Execute one of the following commands from the sonar-server/ directory to start server: - - # for embedded database - server/sonar-web/h2-start.sh - - # or for other dbs - server/sonar-web/mysql-start.sh - server/sonar-web/postgresql-start.sh - -Then Ruby code can be directly edited from sonar-server/src/main/webapp/WEB-INF/app. - ### Debug Maven Analysis Debug Maven analysis by executing `mvnDebug sonar:sonar`. Then attach your IDE to the remote process (the listening port is 8000). @@ -49,4 +36,3 @@ Licensed under the GNU Lesser General Public License, Version 3.0: http://www.gn [1]: http://www.sonarqube.org/ [2]: http://jira.codehaus.org/browse/SONAR [3]: http://docs.codehaus.org/display/SONAR - diff --git a/server/sonar-web/h2-start.sh b/server/sonar-web/h2-start.sh deleted file mode 100755 index 185d31df28b..00000000000 --- a/server/sonar-web/h2-start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export MAVEN_OPTS='-Xmx512m -XX:MaxPermSize=160m' -mvn org.apache.tomcat.maven:tomcat7-maven-plugin::run -Pstart-dev-server,h2 $* diff --git a/server/sonar-web/mysql-start.sh b/server/sonar-web/mysql-start.sh deleted file mode 100755 index e805a7ddc3c..00000000000 --- a/server/sonar-web/mysql-start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export MAVEN_OPTS='-Xmx512m -XX:MaxPermSize=160m' -mvn org.apache.tomcat.maven:tomcat7-maven-plugin::run -Pstart-dev-server,mysql $* diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml index 7e51b5c2a76..722dcc7a38d 100644 --- a/server/sonar-web/pom.xml +++ b/server/sonar-web/pom.xml @@ -236,285 +236,6 @@ </dependency> </dependencies> </profile> - <profile> - <id>h2</id> - <properties> - <sonar.jdbc.url>jdbc:h2:tcp://localhost:9092/sonar</sonar.jdbc.url> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-jdbc-driver</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <overWriteIfNewer>false</overWriteIfNewer> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <includeArtifactIds>h2</includeArtifactIds> - <outputDirectory>${project.build.directory}/dev/extensions/jdbc-driver/h2</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>start-dev-server</id> - <properties> - <gruntTask>dev</gruntTask> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-plugins</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <overWriteIfNewer>false</overWriteIfNewer> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <includeTypes>sonar-plugin</includeTypes> - <outputDirectory>${project.build.directory}/dev/lib/core-plugins</outputDirectory> - </configuration> - </execution> - <execution> - <id>copy-server</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <overWriteIfNewer>false</overWriteIfNewer> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <outputDirectory>src/main/webapp/WEB-INF/lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-conf</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/dev/conf</outputDirectory> - <overwrite>false</overwrite> - <resources> - <resource> - <directory>src/dev</directory> - <includes> - <include>sonar.properties</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <version>2.1</version> - <configuration> - <port>9000</port> - <path>/dev</path> - <contextFile>${project.basedir}/src/main/webapp/META-INF/context.xml</contextFile> - <useNaming>false</useNaming> - <systemProperties> - <SONAR_HOME>${project.build.directory}/dev</SONAR_HOME> - <rails.env>development</rails.env> - <jruby.max.runtimes>3</jruby.max.runtimes> - <sonar.jdbc.url>${sonar.jdbc.url}</sonar.jdbc.url> - <sonar.search.http.host>127.0.0.1</sonar.search.http.host> - <sonar.search.http.port>9200</sonar.search.http.port> - <sonar.log.console>true</sonar.log.console> - <sonar.log.profilingLevel>BASIC</sonar.log.profilingLevel> - <sonar.web.context>/dev</sonar.web.context> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>provided</scope> - </dependency> - <!-- core plugins --> - <dependency> - <groupId>org.codehaus.sonar.plugins</groupId> - <artifactId>sonar-core-plugin</artifactId> - <version>${project.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar.plugins</groupId> - <artifactId>sonar-design-plugin</artifactId> - <version>${project.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar-plugins.java</groupId> - <artifactId>sonar-findbugs-plugin</artifactId> - <version>${sonarJava.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar.plugins</groupId> - <artifactId>sonar-dbcleaner-plugin</artifactId> - <version>${project.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar-plugins.java</groupId> - <artifactId>sonar-squid-java-plugin</artifactId> - <version>${sonarJava.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar-plugins.java</groupId> - <artifactId>sonar-surefire-plugin</artifactId> - <version>${sonarJava.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar.plugins</groupId> - <artifactId>sonar-cpd-plugin</artifactId> - <version>${project.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar.plugins</groupId> - <artifactId>sonar-l10n-en-plugin</artifactId> - <version>${project.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar.plugins</groupId> - <artifactId>sonar-email-notifications-plugin</artifactId> - <version>${project.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar-plugins.java</groupId> - <artifactId>sonar-jacoco-plugin</artifactId> - <version>${sonarJava.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.sonar-plugins.java</groupId> - <artifactId>sonar-java-plugin</artifactId> - <version>${sonarJava.version}</version> - <type>sonar-plugin</type> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>postgresql</id> - <properties> - <sonar.jdbc.url>jdbc:postgresql://localhost:15432/sonar</sonar.jdbc.url> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-jdbc-driver</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <overWriteIfNewer>false</overWriteIfNewer> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <includeArtifactIds>postgresql</includeArtifactIds> - <outputDirectory>${project.build.directory}/dev/extensions/jdbc-driver/postgresql</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - </dependencies> - </profile> - - <profile> - <id>mysql</id> - <properties> - <sonar.jdbc.url>jdbc:mysql://localhost:13306/sonar?autoReconnect=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true</sonar.jdbc.url> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-jdbc-driver</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <overWriteIfNewer>false</overWriteIfNewer> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <includeArtifactIds>mysql-connector-java</includeArtifactIds> - <outputDirectory>${project.build.directory}/dev/extensions/jdbc-driver/mysql</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - </dependencies> - </profile> </profiles> </project> diff --git a/server/sonar-web/postgresql-start.sh b/server/sonar-web/postgresql-start.sh deleted file mode 100755 index 8a8d12609aa..00000000000 --- a/server/sonar-web/postgresql-start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export MAVEN_OPTS='-Xmx1512m -XX:MaxPermSize=256m' -mvn org.apache.tomcat.maven:tomcat7-maven-plugin::run -Pstart-dev-server,postgresql $* diff --git a/server/sonar-web/src/dev/sonar.properties b/server/sonar-web/src/dev/sonar.properties deleted file mode 100644 index 2c27f707a9b..00000000000 --- a/server/sonar-web/src/dev/sonar.properties +++ /dev/null @@ -1 +0,0 @@ -# Properties are set by Maven. See profile start-dev-server. |