mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-25 15:37:56 +01:00
Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts: wise-editor/src/main/webapp/js/less.js wise-webapp/pom.xml wise-webapp/src/main/webapp/js/less.js
This commit is contained in:
Ezequiel Bergamaschi
commit
72a47b76bb
16
mindplot/src/main/javascript/libraries/less/less-1.6.2.min.js
vendored
Normal file
16
mindplot/src/main/javascript/libraries/less/less-1.6.2.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -27,5 +27,62 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
|
<artifactId>jetty-maven-plugin</artifactId>
|
||||||
|
<version>8.1.14.v20131031</version>
|
||||||
|
<configuration>
|
||||||
|
<connectors>
|
||||||
|
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
|
||||||
|
<port>8080</port>
|
||||||
|
<maxIdleTime>60000</maxIdleTime>
|
||||||
|
</connector>
|
||||||
|
</connectors>
|
||||||
|
<webApp>${project.build.directory}/wise-editor-${com.wisemapping.version}.war</webApp>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-war-plugin</artifactId>
|
||||||
|
<version>2.1.1</version>
|
||||||
|
<configuration>
|
||||||
|
<warSourceExcludes>js/mindplot-min.js</warSourceExcludes>
|
||||||
|
<overlays>
|
||||||
|
<overlay>
|
||||||
|
<groupId>org.wisemapping</groupId>
|
||||||
|
<artifactId>core-js</artifactId>
|
||||||
|
<type>jar</type>
|
||||||
|
<targetPath>js</targetPath>
|
||||||
|
<includes>
|
||||||
|
<include>*.js</include>
|
||||||
|
</includes>
|
||||||
|
</overlay>
|
||||||
|
<overlay>
|
||||||
|
<groupId>org.wisemapping</groupId>
|
||||||
|
<artifactId>mindplot</artifactId>
|
||||||
|
<type>jar</type>
|
||||||
|
<targetPath>css</targetPath>
|
||||||
|
<includes>
|
||||||
|
<include>**/*.css</include>
|
||||||
|
<include>**/*.html</include>
|
||||||
|
</includes>
|
||||||
|
</overlay>
|
||||||
|
<overlay>
|
||||||
|
<groupId>org.wisemapping</groupId>
|
||||||
|
<artifactId>mindplot</artifactId>
|
||||||
|
<type>jar</type>
|
||||||
|
<targetPath>js</targetPath>
|
||||||
|
<includes>
|
||||||
|
<include>*.js</include>
|
||||||
|
</includes>
|
||||||
|
</overlay>
|
||||||
|
</overlays>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
|
|
||||||
|
|
||||||
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
|
|
||||||
<Call name="addAliasCheck">
|
|
||||||
<Arg>
|
|
||||||
<New class="org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker"/>
|
|
||||||
</Arg>
|
|
||||||
</Call>
|
|
||||||
</Configure>
|
|
||||||
@ -553,17 +553,27 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty-maven-plugin</artifactId>
|
<artifactId>jetty-maven-plugin</artifactId>
|
||||||
<version>9.2.1.v20140609</version>
|
<version>8.1.14.v20131031</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<baseAppFirst>false</baseAppFirst>
|
<baseAppFirst>false</baseAppFirst>
|
||||||
<stopKey>foo</stopKey>
|
<stopKey>foo</stopKey>
|
||||||
<stopPort>9999</stopPort>
|
<stopPort>9999</stopPort>
|
||||||
<war>${project.build.directory}/wisemapping.war</war>
|
<war>${project.build.directory}/wisemapping.war</war>
|
||||||
<reload>automatic</reload>
|
<reload>automatic</reload>
|
||||||
<contextXml>${project.basedir}/jetty.xml</contextXml>
|
<webAppConfig>
|
||||||
|
<overrideDescriptor>${project.basedir}/webdefault.xml</overrideDescriptor>
|
||||||
|
</webAppConfig>
|
||||||
<systemProperties>
|
<systemProperties>
|
||||||
|
<systemProperty>
|
||||||
|
<name>org.mortbay.util.FileResource.checkAliases</name>
|
||||||
|
<value>false</value>
|
||||||
|
</systemProperty>
|
||||||
|
<systemProperty>
|
||||||
|
<name>org.mortbay.util.FileResource.checkAliases</name>
|
||||||
|
<value>false</value>
|
||||||
|
</systemProperty>
|
||||||
<systemProperty>
|
<systemProperty>
|
||||||
<name>database.base.url</name>
|
<name>database.base.url</name>
|
||||||
<value>${project.build.directory}</value>
|
<value>${project.build.directory}</value>
|
||||||
@ -603,9 +613,9 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<artifactItems>
|
<artifactItems>
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.mortbay.jetty</groupId>
|
||||||
<artifactId>jetty-runner</artifactId>
|
<artifactId>jetty-runner</artifactId>
|
||||||
<version>9.1.3.v20140225</version>
|
<version>7.4.5.v20110725</version>
|
||||||
<destFileName>jetty-runner.jar</destFileName>
|
<destFileName>jetty-runner.jar</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
</artifactItems>
|
</artifactItems>
|
||||||
|
|||||||
17
wise-webapp/webdefault.xml
Normal file
17
wise-webapp/webdefault.xml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||||
|
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
|
||||||
|
metadata-complete="false"
|
||||||
|
version="3.1">
|
||||||
|
|
||||||
|
|
||||||
|
<servlet>
|
||||||
|
<servlet-name>default</servlet-name>
|
||||||
|
<servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
|
||||||
|
<init-param>
|
||||||
|
<param-name>aliases</param-name>
|
||||||
|
<param-value>true</param-value>
|
||||||
|
</init-param>
|
||||||
|
</servlet>
|
||||||
|
</web-app>
|
||||||
Loading…
Reference in New Issue
Block a user