QCADOOINTERNAL-531 remove jetty & default profile

qcadoo · Jun 7, 2017 · 9329b7c · 9329b7c
1 parent 126fc1d
commit 9329b7c
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 533 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,6 @@ mes-application/src/main/webapp/js/qcd.all.js
 release.properties
 pom.xml.releaseBackup
 bin
-mes-application/src/main/webapp/WEB-INF/jsp
 txt
 *.iml
 .idea/
diff --git a/mes-application/conf/default/app.properties b/mes-application/conf/default/app.properties
diff --git a/mes-application/conf/default/connectors.properties b/mes-application/conf/default/connectors.properties
diff --git a/mes-application/conf/default/db.properties b/mes-application/conf/default/db.properties
diff --git a/mes-application/conf/default/log4j.xml b/mes-application/conf/default/log4j.xml
diff --git a/mes-application/conf/default/mail.properties b/mes-application/conf/default/mail.properties
diff --git a/mes-application/conf/default/mailing.properties b/mes-application/conf/default/mailing.properties
diff --git a/mes-application/conf/default/report.properties b/mes-application/conf/default/report.properties
diff --git a/mes-application/pom.xml b/mes-application/pom.xml
@@ -332,50 +332,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>${jetty.version}</version>
-                <configuration>
-                    <scanTargets>
-                        <scanTarget>driver/</scanTarget>
-                    </scanTargets>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>QCADOO_CONF</name>
-                            <value>${basedir}/conf/${profile.name}</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>QCADOO_LOG</name>
-                            <value>${basedir}/target/logs</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>QCADOO_PLUGINS_TMP_PATH</name>
-                            <value>${basedir}/target/tmp</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>QCADOO_PLUGINS_PATH</name>
-                            <value>${basedir}/target/lib</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>QCADOO_WEBAPP_PATH</name>
-                            <value>${basedir}/src/main/webapp</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>QCADOO_RESTART_CMD</name>
-                            <value>${basedir}/restart.sh</value>
-                        </systemProperty>
-                    </systemProperties>
-                    <webAppConfig>
-                        <contextPath>/</contextPath>
-                        <baseResource implementation="org.mortbay.resource.ResourceCollection">
-                            <resourcesAsCSV>
-                                ${basedir}/src/main/webapp;
-                            </resourcesAsCSV>
-                        </baseResource>
-                    </webAppConfig>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>