8.0.0 release

Former-commit-id: 12368ce

ChangeLog

@@ -1,3 +1,8 @@
+17-JAN-2018: 8.0.0
+
+- New Google repository structure
+- Uses Java 1.8
+
 16-JAN-2018: 7.9.8
 
 - Adds dark theme (beta)

README.md

@@ -19,7 +19,7 @@ The [mxGraph documentation](https://jgraph.github.io/mxgraph/) provides a lot of
 
 Running
 -------
-The simplest way to run draw.io initially is to fork this project, [publish the master branch to GitHub pages](https://help.github.com/categories/github-pages-basics/) and the [pages sites](https://jgraph.github.io/drawio/war/index.html) will have the full editor functionality (sans the integrations).
+The simplest way to run draw.io initially is to fork this project, [publish the master branch to GitHub pages](https://help.github.com/categories/github-pages-basics/) and the [pages sites](https://jgraph.github.io/drawio/src/main/webapp/index.html) will have the full editor functionality (sans the integrations).
 
 The full packaged .war of the client and servlets is built when the project is tagged and available on the [releases page](https://github.com/jgraph/draw.io/releases).
 

VERSION

@@ -1 +1 @@
-7.9.8
+8.0.0

etc/build/build.properties

@@ -1,8 +1,7 @@
 jscompiler=${basedir}/compiler.jar
-grapheditor.dir=${basedir}/../../war/js/mxgraph
-src.dir=${basedir}/../../src
-war.dir=${basedir}/../../war
+grapheditor.dir=${basedir}/../../src/main/webapp/js/mxgraph
+src.dir=${basedir}/../../src/main/java
+war.dir=${basedir}/../../src/main/webapp
 javac.dir=${war.dir}/WEB-INF/classes
 build.dir=${basedir}/../../build
 war.name=draw.war
-imageexport.dir=${basedir}/../imageexport

etc/build/build.xml

@@ -12,8 +12,8 @@
 	    	</concat>
 
 		<java fork="false" classname="Xml2Js" classpath=".">
-			<arg value="../../war/stencils"/>
-			<arg value="../../war/js/stencils.min.js"/>
+			<arg value="../../src/main/webapp/stencils"/>
+			<arg value="../../src/main/webapp/js/stencils.min.js"/>
 		</java>
 
 		<jscomp compilationLevel="simple" debug="false" forceRecompile="true" output="${war.dir}/js/shapes.min.js">
@@ -285,8 +285,8 @@
 			</sources>
 		</jscomp>
 		<concat destfile="${war.dir}/js/vsdx.min.js" fixlastline="yes" append="yes">
-    		<fileset dir="${war.dir}/js/jszip" includes="**/*.min.js"/>
-    	</concat>
+	    		<fileset dir="${war.dir}/js/jszip" includes="**/*.min.js"/>
+	    	</concat>
 
 		<delete file="${basedir}/.tmp1.js"/>
 
@@ -367,18 +367,12 @@
 	<!-- ================== Stand-alone war creation ============================= -->
 
 	<path id="javac.class.path">
-		<fileset dir="${war.dir}/WEB-INF/lib" includes="mxgraph-core.jar" />
-		<fileset dir="${basedir}/jars" includes="servlet-api.jar" />
-		<fileset dir="${basedir}/jars" includes="commons-codec-1.10.jar" />
-		<fileset dir="${basedir}/jars" includes="commons-fileupload-1.3.2.jar" />
-		<fileset dir="${basedir}/jars" includes="gson-2.7.jar" />
-		<fileset dir="${basedir}/jars" includes="commons-lang3-3.5.jar" />
-		<fileset dir="${basedir}/jars" includes="gae-stub-1.0.1.jar" />
+		<fileset dir="${war.dir}/WEB-INF/lib" />
 	</path>
 
 	<target name="javac" depends="app" description="Java compilation">
 		<mkdir dir="${javac.dir}"/>
-		<javac srcdir="${src.dir}" excludes="**/EmbedServlet2.java" encoding="utf-8" destdir="${javac.dir}" source="1.7" target="1.7" debug="true" debuglevel="lines,vars,source">
+		<javac includeantruntime="false" srcdir="${src.dir}" excludes="**/EmbedServlet2.java" destdir="${javac.dir}">
 			<classpath refid="javac.class.path" />
 		</javac>
 		<copy todir="${javac.dir}" file="${src.dir}/log4j.properties" />
@@ -391,10 +385,12 @@
 			<fileset dir="${build.dir}">
 			</fileset>
 		</delete>
+		<delete file="${basedir}/base.min.js"/>
+		<delete file="${basedir}/base-viewer.min.js"/>
 	</target>
 
 	<target name="war" depends="javac" description="Create the stand-alone war file">
-		<zip excludes="**/appengine*.jar,**/jsr*.jar,**/junit*.jar"  destfile="${build.dir}/${war.name}" basedir="${war.dir}" >
+		<zip destfile="${build.dir}/${war.name}" basedir="${war.dir}" >
 		</zip>
 	</target>
 

etc/propgen/README

@@ -2,3 +2,5 @@ Converts from .tsv files (downloaded from  eg. Google Spreadsheet) to .txt resou
 
 The resources for draw.io are here:
 https://docs.google.com/spreadsheet/ccc?key=0AmQEO36liL4FdDJLWVNMaVV2UmRKSnpXU09MYkdGbEE#gid=0
+
+Run ant build.xml to run the converter.

etc/propgen/build.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<project basedir="." default="run">
+
+	<target name="compile">
+		<mkdir dir="classes"/>
+		<javac includeantruntime="false" srcdir="." destdir="classes"/>
+	</target>
+
+	<target name="run" depends="compile">
+		<java fork="true" classname="com.mxgraph.properties.PropGen">
+            <classpath>
+                <path location="classes"/>
+            </classpath>
+        </java>
+	</target>
+
+</project>