The Unified and Autonomous Development Platform
Use standard Maven project/module directory structure
robin shineba18fabc130d
diff --git a/.gitignore b/.gitignoreindex 5daa687aac..5c7fa1529f 100644--- a/.gitignore+++ b/.gitignore@@ -1,23 +1,24 @@-*/target/**-*/bin/**-.metadata/-.recommenders/-.idea/-**/.classpath-**/.project-**/*.iml-*/.settings/**-release.properties-pom.xml.releaseBackup--.loadpath-*.class-*~-*.lock-*.swp-*.out-*.tmp-*.bak-*~.nib-*.DS_Store-*.log+*/target/**+*/bin/**+.metadata/+.recommenders/+.idea/+**/.classpath+**/.project+**/*.iml+.settings/**+*/.settings/**+release.properties+pom.xml.releaseBackup++.loadpath+*.class+*~+*.lock+*.swp+*.out+*.tmp+*.bak+*~.nib+*.DS_Store+*.logdiff --git a/server.all/pom.xml b/pom.xmlsimilarity index 72%rename from server.all/pom.xmlrename to pom.xmlindex 781791c5ef..e04a115d3e 100644--- a/server.all/pom.xml+++ b/pom.xml@@ -1,38 +1,38 @@-<?xml version="1.0" encoding="UTF-8"?>--<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>- <artifactId>server.all</artifactId>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>- <packaging>pom</packaging>- <modules>- <module>../server.core</module>- <module>../server.web</module>- <module>../server.rest</module>- <module>../server.http</module>- <module>../server.search</module>- <module>../server.product</module>- </modules>- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>- <version>1.0-EAP-build4</version>-</project>+<?xml version="1.0" encoding="UTF-8"?>++<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>+ <artifactId>server</artifactId>+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>commons</artifactId>+ <version>1.0.0</version>+ </parent>+ <packaging>pom</packaging>+ <modules>+ <module>server.core</module>+ <module>server.web</module>+ <module>server.rest</module>+ <module>server.http</module>+ <module>server.search</module>+ <module>server.product</module>+ </modules>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>+ <version>1.0-EAP-build4</version>+</project>diff --git a/server.core/pom.xml b/server.core/pom.xmlindex 916d1c767c..e5957e849c 100644--- a/server.core/pom.xml+++ b/server.core/pom.xml@@ -1,78 +1,77 @@-<?xml version="1.0" encoding="UTF-8"?>--<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">- <modelVersion>4.0.0</modelVersion>- <artifactId>server.core</artifactId>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <plugin>- <artifactId>maven-archetype-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- <plugin>- <groupId>org.antlr</groupId>- <artifactId>antlr4-maven-plugin</artifactId>- </plugin>- </plugins>- </build>- <dependencies>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons</artifactId>- <version>1.0.0</version>- </dependency>- <dependency>- <groupId>org.jetbrains.xodus</groupId>- <artifactId>xodus-entity-store</artifactId>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons.git</artifactId>- <version>1.0.0</version>- <type>test-jar</type>- <scope>test</scope>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons.loader</artifactId>- <version>1.0.0</version>- <type>test-jar</type>- <scope>test</scope>- </dependency>- </dependencies>- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>- <properties>- <moduleClass>com.gitplex.server.core.CoreModule</moduleClass>- </properties>- <version>1.0-EAP-build4</version>-</project>+<?xml version="1.0" encoding="UTF-8"?>++<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">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server.core</artifactId>+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>server</artifactId>+ <version>1.0-EAP-build4</version>+ </parent>+ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-archetype-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ <plugin>+ <groupId>org.antlr</groupId>+ <artifactId>antlr4-maven-plugin</artifactId>+ </plugin>+ </plugins>+ </build>+ <dependencies>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.product</artifactId>+ <version>1.0.0</version>+ </dependency>+ <dependency>+ <groupId>org.jetbrains.xodus</groupId>+ <artifactId>xodus-entity-store</artifactId>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.git</artifactId>+ <version>1.0.0</version>+ <type>test-jar</type>+ <scope>test</scope>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.loader</artifactId>+ <version>1.0.0</version>+ <type>test-jar</type>+ <scope>test</scope>+ </dependency>+ </dependencies>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>+ <properties>+ <moduleClass>com.gitplex.server.core.CoreModule</moduleClass>+ </properties>+</project>diff --git a/server.core/src/main/resources/archetype-resource/pom.xml b/server.core/src/main/resources/archetype-resource/pom.xmlindex 6e84e195b1..7a3638f250 100644--- a/server.core/src/main/resources/archetype-resource/pom.xml+++ b/server.core/src/main/resources/archetype-resource/pom.xml@@ -1,60 +1,60 @@-<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">- <modelVersion>4.0.0</modelVersion>-#if (\${groupId} != "com.gitplex")- <groupId>\${groupId}</groupId>-#end- <artifactId>\${artifactId}</artifactId>- <version>\${version}</version>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>-- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- </plugins>- </build>-- <dependencies>- <dependency>- <groupId>${project.groupId}</groupId>- <artifactId>${project.artifactId}</artifactId>- <version>${project.version}</version>- </dependency>- </dependencies>-- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>-- <properties>- <moduleClass>\${package}.PluginModule</moduleClass>- </properties>--</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/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+#if (\${groupId} != "com.gitplex")+ <groupId>\${groupId}</groupId>+#end+ <artifactId>\${artifactId}</artifactId>+ <version>\${version}</version>+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>parent.general</artifactId>+ <version>1.0.0</version>+ </parent>++ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ </plugins>+ </build>++ <dependencies>+ <dependency>+ <groupId>${project.groupId}</groupId>+ <artifactId>${project.artifactId}</artifactId>+ <version>${project.version}</version>+ </dependency>+ </dependencies>++ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>++ <properties>+ <moduleClass>\${package}.PluginModule</moduleClass>+ </properties>++</project>diff --git a/server.http/pom.xml b/server.http/pom.xmlindex 095d7a2685..aa986b5a03 100644--- a/server.http/pom.xml+++ b/server.http/pom.xml@@ -1,57 +1,56 @@-<?xml version="1.0" encoding="UTF-8"?>--<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">- <modelVersion>4.0.0</modelVersion>- <artifactId>server.http</artifactId>- <version>1.0-EAP-build4</version>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <!-- Uncomment below if you'd like to publish an archetype based on your plugin -->- <!--plugin>- <artifactId>maven-archetype-plugin</artifactId>- </plugin-->- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- </plugins>- </build>- <dependencies>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.core</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- </dependencies>- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>- <properties>- <moduleClass>com.gitplex.server.http.HttpModule</moduleClass>- </properties>-</project>+<?xml version="1.0" encoding="UTF-8"?>++<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">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server.http</artifactId>+ <parent>+ <groupId>com.gitplex</groupId>+ <version>1.0-EAP-build4</version>+ <artifactId>server</artifactId>+ </parent>+ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <!-- Uncomment below if you'd like to publish an archetype based on your plugin -->+ <!--plugin>+ <artifactId>maven-archetype-plugin</artifactId>+ </plugin-->+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ </plugins>+ </build>+ <dependencies>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.core</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ </dependencies>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>+ <properties>+ <moduleClass>com.gitplex.server.http.HttpModule</moduleClass>+ </properties>+</project>diff --git a/server.http/src/main/resources/archetype-resource/pom.xml b/server.http/src/main/resources/archetype-resource/pom.xmlindex 6e84e195b1..7a3638f250 100644--- a/server.http/src/main/resources/archetype-resource/pom.xml+++ b/server.http/src/main/resources/archetype-resource/pom.xml@@ -1,60 +1,60 @@-<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">- <modelVersion>4.0.0</modelVersion>-#if (\${groupId} != "com.gitplex")- <groupId>\${groupId}</groupId>-#end- <artifactId>\${artifactId}</artifactId>- <version>\${version}</version>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>-- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- </plugins>- </build>-- <dependencies>- <dependency>- <groupId>${project.groupId}</groupId>- <artifactId>${project.artifactId}</artifactId>- <version>${project.version}</version>- </dependency>- </dependencies>-- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>-- <properties>- <moduleClass>\${package}.PluginModule</moduleClass>- </properties>--</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/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+#if (\${groupId} != "com.gitplex")+ <groupId>\${groupId}</groupId>+#end+ <artifactId>\${artifactId}</artifactId>+ <version>\${version}</version>+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>parent.general</artifactId>+ <version>1.0.0</version>+ </parent>++ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ </plugins>+ </build>++ <dependencies>+ <dependency>+ <groupId>${project.groupId}</groupId>+ <artifactId>${project.artifactId}</artifactId>+ <version>${project.version}</version>+ </dependency>+ </dependencies>++ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>++ <properties>+ <moduleClass>\${package}.PluginModule</moduleClass>+ </properties>++</project>diff --git a/server.product/build/prepare_package.gant b/server.product/build/prepare_package.gantindex dd07d946f2..d2874ad517 100644--- a/server.product/build/prepare_package.gant+++ b/server.product/build/prepare_package.gant@@ -1,142 +1,142 @@-target(default:"prepare to package the product") {- File buildDir = new File("${buildDirectory}")- File sandboxDir = new File(buildDir, "sandbox")-- File jswLoc = new File("${jswPath}")- if (jswLoc.isFile()) {- File extractTo = new File(buildDir, "jsw")- unzip(src: jswLoc, dest: extractTo)- jswLoc = extractTo- }-- File binDir = new File(sandboxDir, "bin")- File bootDir = new File(sandboxDir, "boot")- copy(todir: bootDir) {- fileset(dir: jswLoc.absolutePath + "/bin", includes: "wrapper-*")- fileset(dir: jswLoc.absolutePath + "/lib", includes: "libwrapper-*, *.dll, wrapper.jar")- }-- filterset(id: "appFilterSet") {- filter(token: "app.name", value: "${productId}")- filter(token: "app.long.name", value: "${productName}")- filter(token: "app.description", value: "${productName}")- filter(token: "app.class", value: "${bootstrapClass}")- }- filterset(id: "batchCommandCommonFilterSet") {- filter(token: "set_fixed_command", value: "set _FIXED_COMMAND=console")- }- filterset(id: "shellScriptCommonFilterSet") {- filter(token: "set_fixed_command", value: "FIXED_COMMAND=console")- filter(token: "set_pass_through", value: "PASS_THROUGH=true")- }-- copy(tofile: binDir.absolutePath + "/server.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {- filterset() {- filter(token: "set_fixed_command", value: "")- filter(token: "properties_and_parameters", value: "--")- }- }- copy(tofile: binDir.absolutePath + "/restore.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {- filterset(refid: "batchCommandCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Restore\" wrapper.name=${productId}_restore wrapper.displayname=\"${productName} Restore\" wrapper.description=\"${productName} Restore\" -- restore")- }- }- copy(tofile: binDir.absolutePath + "/backup.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {- filterset(refid: "batchCommandCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Backup\" wrapper.name=${productId}_backup wrapper.displayname=\"${productName} Backup\" wrapper.description=\"${productName} Backup\" -- backup")- }- }- copy(tofile: binDir.absolutePath + "/upgrade.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {- filterset(refid: "batchCommandCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Upgrade\" wrapper.name=${productId}_upgrade wrapper.displayname=\"${productName} Upgrade\" wrapper.description=\"${productName} Upgrade\" -- upgrade")- }- }- copy(tofile: binDir.absolutePath + "/apply_db_constraints.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {- filterset(refid: "batchCommandCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Apply DB Constraints\" wrapper.name=${productId}_apply_db_constraints wrapper.displayname=\"${productName} Apply DB Constraints\" wrapper.description=\"${productName} Apply DB Constraints\" -- apply_db_constraints")- }- }- copy(tofile: binDir.absolutePath + "/reset_admin_password.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {- filterset(refid: "batchCommandCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productName} Reset Admin Password\" wrapper.name=${productId}_reset_admin_password wrapper.displayname=\"${productName} Reset Admin Password\" wrapper.description=\"${productName} Reset Admin Password\" -- reset_admin_password")- }- }-- copy(tofile: binDir.absolutePath + "/server.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {- filterset(refid: "appFilterSet")- filterset() {- filter(token: "set_fixed_command", value: "")- filter(token: "set_pass_through", value: "")- filter(token: "properties_and_parameters", value: "--")- }- }- copy(tofile: binDir.absolutePath + "/restore.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {- filterset() {- filter(token: "app.name", value: "${productId}_restore")- filter(token: "app.long.name", value: "${productName} Restore")- filter(token: "app.description", value: "${productName} Restore")- filter(token: "app.class", value: "${bootstrapClass}")- }- filterset(refid: "shellScriptCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Restore' wrapper.name=${productId}_restore wrapper.displayname='${productName} Restore' wrapper.description='${productName} Restore' -- restore")- }- }- copy(tofile: binDir.absolutePath + "/backup.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {- filterset() {- filter(token: "app.name", value: "${productId}_backup")- filter(token: "app.long.name", value: "${productName} Backup")- filter(token: "app.description", value: "${productName} Backup")- filter(token: "app.class", value: "${bootstrapClass}")- }- filterset(refid: "shellScriptCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Backup' wrapper.name=${productId}_backup wrapper.displayname='${productName} Backup' wrapper.description='${productName} Backup' -- backup")- }- }- copy(tofile: binDir.absolutePath + "/upgrade.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {- filterset() {- filter(token: "app.name", value: "${productId}_upgrade")- filter(token: "app.long.name", value: "${productName} Upgrade")- filter(token: "app.description", value: "${productName} Upgrade")- filter(token: "app.class", value: "${bootstrapClass}")- }- filterset(refid: "shellScriptCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Upgrade' wrapper.name=${productId}_upgrade wrapper.displayname='${productName} Upgrade' wrapper.description='${productName} Upgrade' -- upgrade")- }- }- copy(tofile: binDir.absolutePath + "/apply_db_constraints.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {- filterset() {- filter(token: "app.name", value: "${productId}_apply_db_constraints")- filter(token: "app.long.name", value: "${productName} Apply DB Constraints")- filter(token: "app.description", value: "${productName} Apply DB Constraints")- filter(token: "app.class", value: "${bootstrapClass}")- }- filterset(refid: "shellScriptCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Apply DB Constraints' wrapper.name=${productId}_apply_db_constraints wrapper.displayname='${productName} Apply DB Constraints' wrapper.description='${productName} Apply DB Constraints' -- apply_db_constraints")- }- }- copy(tofile: binDir.absolutePath + "/reset_admin_password.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {- filterset() {- filter(token: "app.name", value: "${productId}_reset_admin_password")- filter(token: "app.long.name", value: "${productName} Reset Admin Password")- filter(token: "app.description", value: "${productName} Reset Admin Password")- filter(token: "app.class", value: "${bootstrapClass}")- }- filterset(refid: "shellScriptCommonFilterSet")- filterset() {- filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productName} Reset Admin Password' wrapper.name=${productId}_reset_admin_password wrapper.displayname='${productName} Reset Admin Password' wrapper.description='${productName} Reset Admin Password' -- reset_admin_password")- }- }-- copy(tofile: sandboxDir.absolutePath + "/conf/wrapper.conf", file: jswLoc.absolutePath + "/customization/wrapper.conf") {- filterset(refid: "appFilterSet")- }+target(default:"prepare to package the product") {+ File buildDir = new File("${buildDirectory}")+ File sandboxDir = new File(buildDir, "sandbox")++ File jswLoc = new File("${jswPath}")+ if (jswLoc.isFile()) {+ File extractTo = new File(buildDir, "jsw")+ unzip(src: jswLoc, dest: extractTo)+ jswLoc = extractTo+ }++ File binDir = new File(sandboxDir, "bin")+ File bootDir = new File(sandboxDir, "boot")+ copy(todir: bootDir) {+ fileset(dir: jswLoc.absolutePath + "/bin", includes: "wrapper-*")+ fileset(dir: jswLoc.absolutePath + "/lib", includes: "libwrapper-*, *.dll, wrapper.jar")+ }++ filterset(id: "appFilterSet") {+ filter(token: "app.name", value: "${productName}")+ filter(token: "app.long.name", value: "${productDescription}")+ filter(token: "app.description", value: "${productDescription}")+ filter(token: "app.class", value: "${bootstrapClass}")+ }+ filterset(id: "batchCommandCommonFilterSet") {+ filter(token: "set_fixed_command", value: "set _FIXED_COMMAND=console")+ }+ filterset(id: "shellScriptCommonFilterSet") {+ filter(token: "set_fixed_command", value: "FIXED_COMMAND=console")+ filter(token: "set_pass_through", value: "PASS_THROUGH=true")+ }++ copy(tofile: binDir.absolutePath + "/server.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {+ filterset() {+ filter(token: "set_fixed_command", value: "")+ filter(token: "properties_and_parameters", value: "--")+ }+ }+ copy(tofile: binDir.absolutePath + "/restore.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {+ filterset(refid: "batchCommandCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productDescription} Restore\" wrapper.name=${productName}_restore wrapper.displayname=\"${productDescription} Restore\" wrapper.description=\"${productDescription} Restore\" -- restore")+ }+ }+ copy(tofile: binDir.absolutePath + "/backup.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {+ filterset(refid: "batchCommandCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productDescription} Backup\" wrapper.name=${productName}_backup wrapper.displayname=\"${productDescription} Backup\" wrapper.description=\"${productDescription} Backup\" -- backup")+ }+ }+ copy(tofile: binDir.absolutePath + "/upgrade.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {+ filterset(refid: "batchCommandCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productDescription} Upgrade\" wrapper.name=${productName}_upgrade wrapper.displayname=\"${productDescription} Upgrade\" wrapper.description=\"${productDescription} Upgrade\" -- upgrade")+ }+ }+ copy(tofile: binDir.absolutePath + "/apply_db_constraints.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {+ filterset(refid: "batchCommandCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productDescription} Apply DB Constraints\" wrapper.name=${productName}_apply_db_constraints wrapper.displayname=\"${productDescription} Apply DB Constraints\" wrapper.description=\"${productDescription} Apply DB Constraints\" -- apply_db_constraints")+ }+ }+ copy(tofile: binDir.absolutePath + "/reset_admin_password.bat", file: jswLoc.absolutePath + "/customization/AppCommand.bat.in") {+ filterset(refid: "batchCommandCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"${productDescription} Reset Admin Password\" wrapper.name=${productName}_reset_admin_password wrapper.displayname=\"${productDescription} Reset Admin Password\" wrapper.description=\"${productDescription} Reset Admin Password\" -- reset_admin_password")+ }+ }++ copy(tofile: binDir.absolutePath + "/server.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {+ filterset(refid: "appFilterSet")+ filterset() {+ filter(token: "set_fixed_command", value: "")+ filter(token: "set_pass_through", value: "")+ filter(token: "properties_and_parameters", value: "--")+ }+ }+ copy(tofile: binDir.absolutePath + "/restore.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {+ filterset() {+ filter(token: "app.name", value: "${productName}_restore")+ filter(token: "app.long.name", value: "${productDescription} Restore")+ filter(token: "app.description", value: "${productDescription} Restore")+ filter(token: "app.class", value: "${bootstrapClass}")+ }+ filterset(refid: "shellScriptCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productDescription} Restore' wrapper.name=${productName}_restore wrapper.displayname='${productDescription} Restore' wrapper.description='${productDescription} Restore' -- restore")+ }+ }+ copy(tofile: binDir.absolutePath + "/backup.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {+ filterset() {+ filter(token: "app.name", value: "${productName}_backup")+ filter(token: "app.long.name", value: "${productDescription} Backup")+ filter(token: "app.description", value: "${productDescription} Backup")+ filter(token: "app.class", value: "${bootstrapClass}")+ }+ filterset(refid: "shellScriptCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productDescription} Backup' wrapper.name=${productName}_backup wrapper.displayname='${productDescription} Backup' wrapper.description='${productDescription} Backup' -- backup")+ }+ }+ copy(tofile: binDir.absolutePath + "/upgrade.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {+ filterset() {+ filter(token: "app.name", value: "${productName}_upgrade")+ filter(token: "app.long.name", value: "${productDescription} Upgrade")+ filter(token: "app.description", value: "${productDescription} Upgrade")+ filter(token: "app.class", value: "${bootstrapClass}")+ }+ filterset(refid: "shellScriptCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productDescription} Upgrade' wrapper.name=${productName}_upgrade wrapper.displayname='${productDescription} Upgrade' wrapper.description='${productDescription} Upgrade' -- upgrade")+ }+ }+ copy(tofile: binDir.absolutePath + "/apply_db_constraints.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {+ filterset() {+ filter(token: "app.name", value: "${productName}_apply_db_constraints")+ filter(token: "app.long.name", value: "${productDescription} Apply DB Constraints")+ filter(token: "app.description", value: "${productDescription} Apply DB Constraints")+ filter(token: "app.class", value: "${bootstrapClass}")+ }+ filterset(refid: "shellScriptCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productDescription} Apply DB Constraints' wrapper.name=${productName}_apply_db_constraints wrapper.displayname='${productDescription} Apply DB Constraints' wrapper.description='${productDescription} Apply DB Constraints' -- apply_db_constraints")+ }+ }+ copy(tofile: binDir.absolutePath + "/reset_admin_password.sh", file: jswLoc.absolutePath + "/customization/sh.script.in") {+ filterset() {+ filter(token: "app.name", value: "${productName}_reset_admin_password")+ filter(token: "app.long.name", value: "${productDescription} Reset Admin Password")+ filter(token: "app.description", value: "${productDescription} Reset Admin Password")+ filter(token: "app.class", value: "${bootstrapClass}")+ }+ filterset(refid: "shellScriptCommonFilterSet")+ filterset() {+ filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='${productDescription} Reset Admin Password' wrapper.name=${productName}_reset_admin_password wrapper.displayname='${productDescription} Reset Admin Password' wrapper.description='${productDescription} Reset Admin Password' -- reset_admin_password")+ }+ }++ copy(tofile: sandboxDir.absolutePath + "/conf/wrapper.conf", file: jswLoc.absolutePath + "/customization/wrapper.conf") {+ filterset(refid: "appFilterSet")+ }}\ No newline at end of filediff --git a/server.product/pom.xml b/server.product/pom.xmlindex 7e124cb66a..a5c023721b 100644--- a/server.product/pom.xml+++ b/server.product/pom.xml@@ -1,165 +1,181 @@-<?xml version="1.0" encoding="UTF-8"?>--<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>- <artifactId>gitplex</artifactId>- <name>GitPlex</name>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>- <build>- <plugins>- <plugin>- <artifactId>maven-archetype-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- <executions>- <execution>- <id>copy-product-resources</id>- <phase>compile</phase>- <goals>- <goal>run-ant</goal>- </goals>- <configuration>- <target>- <copy todir="${project.build.directory}/sandbox">- <fileset dir="system" excludes="site/images/**, site/avatars/**, **/*.keystore, **/*.jar"/>- <filterset>- <filter token="dbName" value="${project.artifactId}"/>- <filter token="productName" value="${project.name}"/>- </filterset>- </copy>- <copy todir="${project.build.directory}/sandbox">- <fileset dir="system" includes="site/images/**, site/avatars/**, **/*.keystore, **/*.jar"/>- </copy>- </target>- </configuration>- </execution>- </executions>- </plugin>- <plugin>- <artifactId>maven-antrun-plugin</artifactId>- <executions>- <execution>- <id>prepare-package</id>- <phase>prepare-package</phase>- <goals>- <goal>run</goal>- </goals>- <configuration>- <target>- <taskdef name="gant" classname="org.codehaus.gant.ant.Gant"/>- <gant file="build/prepare_package.gant">- <definition name="buildDirectory" value="${project.build.directory}"/>- <definition name="outputDirectory" value="${project.build.outputDirectory}"/>- <definition name="jswPath" value="${com.gitplex:commons.jsw:jar}"/>- <definition name="productId" value="${project.artifactId}"/>- <definition name="productName" value="${project.name}"/>- <definition name="bootstrapClass" value="${bootstrapClass}"/>- </gant>- </target>- </configuration>- </execution>- <execution>- <id>package</id>- <phase>package</phase>- <goals>- <goal>run</goal>- </goals>- <configuration>- <target>- <taskdef name="gant" classname="org.codehaus.gant.ant.Gant"/>- <gant file="build/package.gant">- <definition name="buildDirectory" value="${project.build.directory}"/>- <definition name="executables" value="${executables}"/>- <definition name="packageName" value="${project.artifactId}-${project.version}"/>- </gant>- </target>- </configuration>- </execution>- </executions>- </plugin>- </plugins>- </build>- <dependencies>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons.jsw</artifactId>- <version>1.0.0</version>- <scope>provided</scope>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.core</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.web</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons.loader</artifactId>- <version>1.0.0</version>- <type>test-jar</type>- <scope>test</scope>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons.git</artifactId>- <version>1.0.0</version>- <type>test-jar</type>- <scope>test</scope>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.rest</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.http</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.search</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- </dependencies>- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>- <properties>- <executables>bin/*.sh, boot/wrapper-*</executables>- <bootstrapClass>com.gitplex.commons.bootstrap.Bootstrap</bootstrapClass>- <moduleClass>com.gitplex.server.product.ProductModule</moduleClass>- <aggregation>true</aggregation>- </properties>- <version>1.0-EAP-build4</version>-</project>+<?xml version="1.0" encoding="UTF-8"?>++<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>+ <artifactId>server.product</artifactId>+ <name>GitPlex</name>+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>server</artifactId>+ <version>1.0-EAP-build4</version>+ </parent>+ <build>+ <plugins>+ <plugin>+ <artifactId>maven-archetype-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ <plugin>+ <groupId>org.codehaus.groovy.maven</groupId>+ <artifactId>gmaven-plugin</artifactId>+ <version>1.0</version>+ <executions>+ <execution>+ <phase>initialize</phase>+ <goals>+ <goal>execute</goal>+ </goals>+ <configuration>+ <source>+ project.properties["lowerCaseProductName"] = project.name.toLowerCase()+ </source>+ </configuration>+ </execution>+ </executions>+ </plugin>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ <executions>+ <execution>+ <id>copy-product-resources</id>+ <phase>compile</phase>+ <goals>+ <goal>run-ant</goal>+ </goals>+ <configuration>+ <target>+ <copy todir="${project.build.directory}/sandbox">+ <fileset dir="system" excludes="site/images/**, site/avatars/**, **/*.keystore, **/*.jar"/>+ <filterset>+ <filter token="productName" value="${lowerCaseProductName}"/>+ </filterset>+ </copy>+ <copy todir="${project.build.directory}/sandbox">+ <fileset dir="system" includes="site/images/**, site/avatars/**, **/*.keystore, **/*.jar"/>+ </copy>+ </target>+ </configuration>+ </execution>+ </executions>+ </plugin>+ <plugin>+ <artifactId>maven-antrun-plugin</artifactId>+ <executions>+ <execution>+ <id>prepare-package</id>+ <phase>prepare-package</phase>+ <goals>+ <goal>run</goal>+ </goals>+ <configuration>+ <target>+ <taskdef name="gant" classname="org.codehaus.gant.ant.Gant"/>+ <gant file="build/prepare_package.gant">+ <definition name="buildDirectory" value="${project.build.directory}"/>+ <definition name="outputDirectory" value="${project.build.outputDirectory}"/>+ <definition name="jswPath" value="${com.gitplex:commons.jsw:jar}"/>+ <definition name="productName" value="${lowerCaseProductName}"/>+ <definition name="productDescription" value="${project.name}"/>+ <definition name="bootstrapClass" value="${bootstrapClass}"/>+ </gant>+ </target>+ </configuration>+ </execution>+ <execution>+ <id>package</id>+ <phase>package</phase>+ <goals>+ <goal>run</goal>+ </goals>+ <configuration>+ <target>+ <taskdef name="gant" classname="org.codehaus.gant.ant.Gant"/>+ <gant file="build/package.gant">+ <definition name="buildDirectory" value="${project.build.directory}"/>+ <definition name="executables" value="${executables}"/>+ <definition name="packageName" value="${lowerCaseProductName}-${project.version}"/>+ </gant>+ </target>+ </configuration>+ </execution>+ </executions>+ </plugin>+ </plugins>+ </build>+ <dependencies>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.jsw</artifactId>+ <version>1.0.0</version>+ <scope>provided</scope>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.core</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.web</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.loader</artifactId>+ <version>1.0.0</version>+ <type>test-jar</type>+ <scope>test</scope>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.git</artifactId>+ <version>1.0.0</version>+ <type>test-jar</type>+ <scope>test</scope>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.rest</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.http</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.search</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ </dependencies>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.gitplex.com/</url>+ </repository>+ </repositories>+ <properties>+ <executables>bin/*.sh, boot/wrapper-*</executables>+ <bootstrapClass>com.gitplex.commons.bootstrap.Bootstrap</bootstrapClass>+ <moduleClass>com.gitplex.server.product.ProductModule</moduleClass>+ <aggregation>true</aggregation>+ </properties>+</project>diff --git a/server.product/src/main/resources/archetype-resource/pom.xml b/server.product/src/main/resources/archetype-resource/pom.xmlindex 74fe09e3e2..89ba9ce193 100644--- a/server.product/src/main/resources/archetype-resource/pom.xml+++ b/server.product/src/main/resources/archetype-resource/pom.xml@@ -1,62 +1,62 @@-<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">- <modelVersion>4.0.0</modelVersion>-#if (\${groupId} != "com.gitplex")- <groupId>\${groupId}</groupId>-#end- <artifactId>\${artifactId}</artifactId>-#if (\${version} != "1.0.5")- <version>\${version}</version>-#end- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>-- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- </plugins>- </build>-- <dependencies>- <dependency>- <groupId>${project.groupId}</groupId>- <artifactId>${project.artifactId}</artifactId>- <version>${project.version}</version>- </dependency>- </dependencies>-- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>-- <properties>- <moduleClass>\${package}.PluginModule</moduleClass>- </properties>--</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/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+#if (\${groupId} != "com.gitplex")+ <groupId>\${groupId}</groupId>+#end+ <artifactId>\${artifactId}</artifactId>+#if (\${version} != "1.0.5")+ <version>\${version}</version>+#end+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>parent.general</artifactId>+ <version>1.0.0</version>+ </parent>++ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ </plugins>+ </build>++ <dependencies>+ <dependency>+ <groupId>${project.groupId}</groupId>+ <artifactId>${project.artifactId}</artifactId>+ <version>${project.version}</version>+ </dependency>+ </dependencies>++ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>++ <properties>+ <moduleClass>\${package}.PluginModule</moduleClass>+ </properties>++</project>diff --git a/server.product/system/conf/hibernate.properties b/server.product/system/conf/hibernate.propertiesindex 92bab7909e..c511bafa08 100644--- a/server.product/system/conf/hibernate.properties+++ b/server.product/system/conf/hibernate.properties@@ -1,101 +1,101 @@-#-----------------------------------------------------------------------------------# To use embedded HSQLDB database shipped with @productName@, please uncomment HSQLDB-# database settings below and comment out settings for other databases.-#------------------------------------------------------------------------------------hibernate.dialect=org.hibernate.dialect.HSQLDialect-hibernate.connection.driver_class=org.hsqldb.jdbc.JDBCDriver-hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/@dbName@;shutdown=true-hibernate.connection.username=sa-hibernate.connection.password=---#-----------------------------------------------------------------------------------# To use MySQL/MariaDB database, please follow these steps:-# 1. Uncomment MySQL/MariaDB settings below and comment out settings for other databases.-# 2. Create an empty @productName@ schema at MySQL/MariaDB side.-# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",-# and "hibernate.connection.password" so that @productName@ can connect and write to-# the database created in step 3.-# 4. For MySQL, make sure to use "InnoDB" as default storage engine, for MariaDB, make-# sure to use "XtraDB" or "InnoDB" as the default storage engine.-#------------------------------------------------------------------------------------#hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect-#hibernate.connection.driver_class=org.mariadb.jdbc.Driver-#hibernate.connection.url=jdbc:mysql://localhost:3306/@dbName@-#hibernate.connection.username=root-#hibernate.connection.password=root---#-----------------------------------------------------------------------------------# To use PostgreSQL database, please follow these steps:-# 1. Uncomment PostgreSQL settings below and comment out settings for other databases.-# 2. Create an empty QuickBuild database at PostgreSQL side.-# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",-# and "hibernate.connection.password" so that QuickBuild can connect and write to-# the database created in step 3.-#------------------------------------------------------------------------------------#hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect-#hibernate.connection.driver_class=org.postgresql.Driver-#hibernate.connection.url=jdbc:postgresql://localhost:5432/@dbName@-#hibernate.connection.username=postgres-#hibernate.connection.password=postgres---#-----------------------------------------------------------------------------------# To use Microsoft SQL Server, please follow these steps:-# 1. Enable tcp/ip access to SQL Server.-# 2. Uncomment Microsoft SQL Server settings below and comment out settings for-# other databases.-# 3. Create an empty database at SQL Server side.-# 4. Change the property "hibernate.connection.url", "hibernate.connection.username",-# and "hibernate.connection.password" so that @productName@ can connect and write to-# the database created in step 3.-#------------------------------------------------------------------------------------#hibernate.dialect=org.hibernate.dialect.SQLServer2012Dialect-#hibernate.connection.driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver-#hibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName=gitplex-#hibernate.connection.username=sa-#hibernate.connection.password=sa---#-----------------------------------------------------------------------------------# To use Oracle, please follow these steps:-# 1. Uncomment Oracle settings below and comment out settings for other databases.-# 2. Create an empty Oracle database.-# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",-# and "hibernate.connection.password" so that @productName@ can connect and write to-# the database created in step 3.-# 4. Change property "hibernate.dialect" based on different Oracle versions:-# 5.1 Use value "org.hibernate.dialect.Oracle9iDialect" if Oracle9i is used.-# 5.2 Use value "org.hibernate.dialect.Oracle8iDialect" if Oracle8i is used.-# 5.3 Use value "org.hibernate.dialect.Oracle10gDialect" if Oracle10g or 11g is-# used.-#------------------------------------------------------------------------------------#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect-#hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver-#hibernate.connection.url=jdbc:oracle:thin:@localhost:1521:XE-#hibernate.connection.username=gitplex-#hibernate.connection.password=gitplex---hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider--hibernate.hikari.transactionIsolation=TRANSACTION_READ_COMMITTED-hibernate.hikari.autoCommit=false-hibernate.hikari.minimumIdle=5-hibernate.hikari.maximumPoolSize=25--hibernate.show_sql=false-hibernate.format_sql=true-hibernate.use_sql_comments=true--javax.persistence.validation.mode=none-hibernate.validator.apply_to_ddl=false--hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory-hibernate.cache.use_query_cache=true+#----------------------------------------------------------------------------------+# To use embedded HSQLDB database shipped with @productName@, please uncomment HSQLDB+# database settings below and comment out settings for other databases.+#----------------------------------------------------------------------------------++hibernate.dialect=org.hibernate.dialect.HSQLDialect+hibernate.connection.driver_class=org.hsqldb.jdbc.JDBCDriver+hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/@productName@;shutdown=true+hibernate.connection.username=sa+hibernate.connection.password=+++#----------------------------------------------------------------------------------+# To use MySQL/MariaDB database, please follow these steps:+# 1. Uncomment MySQL/MariaDB settings below and comment out settings for other databases.+# 2. Create an empty @productName@ schema at MySQL/MariaDB side.+# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",+# and "hibernate.connection.password" so that @productName@ can connect and write to+# the database created in step 3.+# 4. For MySQL, make sure to use "InnoDB" as default storage engine, for MariaDB, make+# sure to use "XtraDB" or "InnoDB" as the default storage engine.+#----------------------------------------------------------------------------------++#hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect+#hibernate.connection.driver_class=org.mariadb.jdbc.Driver+#hibernate.connection.url=jdbc:mysql://localhost:3306/@productName@+#hibernate.connection.username=root+#hibernate.connection.password=root+++#----------------------------------------------------------------------------------+# To use PostgreSQL database, please follow these steps:+# 1. Uncomment PostgreSQL settings below and comment out settings for other databases.+# 2. Create an empty QuickBuild database at PostgreSQL side.+# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",+# and "hibernate.connection.password" so that QuickBuild can connect and write to+# the database created in step 3.+#----------------------------------------------------------------------------------++#hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect+#hibernate.connection.driver_class=org.postgresql.Driver+#hibernate.connection.url=jdbc:postgresql://localhost:5432/@productName@+#hibernate.connection.username=postgres+#hibernate.connection.password=postgres+++#----------------------------------------------------------------------------------+# To use Microsoft SQL Server, please follow these steps:+# 1. Enable tcp/ip access to SQL Server.+# 2. Uncomment Microsoft SQL Server settings below and comment out settings for+# other databases.+# 3. Create an empty database at SQL Server side.+# 4. Change the property "hibernate.connection.url", "hibernate.connection.username",+# and "hibernate.connection.password" so that @productName@ can connect and write to+# the database created in step 3.+#----------------------------------------------------------------------------------++#hibernate.dialect=org.hibernate.dialect.SQLServer2012Dialect+#hibernate.connection.driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver+#hibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName=gitplex+#hibernate.connection.username=sa+#hibernate.connection.password=sa+++#----------------------------------------------------------------------------------+# To use Oracle, please follow these steps:+# 1. Uncomment Oracle settings below and comment out settings for other databases.+# 2. Create an empty Oracle database.+# 3. Change the property "hibernate.connection.url", "hibernate.connection.username",+# and "hibernate.connection.password" so that @productName@ can connect and write to+# the database created in step 3.+# 4. Change property "hibernate.dialect" based on different Oracle versions:+# 5.1 Use value "org.hibernate.dialect.Oracle9iDialect" if Oracle9i is used.+# 5.2 Use value "org.hibernate.dialect.Oracle8iDialect" if Oracle8i is used.+# 5.3 Use value "org.hibernate.dialect.Oracle10gDialect" if Oracle10g or 11g is+# used.+#----------------------------------------------------------------------------------++#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect+#hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver+#hibernate.connection.url=jdbc:oracle:thin:@localhost:1521:XE+#hibernate.connection.username=gitplex+#hibernate.connection.password=gitplex+++hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider++hibernate.hikari.transactionIsolation=TRANSACTION_READ_COMMITTED+hibernate.hikari.autoCommit=false+hibernate.hikari.minimumIdle=5+hibernate.hikari.maximumPoolSize=25++hibernate.show_sql=false+hibernate.format_sql=true+hibernate.use_sql_comments=true++javax.persistence.validation.mode=none+hibernate.validator.apply_to_ddl=false++hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory+hibernate.cache.use_query_cache=truediff --git a/server.rest/pom.xml b/server.rest/pom.xmlindex 9bc8a061f5..dc0c3bb566 100644--- a/server.rest/pom.xml+++ b/server.rest/pom.xml@@ -1,53 +1,52 @@-<?xml version="1.0" encoding="UTF-8"?>--<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">- <modelVersion>4.0.0</modelVersion>- <artifactId>server.rest</artifactId>- <version>1.0-EAP-build4</version>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- </plugins>- </build>- <dependencies>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.core</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- </dependencies>- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>- <properties>- <moduleClass>com.gitplex.server.rest.RestModule</moduleClass>- </properties>-</project>+<?xml version="1.0" encoding="UTF-8"?>++<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">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server.rest</artifactId>+ <parent>+ <groupId>com.gitplex</groupId>+ <artifactId>server</artifactId>+ <version>1.0-EAP-build4</version>+ </parent>+ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ </plugins>+ </build>+ <dependencies>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.core</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ </dependencies>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>+ <properties>+ <moduleClass>com.gitplex.server.rest.RestModule</moduleClass>+ </properties>+</project>diff --git a/server.search/pom.xml b/server.search/pom.xmlindex 7335fbdea1..2f4ed75a7f 100644--- a/server.search/pom.xml+++ b/server.search/pom.xml@@ -1,105 +1,104 @@-<?xml version="1.0" encoding="UTF-8"?>--<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">- <modelVersion>4.0.0</modelVersion>- <artifactId>server.search</artifactId>- <version>1.0-EAP-build4</version>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- <plugin>- <groupId>org.antlr</groupId>- <artifactId>antlr4-maven-plugin</artifactId>- <configuration>- <visitor>true</visitor>- </configuration>- </plugin>- </plugins>- </build>- <dependencies>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.core</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- <dependency>- <artifactId>lucene-core</artifactId>- <groupId>org.apache.lucene</groupId>- <type>jar</type>- <version>${luceneVersion}</version>- </dependency>- <dependency>- <artifactId>lucene-queries</artifactId>- <groupId>org.apache.lucene</groupId>- <type>jar</type>- <version>${luceneVersion}</version>- </dependency>- <dependency>- <artifactId>lucene-queryparser</artifactId>- <groupId>org.apache.lucene</groupId>- <type>jar</type>- <version>${luceneVersion}</version>- </dependency>- <dependency>- <artifactId>lucene-analyzers-common</artifactId>- <groupId>org.apache.lucene</groupId>- <type>jar</type>- <version>${luceneVersion}</version>- </dependency>- <dependency>- <artifactId>lucene-facet</artifactId>- <groupId>org.apache.lucene</groupId>- <type>jar</type>- <version>${luceneVersion}</version>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons.loader</artifactId>- <version>1.0.0</version>- <type>test-jar</type>- <scope>test</scope>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>commons.git</artifactId>- <version>1.0.0</version>- <type>test-jar</type>- <scope>test</scope>- </dependency>- </dependencies>- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>- <properties>- <moduleClass>com.gitplex.server.search.SearchModule</moduleClass>- <luceneVersion>4.10.3</luceneVersion>- </properties>-</project>+<?xml version="1.0" encoding="UTF-8"?>++<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">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server.search</artifactId>+ <parent>+ <groupId>com.gitplex</groupId>+ <version>1.0-EAP-build4</version>+ <artifactId>server</artifactId>+ </parent>+ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ <plugin>+ <groupId>org.antlr</groupId>+ <artifactId>antlr4-maven-plugin</artifactId>+ <configuration>+ <visitor>true</visitor>+ </configuration>+ </plugin>+ </plugins>+ </build>+ <dependencies>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.core</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ <dependency>+ <artifactId>lucene-core</artifactId>+ <groupId>org.apache.lucene</groupId>+ <type>jar</type>+ <version>${luceneVersion}</version>+ </dependency>+ <dependency>+ <artifactId>lucene-queries</artifactId>+ <groupId>org.apache.lucene</groupId>+ <type>jar</type>+ <version>${luceneVersion}</version>+ </dependency>+ <dependency>+ <artifactId>lucene-queryparser</artifactId>+ <groupId>org.apache.lucene</groupId>+ <type>jar</type>+ <version>${luceneVersion}</version>+ </dependency>+ <dependency>+ <artifactId>lucene-analyzers-common</artifactId>+ <groupId>org.apache.lucene</groupId>+ <type>jar</type>+ <version>${luceneVersion}</version>+ </dependency>+ <dependency>+ <artifactId>lucene-facet</artifactId>+ <groupId>org.apache.lucene</groupId>+ <type>jar</type>+ <version>${luceneVersion}</version>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.loader</artifactId>+ <version>1.0.0</version>+ <type>test-jar</type>+ <scope>test</scope>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>commons.git</artifactId>+ <version>1.0.0</version>+ <type>test-jar</type>+ <scope>test</scope>+ </dependency>+ </dependencies>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>+ <properties>+ <moduleClass>com.gitplex.server.search.SearchModule</moduleClass>+ <luceneVersion>4.10.3</luceneVersion>+ </properties>+</project>diff --git a/server.web/pom.xml b/server.web/pom.xmlindex e9a1389c12..43c8feae4d 100644--- a/server.web/pom.xml+++ b/server.web/pom.xml@@ -1,90 +1,89 @@-<?xml version="1.0" encoding="UTF-8"?>--<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">- <modelVersion>4.0.0</modelVersion>- <artifactId>server.web</artifactId>- <version>1.0-EAP-build4</version>- <parent>- <groupId>com.gitplex</groupId>- <artifactId>parent.general</artifactId>- <version>1.0.0</version>- </parent>- <build>- <plugins>- <plugin>- <groupId>com.gitplex</groupId>- <artifactId>plugin.maven</artifactId>- </plugin>- <plugin>- <artifactId>maven-source-plugin</artifactId>- </plugin>- <plugin>- <artifactId>maven-javadoc-plugin</artifactId>- </plugin>- <plugin>- <groupId>org.antlr</groupId>- <artifactId>antlr4-maven-plugin</artifactId>- </plugin>- </plugins>- </build>- <dependencies>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.core</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.rest</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- <!-- JERSEY CLIENT -->- <dependency>- <groupId>org.glassfish.jersey.core</groupId>- <artifactId>jersey-client</artifactId>- <version>${jerseyVersion}</version>- </dependency>- <dependency>- <groupId>commons-fileupload</groupId>- <artifactId>commons-fileupload</artifactId>- <version>1.3</version>- </dependency>- <dependency>- <groupId>commons-validator</groupId>- <artifactId>commons-validator</artifactId>- <version>1.4.0</version>- </dependency>- <dependency>- <groupId>org.ocpsoft.prettytime</groupId>- <artifactId>prettytime</artifactId>- <version>3.2.4.Final</version>- </dependency>- <dependency>- <groupId>com.gitplex</groupId>- <artifactId>server.search</artifactId>- <version>1.0-EAP-build4</version>- </dependency>- </dependencies>- <repositories>- <repository>- <id>gitplexRepo</id>- <name>GitPlex Repository</name>- <releases>- <enabled>true</enabled>- <updatePolicy>never</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </releases>- <snapshots>- <enabled>true</enabled>- <updatePolicy>always</updatePolicy>- <checksumPolicy>fail</checksumPolicy>- </snapshots>- <url>http://artifact.gitplex.com/</url>- </repository>- </repositories>- <properties>- <moduleClass>com.gitplex.server.web.WebModule</moduleClass>- <tika.version>1.4</tika.version>- <wikitext.version>2.0.0</wikitext.version>- </properties>-</project>+<?xml version="1.0" encoding="UTF-8"?>++<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">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server.web</artifactId>+ <parent>+ <groupId>com.gitplex</groupId>+ <version>1.0-EAP-build4</version>+ <artifactId>server</artifactId>+ </parent>+ <build>+ <plugins>+ <plugin>+ <groupId>com.gitplex</groupId>+ <artifactId>plugin.maven</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-source-plugin</artifactId>+ </plugin>+ <plugin>+ <artifactId>maven-javadoc-plugin</artifactId>+ </plugin>+ <plugin>+ <groupId>org.antlr</groupId>+ <artifactId>antlr4-maven-plugin</artifactId>+ </plugin>+ </plugins>+ </build>+ <dependencies>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.core</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.rest</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ <!-- JERSEY CLIENT -->+ <dependency>+ <groupId>org.glassfish.jersey.core</groupId>+ <artifactId>jersey-client</artifactId>+ <version>${jerseyVersion}</version>+ </dependency>+ <dependency>+ <groupId>commons-fileupload</groupId>+ <artifactId>commons-fileupload</artifactId>+ <version>1.3</version>+ </dependency>+ <dependency>+ <groupId>commons-validator</groupId>+ <artifactId>commons-validator</artifactId>+ <version>1.4.0</version>+ </dependency>+ <dependency>+ <groupId>org.ocpsoft.prettytime</groupId>+ <artifactId>prettytime</artifactId>+ <version>3.2.4.Final</version>+ </dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>server.search</artifactId>+ <version>1.0-EAP-build4</version>+ </dependency>+ </dependencies>+ <repositories>+ <repository>+ <id>gitplexRepo</id>+ <name>GitPlex Repository</name>+ <releases>+ <enabled>true</enabled>+ <updatePolicy>never</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </releases>+ <snapshots>+ <enabled>true</enabled>+ <updatePolicy>always</updatePolicy>+ <checksumPolicy>fail</checksumPolicy>+ </snapshots>+ <url>http://artifact.pmease.com/</url>+ </repository>+ </repositories>+ <properties>+ <moduleClass>com.gitplex.server.web.WebModule</moduleClass>+ <tika.version>1.4</tika.version>+ <wikitext.version>2.0.0</wikitext.version>+ </properties>+</project>