You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/24 06:02:11 UTC
openmeetings git commit: no jira: profile for mssql is added,
mysql profile is simplified
Repository: openmeetings
Updated Branches:
refs/heads/master 9b1535767 -> 88b7b5228
no jira: profile for mssql is added, mysql profile is simplified
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/88b7b522
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/88b7b522
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/88b7b522
Branch: refs/heads/master
Commit: 88b7b5228f8db15e3d650d8ff7bebf43b6025586
Parents: 9b15357
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Aug 24 13:02:03 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Aug 24 13:02:03 2017 +0700
----------------------------------------------------------------------
.../src/site/xdoc/BuildInstructions.xml | 14 ++++---------
openmeetings-web/pom.xml | 22 ++++++++++++++++++--
pom.xml | 11 ++--------
3 files changed, 26 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/88b7b522/openmeetings-server/src/site/xdoc/BuildInstructions.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 486a155..c358d41 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -15,12 +15,10 @@
<document xmlns="http://maven.apache.org/XDOC/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-
<properties>
<title>Build instructions</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
<section name="Nightly Builds">
<p>
@@ -30,7 +28,6 @@
</a>
</p>
</section>
-
<section name="How to Build a Distribution">
<div>
<p>To build a binary release of OpenMeetings you need: </p>
@@ -46,7 +43,6 @@
<p>Run the command: </p>
<source><![CDATA[mvn clean install -P allModules]]></source>
</section>
-
<section name="Run, Develop, Test">
<p>
To develop Openmeetings you need to import maven project into Eclipse
@@ -71,19 +67,19 @@ mvn install -P allModules -pl openmeetings-flash # compiles a comp
<p>In case you would like to develop Openmeetings you need to run <i>"unpacked"</i> build: </p>
<source>
<![CDATA[
-mvn clean install -P allModules,unpacked,mysql,default-db-cred -DskipTests=true -Dwicket.mode=DEVELOPMENT
+mvn clean install -P allModules,unpacked,mysql -DskipTests=true -Dwicket.mode=DEVELOPMENT
]]>
</source>
<p>After modifications are made you can run <i>"quick"</i> build: </p>
<source>
<![CDATA[
-mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-web -pl openmeetings-server -Dwicket.mode=DEVELOPMENT
+mvn install -P allModules,quick,mysql -pl openmeetings-web -pl openmeetings-server -Dwicket.mode=DEVELOPMENT
]]>
</source>
<p>Any number of projects can be specified during build: </p>
<source>
<![CDATA[
-mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dwicket.mode=DEVELOPMENT
+mvn install -P allModules,quick,mysql -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dwicket.mode=DEVELOPMENT
]]>
</source>
<div>
@@ -99,7 +95,5 @@ mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-util -pl
</ul>
</div>
</section>
-
</body>
-
-</document>
\ No newline at end of file
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/88b7b522/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 12af274..a9d39ec 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -16,8 +16,8 @@
limitations under the License.
-->
<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">
+ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.openmeetings</groupId>
@@ -31,6 +31,7 @@
<description>Module for all Wicket based UI OpenMeetings components</description>
<properties>
<mysql.version>5.1.43</mysql.version>
+ <mssql.version>6.2.1.jre8</mssql.version>
<old-backups.dir>${project.build.directory}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
<pdfbox.version>2.0.6</pdfbox.version>
@@ -40,6 +41,8 @@
<id>mysql</id>
<properties>
<db>mysql</db>
+ <db_user>root</db_user>
+ <db_pass></db_pass>
</properties>
<dependencies>
<dependency>
@@ -50,6 +53,21 @@
</dependencies>
</profile>
<profile>
+ <id>mssql</id>
+ <properties>
+ <db>mssql</db>
+ <db_user>sa</db_user>
+ <db_pass>ass</db_pass>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>${mssql.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>Jenkins</id>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/88b7b522/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 08fee99..7a429c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
limitations under the License.
-->
<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">
+ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
@@ -90,13 +90,6 @@
</properties>
</profile>
<profile>
- <id>default-db-cred</id>
- <properties>
- <db_user>root</db_user>
- <db_pass></db_pass>
- </properties>
- </profile>
- <profile>
<id>rc</id>
<build>
<plugins>