Permalink
Browse files

merged in WebGL/3DCharts implementation

  • Loading branch information...
1 parent 034dd80 commit 86a3a67c23254efba5d2fb7843c9b1692c896188 Koen Deforche committed Dec 19, 2013
Showing with 52,738 additions and 1,925 deletions.
  1. +2 −0 .classpath
  2. +18 −5 README.md
  3. +2 −0 build.xml
  4. +3 −0 examples/features/miniwebgl/WebRoot/META-INF/MANIFEST.MF
  5. +20 −0 examples/features/miniwebgl/WebRoot/WEB-INF/web.xml
  6. +72 −0 examples/features/miniwebgl/build.xml
  7. +29 −0 examples/features/miniwebgl/src/eu/webtoolkit/jwt/examples/features/miniwebgl/MiniWebGL.java
  8. +77 −0 examples/features/miniwebgl/src/eu/webtoolkit/jwt/examples/features/miniwebgl/PaintWidget.java
  9. +3 −0 examples/webgl/WebRoot/META-INF/MANIFEST.MF
  10. +2 −0 examples/webgl/WebRoot/META-INF/context.xml
  11. +2 −0 examples/webgl/WebRoot/WEB-INF/context.xml
  12. +10 −0 examples/webgl/WebRoot/WEB-INF/jetty-web.xml
  13. +16 −0 examples/webgl/WebRoot/WEB-INF/web.xml
  14. BIN examples/webgl/WebRoot/pics/nowebgl.png
  15. +75 −0 examples/webgl/build.xml
  16. +317 −0 examples/webgl/src/eu/webtoolkit/jwt/examples/webgl/PaintWidget.java
  17. +121 −0 examples/webgl/src/eu/webtoolkit/jwt/examples/webgl/Teapot.java
  18. +28,224 −0 examples/webgl/src/eu/webtoolkit/jwt/examples/webgl/teapot.obj
  19. +3 −2 examples/widgetgallery/.classpath
  20. +3 −6 examples/widgetgallery/build.xml
  21. +82 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/CategoryDataSettings.java
  22. +260 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/ChartSettings.java
  23. +15 −6 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/CsvUtil.java
  24. +54 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/EquidistantGrid.java
  25. +104 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/GraphicsWidgets.java
  26. +258 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/GridDataSettings.java
  27. +4 −4 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/PaintingImagesWidget.java
  28. +110 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/PlaneData.java
  29. +74 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/PointsData.java
  30. +73 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/ScatterDataSettings.java
  31. +125 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/SombreroData.java
  32. +11 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/data/hor_plane.csv
  33. +11 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/data/isotope_decay.csv
  34. +29 −16 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/src.xml
  35. +121 −0 examples/widgetgallery/src/eu/webtoolkit/jwt/examples/widgetgallery/text.xml
  36. BIN lib/jogl/gluegen-rt.jar
  37. BIN lib/jogl/jogl-all.jar
  38. BIN lib/vecmath-1.5.2.jar
  39. +5 −0 src/eu/webtoolkit/jwt/Configuration.java
  40. +31 −0 src/eu/webtoolkit/jwt/JsArrayType.java
  41. +57 −0 src/eu/webtoolkit/jwt/Matrix2f.java
  42. +5 −5 src/eu/webtoolkit/jwt/StdGridLayoutImpl2.java
  43. +4 −4 src/eu/webtoolkit/jwt/StdWidgetItemImpl.java
  44. +448 −0 src/eu/webtoolkit/jwt/WAbstractGLImplementation.java
  45. +17 −2 src/eu/webtoolkit/jwt/WCanvasPaintDevice.java
  46. +2,987 −0 src/eu/webtoolkit/jwt/WClientGLWidget.java
  47. +9 −0 src/eu/webtoolkit/jwt/WEnvironment.java
  48. +2,730 −0 src/eu/webtoolkit/jwt/WGLWidget.java
  49. +1 −1 src/eu/webtoolkit/jwt/WMemoryResource.java
  50. +10 −17 src/eu/webtoolkit/jwt/WPainter.java
  51. +11 −9 src/eu/webtoolkit/jwt/WPainterPath.java
  52. +1 −12 src/eu/webtoolkit/jwt/WRectF.java
  53. +1,979 −0 src/eu/webtoolkit/jwt/WServerGLWidget.java
  54. +8 −3 src/eu/webtoolkit/jwt/WSvgImage.java
  55. +22 −8 src/eu/webtoolkit/jwt/WTemplate.java
  56. +13 −8 src/eu/webtoolkit/jwt/WVmlImage.java
  57. +306 −0 src/eu/webtoolkit/jwt/WebGLUtils.java
  58. +5 −0 src/eu/webtoolkit/jwt/WebRenderer.java
  59. +9 −2 src/eu/webtoolkit/jwt/chart/Axis.java
  60. +34 −0 src/eu/webtoolkit/jwt/chart/AxisProperty.java
  61. +37 −42 src/eu/webtoolkit/jwt/chart/BarSeriesRenderer.java
  62. +13 −11 src/eu/webtoolkit/jwt/chart/LabelRenderIterator.java
  63. +17 −18 src/eu/webtoolkit/jwt/chart/LineSeriesRenderer.java
  64. +22 −22 src/eu/webtoolkit/jwt/chart/MarkerRenderIterator.java
  65. +45 −0 src/eu/webtoolkit/jwt/chart/Plane.java
  66. +45 −0 src/eu/webtoolkit/jwt/chart/Series3DType.java
  67. +1 −5 src/eu/webtoolkit/jwt/chart/SeriesIterator.java
  68. +14 −11 src/eu/webtoolkit/jwt/chart/SeriesRenderIterator.java
  69. +10 −8 src/eu/webtoolkit/jwt/chart/SeriesRenderer.java
  70. +33 −0 src/eu/webtoolkit/jwt/chart/TildeEndMarker.java
  71. +33 −0 src/eu/webtoolkit/jwt/chart/TildeStartMarker.java
  72. +2 −2 src/eu/webtoolkit/jwt/chart/WAbstractChart.java
  73. +47 −0 src/eu/webtoolkit/jwt/chart/WAbstractChartImplementation.java
  74. +193 −0 src/eu/webtoolkit/jwt/chart/WAbstractColorMap.java
  75. +639 −0 src/eu/webtoolkit/jwt/chart/WAbstractDataSeries3D.java
  76. +1,396 −0 src/eu/webtoolkit/jwt/chart/WAbstractGridData.java
  77. +477 −308 src/eu/webtoolkit/jwt/chart/WAxis.java
  78. +28 −0 src/eu/webtoolkit/jwt/chart/WAxis3D.java
  79. +2,727 −0 src/eu/webtoolkit/jwt/chart/WCartesian3DChart.java
  80. +1,176 −108 src/eu/webtoolkit/jwt/chart/WCartesianChart.java
  81. +83 −0 src/eu/webtoolkit/jwt/chart/WChart2DImplementation.java
  82. +0 −1,266 src/eu/webtoolkit/jwt/chart/WChart2DRenderer.java
  83. +184 −0 src/eu/webtoolkit/jwt/chart/WChart3DImplementation.java
  84. +518 −0 src/eu/webtoolkit/jwt/chart/WEquidistantGridData.java
  85. +620 −0 src/eu/webtoolkit/jwt/chart/WGridData.java
  86. +110 −0 src/eu/webtoolkit/jwt/chart/WLegend.java
  87. +103 −0 src/eu/webtoolkit/jwt/chart/WLegend3D.java
  88. +1 −1 src/eu/webtoolkit/jwt/chart/WPieChart.java
  89. +894 −0 src/eu/webtoolkit/jwt/chart/WScatterData.java
  90. +330 −0 src/eu/webtoolkit/jwt/chart/WStandardColorMap.java
  91. BIN src/eu/webtoolkit/jwt/chart/doc-files/Chart3DCombo.png
  92. BIN src/eu/webtoolkit/jwt/chart/doc-files/gridDataTypes.png
  93. BIN src/eu/webtoolkit/jwt/chart/doc-files/spiral.png
  94. BIN src/eu/webtoolkit/jwt/chart/doc-files/standardcolormaps.png
  95. +4 −4 src/eu/webtoolkit/jwt/render/Block.java
  96. +1 −1 src/eu/webtoolkit/jwt/render/Css21Lexer.java
  97. +1 −1 src/eu/webtoolkit/jwt/render/Css21Parser.java
  98. +20 −0 src/eu/webtoolkit/jwt/skeletons/Boot.js
  99. +8 −7 src/eu/webtoolkit/jwt/skeletons/Boot.min.js
  100. +16 −0 src/eu/webtoolkit/jwt/wt-resources/font-awesome/LICENSE.txt
  101. +1,203 −0 src/eu/webtoolkit/jwt/wt-resources/font-awesome/css/font-awesome-ie7.css
  102. +384 −0 src/eu/webtoolkit/jwt/wt-resources/font-awesome/css/font-awesome-ie7.min.css
  103. +1,479 −0 src/eu/webtoolkit/jwt/wt-resources/font-awesome/css/font-awesome.css
  104. +403 −0 src/eu/webtoolkit/jwt/wt-resources/font-awesome/css/font-awesome.min.css
  105. BIN src/eu/webtoolkit/jwt/wt-resources/font-awesome/font/FontAwesome.otf
  106. BIN src/eu/webtoolkit/jwt/wt-resources/font-awesome/font/fontawesome-webfont.eot
  107. +399 −0 src/eu/webtoolkit/jwt/wt-resources/font-awesome/font/fontawesome-webfont.svg
  108. BIN src/eu/webtoolkit/jwt/wt-resources/font-awesome/font/fontawesome-webfont.ttf
  109. BIN src/eu/webtoolkit/jwt/wt-resources/font-awesome/font/fontawesome-webfont.woff
View
@@ -5,6 +5,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-1.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/vecmath-1.5.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="lib/gson/gson-2.0.jar"/>
<classpathentry kind="lib" path="lib/http/httpclient-4.1.2.jar"/>
@@ -23,6 +24,7 @@
<classpathentry kind="lib" path="lib/junit-4.11.jar"/>
<classpathentry kind="lib" path="lib/pdfjet/pdfjet-4.75.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-all-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/jogl/jogl-all.jar"/>
<classpathentry kind="lib" path="lib/slf4j-simple-1.6.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -61,6 +61,9 @@ The corresponding dependency blocks are:
<version>2.5</version>
</dependency>
+There are a number of optional dependencies for JWt, needed only depending on what
+features you use
+
<!-- optional, for JWT Auth -->
<dependency>
<groupId>eu.webtoolkit</groupId>
@@ -82,14 +85,24 @@ The corresponding dependency blocks are:
<version>3.2</version>
</dependency>
+ <!-- optional, for server-side WebGL fallback -->
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all</artifactId>
+ <version>2.0-rc11</version>
+ </dependency>
+
+ <!-- optional, for server-side WebGL fallback -->
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-main</artifactId>
+ <version>2.0-rc11</version>
+ </dependency>
+
+ <!-- may be needed if your J2EE container doesn't provide this -->
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<version>1.8.1</version>
<scope>provided</scope>
</dependency>
-
-(Depending on the J2EE container, javax.mail may be included and provided
-by the container, and then the last dependency for
-org.apache.geronimo.javamail should be dropped)
-
View
@@ -22,6 +22,7 @@
<include name="lib/gson/*.jar"/>
<include name="lib/http/*.jar"/>
<include name="lib/jpa/*.jar"/>
+ <include name="lib/jogl/*.jar"/>
<include name="lib/servlet-api/*.jar"/>
<include name="lib/vt-password/*.jar"/>
<include name="lib/*.jar"/>
@@ -76,6 +77,7 @@
<include name="lib/gson/*.jar"/>
<include name="lib/http/*.jar"/>
<include name="lib/jpa/*.jar"/>
+ <include name="lib/jogl/*.jar"/>
<include name="lib/servlet-api/*.jar"/>
<include name="lib/vt-password/*.jar"/>
</fileset>
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <session-config>
+ <session-timeout>1</session-timeout>
+ </session-config>
+
+ <servlet>
+ <servlet-name>miniwebgl</servlet-name>
+ <servlet-class>eu.webtoolkit.jwt.examples.features.miniwebgl.MiniWebGL</servlet-class>
+ <async-supported>true</async-supported>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>miniwebgl</servlet-name>
+ <url-pattern>/miniwebgl/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
@@ -0,0 +1,72 @@
+<project name="jwt-miniwebgl" default="all" basedir=".">
+ <!-- Name of project and version -->
+ <property name="proj.name" value="jwt-miniwebgl"/>
+
+ <!-- Global properties for this build -->
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="build"/>
+ <property name="dist.dir" value="dist"/>
+ <property name="lib.dir" value="lib"/>
+ <property name="bin.dir" value="bin"/>
+
+ <property name="jwt.dir" value="../../../"/>
+
+ <!-- Classpath declaration -->
+ <path id="project.classpath">
+ <fileset dir=".">
+ </fileset>
+ <fileset dir="${jwt.dir}/dist">
+ </fileset>
+ </path>
+
+ <target name="all" depends="dist">
+ </target>
+
+ <!-- Clean up -->
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ <delete dir="${lib.dir}"/>
+ <delete dir="${bin.dir}"/>
+ </target>
+
+ <!-- Compile Java source -->
+ <target name="build">
+ <ant dir="${jwt.dir}" target="all" inheritAll="false"/>
+ <mkdir dir="${lib.dir}"/>
+
+ <copy todir="${lib.dir}">
+ <fileset dir="${jwt.dir}/dist" />
+ </copy>
+ <copy file="${jwt.dir}/servlet-lib/servlet-api-3.0.jar" todir="${lib.dir}"/>
+
+ <mkdir dir="${build.dir}"/>
+
+ <javac
+ srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ source="1.5"
+ target="1.5">
+ <classpath refid="project.classpath"/>
+ </javac>
+ </target>
+
+ <target name="dist" depends="build">
+
+ <mkdir dir="${dist.dir}"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${src.dir}"
+ includes="**/*.xml,**/*.properties,**/*.csv" />
+ </copy>
+
+ <war destfile="${dist.dir}/${proj.name}.war"
+ webxml="WebRoot/WEB-INF/web.xml">
+ <fileset dir="WebRoot"/>
+ <lib dir="${lib.dir}" includes="**/*.jar" excludes="servlet-api-*.jar">
+ </lib>
+ <classes dir="${build.dir}"/>
+ </war>
+ </target>
+</project>
@@ -0,0 +1,29 @@
+package eu.webtoolkit.jwt.examples.features.miniwebgl;
+
+import eu.webtoolkit.jwt.WApplication;
+import eu.webtoolkit.jwt.WBreak;
+import eu.webtoolkit.jwt.WEnvironment;
+import eu.webtoolkit.jwt.WText;
+import eu.webtoolkit.jwt.WtServlet;
+
+public class MiniWebGL extends WtServlet {
+ @Override
+ public WApplication createApplication(WEnvironment env) {
+ WApplication app = new WApplication(env);
+
+ app.setTitle("Minimalistic WebGL Demo");
+
+ new WText(
+ "This is a minimalistic demonstration "
+ + "application for WebGL. If your browser supports WebGL, you will "
+ + "see a black square with a triangle inside.",
+ app.getRoot());
+
+ new WBreak(app.getRoot());
+
+ PaintWidget gl = new PaintWidget(app.getRoot());
+ gl.resize(640, 640);
+
+ return app;
+ }
+}
@@ -0,0 +1,77 @@
+package eu.webtoolkit.jwt.examples.features.miniwebgl;
+
+import java.nio.FloatBuffer;
+
+import eu.webtoolkit.jwt.WContainerWidget;
+import eu.webtoolkit.jwt.WGLWidget;
+
+public class PaintWidget extends WGLWidget {
+ // This fragment shader simply paints white.
+ private String fragmentShaderSrc = "#ifdef GL_ES\n"
+ + "precision highp float;\n" + "#endif\n" + "\n"
+ + "void main(void) {\n" + " gl_FragColor = vec4(1, 1, 1, 1);\n"
+ + "}\n";
+
+ // This vertex shader does not transform at all
+ private String vertexShaderSrc = "attribute vec3 aVertexPosition;\n" + "\n"
+ + "void main(void) {\n"
+ + " gl_Position = vec4(aVertexPosition, 1.0);\n" + "}\n";
+
+ public PaintWidget(WContainerWidget root)
+ {
+ super(root);
+ }
+
+ public void initializeGL() {
+ // Create a shader
+ Shader fragmentShader = createShader(GLenum.FRAGMENT_SHADER);
+ shaderSource(fragmentShader, fragmentShaderSrc);
+ compileShader(fragmentShader);
+ Shader vertexShader = createShader(GLenum.VERTEX_SHADER);
+ shaderSource(vertexShader, vertexShaderSrc);
+ compileShader(vertexShader);
+ shaderProgram_ = createProgram();
+ attachShader(shaderProgram_, vertexShader);
+ attachShader(shaderProgram_, fragmentShader);
+ linkProgram(shaderProgram_);
+ useProgram(shaderProgram_);
+
+ // Extract the attribute location
+ vertexPositionAttribute_ = getAttribLocation(shaderProgram_,
+ "aVertexPosition");
+ enableVertexAttribArray(vertexPositionAttribute_);
+
+ // Now, preload the vertex buffer
+ triangleVertexPositionBuffer_ = createBuffer();
+ bindBuffer(GLenum.ARRAY_BUFFER, triangleVertexPositionBuffer_);
+ float trianglePosition[] = { 0.0f, 0.5f, 0.0f, -0.5f, -0.5f, 0.0f,
+ 0.5f, -0.5f, 0.0f };
+ bufferDatafv(GLenum.ARRAY_BUFFER, FloatBuffer.wrap(trianglePosition),
+ GLenum.STATIC_DRAW);
+ }
+
+ public void resizeGL(int width, int height) {
+ viewport(0, 0, width, height);
+ }
+
+ public void paintGL() {
+ // Drawing starts here!
+ clearColor(0, 0, 0, 1);
+ disable(GLenum.DEPTH_TEST);
+ disable(GLenum.CULL_FACE);
+ clear(GLenum.COLOR_BUFFER_BIT);
+
+ useProgram(shaderProgram_);
+
+ // Draw the scene
+ bindBuffer(GLenum.ARRAY_BUFFER, triangleVertexPositionBuffer_);
+ vertexAttribPointer(vertexPositionAttribute_, 3, GLenum.FLOAT, false,
+ 0, 0);
+ drawArrays(GLenum.TRIANGLES, 0, 3);
+ }
+
+ private Program shaderProgram_;
+ private AttribLocation vertexPositionAttribute_;
+
+ private Buffer triangleVertexPositionBuffer_;
+}
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
@@ -0,0 +1,2 @@
+<!-- for tomcat -->
+<Context cookies="false" />
@@ -0,0 +1,2 @@
+<!-- for jboss -->
+<Context cookies="false" />
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
+ "http://jetty.mortbay.org/configure.dtd">
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+ <Get name="sessionHandler">
+ <Get name="sessionManager">
+ <Set name="usingCookies" type="boolean">false</Set>
+ </Get>
+ </Get>
+</Configure>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <servlet>
+ <servlet-name>WebGL</servlet-name>
+ <display-name>JWt WebGL example</display-name>
+ <description>JWt WebGL example</description>
+ <servlet-class>eu.webtoolkit.jwt.examples.webgl.Teapot</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>WebGL</servlet-name>
+ <url-pattern>/webgl/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -0,0 +1,75 @@
+<project name="jwt-webgl" default="all" basedir=".">
+ <!-- Name of project and version -->
+ <property name="proj.name" value="jwt-webgl"/>
+
+ <!-- Global properties for this build -->
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="build"/>
+ <property name="dist.dir" value="dist"/>
+ <property name="lib.dir" value="lib"/>
+ <property name="jwt-lib.dir" value="lib/jwt-lib"/>
+ <property name="bin.dir" value="bin"/>
+
+ <property name="jwt.dir" value="../../"/>
+
+ <!-- Classpath declaration -->
+ <path id="project.classpath">
+ <fileset dir="." />
+ <fileset dir="${jwt.dir}/dist" />
+ <fileset dir="${jwt.dir}/lib" />
+ <fileset dir="${jwt.dir}/lib/servlet-api" />
+ </path>
+
+ <target name="all" depends="dist">
+ </target>
+
+ <!-- Clean up -->
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ <delete dir="${jwt-lib.dir}"/>
+ <delete dir="${bin.dir}"/>
+ </target>
+
+ <!-- Compile Java source -->
+ <target name="build">
+ <ant dir="${jwt.dir}" target="all" inheritAll="false"/>
+
+ <mkdir dir="${jwt-lib.dir}"/>
+ <copy todir="${jwt-lib.dir}">
+ <fileset dir="${jwt.dir}/dist" />
+ <fileset dir="${jwt.dir}/lib"
+ includes="*.jar servlet-api/*.jar"/>
+ </copy>
+
+ <mkdir dir="${build.dir}"/>
+
+ <javac
+ srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ source="1.5"
+ target="1.5">
+ <classpath refid="project.classpath"/>
+ </javac>
+ </target>
+
+ <target name="dist" depends="build">
+ <mkdir dir="${dist.dir}"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${src.dir}"
+ includes="**/*.xml,**/*.properties,**/*.csv" />
+ </copy>
+
+ <war destfile="${dist.dir}/${proj.name}.war"
+ webxml="WebRoot/WEB-INF/web.xml">
+ <fileset dir="WebRoot"/>
+ <lib dir="${jwt-lib.dir}"
+ includes="**/*.jar"
+ excludes="servlet-api-*.jar">
+ </lib>
+ <classes dir="${build.dir}"/>
+ </war>
+ </target>
+</project>
Oops, something went wrong.

0 comments on commit 86a3a67

Please sign in to comment.