Skip to content

Commit

Permalink
technical update
Browse files Browse the repository at this point in the history
  • Loading branch information
hohwille committed Aug 10, 2024
1 parent e6199ff commit 5338dba
Show file tree
Hide file tree
Showing 5 changed files with 160 additions and 153 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
* eol=lf
*.bat eol=crlf
*.png binary
*.zip binary
*.tgz binary
*.tar binary
*.bz2 binary
*.gz binary
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.*
!.github
!.gitignore
!.gitattributes
!.mvn
!.travis.yml
*.bak
*.log
*.diff
*.patch
*.iml
target
eclipse-target
war
war
3 changes: 1 addition & 2 deletions fx/src/main/java/io/github/mmm/ui/demo/fx/UiDemoFx.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import io.github.mmm.ui.api.controller.UiNavigationManager;
import io.github.mmm.ui.fx.FxApplication;
import io.github.mmm.ui.spi.controller.AbstractUiNavigationManager;
import javafx.application.Application;

/**
* {@link FxApplication} for to run this UI demo with JavaFx.
Expand All @@ -23,7 +22,7 @@ public void start() {
*/
public static void main(String[] args) {

Application.launch(UiDemoFx.class, args);
launch(args);
}

}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.m-m-m</groupId>
<artifactId>mmm</artifactId>
<version>22</version>
<version>23</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
296 changes: 148 additions & 148 deletions tvm/pom.xml
Original file line number Diff line number Diff line change
@@ -1,148 +1,148 @@
<?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>
<parent>
<groupId>io.github.m-m-m</groupId>
<artifactId>mmm-ui-demo</artifactId>
<version>${revision}</version>
</parent>

<artifactId>mmm-ui-demo-tvm</artifactId>
<packaging>war</packaging>

<properties>
<tvm.minifying>true</tvm.minifying>
<tvm.debug.information>false</tvm.debug.information>
<tvm.source.maps>false</tvm.source.maps>
<tvm.optimization>ADVANCED</tvm.optimization>
<teavm.version>0.10.0-dev-7</teavm.version>
</properties>

<dependencies>
<!-- Emulator of Java class library for TeaVM -->
<dependency>
<groupId>org.teavm</groupId>
<artifactId>teavm-classlib</artifactId>
<scope>provided</scope>
</dependency>

<!-- JavaScriptObjects (JSO) - a JavaScript binding for TeaVM -->
<dependency>
<groupId>org.teavm</groupId>
<artifactId>teavm-jso-apis</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.teavm</groupId>
<artifactId>teavm-extras-slf4j</artifactId>
<scope>provided</scope>
</dependency>

<!-- Servlet API -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mmm-ui-demo-shared</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mmm-ui-tvm-all</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<!-- Configure WAR plugin to include JavaScript files generated by TeaVM -->
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>${project.artifactId}</warName>
<webResources>
<resource>
<directory>${project.build.directory}/generated/js</directory>
</resource>
</webResources>
</configuration>
</plugin>

<!-- Configure TeaVM -->
<plugin>
<groupId>org.teavm</groupId>
<artifactId>teavm-maven-plugin</artifactId>
<version>${teavm.version}</version>
<executions>
<execution>
<id>web-client</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
<mainClass>io.github.mmm.ui.demo.tvm.UiDemoTvm</mainClass>
<minifying>${tvm.minifying}</minifying>
<debugInformationGenerated>${tvm.debug.information}</debugInformationGenerated>
<sourceMapsGenerated>${tvm.source.maps}</sourceMapsGenerated>
<!-- <sourceFilesCopied>true</sourceFilesCopied> -->
<optimizationLevel>${tvm.optimization}</optimizationLevel>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>dev</id>
<activation>
<property>
<name>dev</name>
</property>
</activation>
<properties>
<tvm.minifying>false</tvm.minifying>
<tvm.source.maps>true</tvm.source.maps>
<tvm.debug.information>true</tvm.debug.information>
<tvm.optimization>SIMPLE</tvm.optimization>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>download-sources</id>
<phase>process-sources</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
<execution>
<id>extract-sources</id>
<phase>process-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<outputDirectory>
${project.build.directory}/generated/js/teavm/src</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</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>
<parent>
<groupId>io.github.m-m-m</groupId>
<artifactId>mmm-ui-demo</artifactId>
<version>${revision}</version>
</parent>

<artifactId>mmm-ui-demo-tvm</artifactId>
<packaging>war</packaging>

<properties>
<tvm.minifying>true</tvm.minifying>
<tvm.debug.information>false</tvm.debug.information>
<tvm.source.maps>false</tvm.source.maps>
<tvm.optimization>ADVANCED</tvm.optimization>
<teavm.version>0.10.0-dev-12</teavm.version>
</properties>

<dependencies>
<!-- Emulator of Java class library for TeaVM -->
<dependency>
<groupId>org.teavm</groupId>
<artifactId>teavm-classlib</artifactId>
<scope>provided</scope>
</dependency>

<!-- JavaScriptObjects (JSO) - a JavaScript binding for TeaVM -->
<dependency>
<groupId>org.teavm</groupId>
<artifactId>teavm-jso-apis</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.teavm</groupId>
<artifactId>teavm-extras-slf4j</artifactId>
<scope>provided</scope>
</dependency>

<!-- Servlet API -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mmm-ui-demo-shared</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mmm-ui-tvm-all</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<!-- Configure WAR plugin to include JavaScript files generated by TeaVM -->
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>${project.artifactId}</warName>
<webResources>
<resource>
<directory>${project.build.directory}/generated/js</directory>
</resource>
</webResources>
</configuration>
</plugin>

<!-- Configure TeaVM -->
<plugin>
<groupId>org.teavm</groupId>
<artifactId>teavm-maven-plugin</artifactId>
<version>${teavm.version}</version>
<executions>
<execution>
<id>web-client</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
<mainClass>io.github.mmm.ui.demo.tvm.UiDemoTvm</mainClass>
<minifying>${tvm.minifying}</minifying>
<debugInformationGenerated>${tvm.debug.information}</debugInformationGenerated>
<sourceMapsGenerated>${tvm.source.maps}</sourceMapsGenerated>
<!-- <sourceFilesCopied>true</sourceFilesCopied> -->
<optimizationLevel>${tvm.optimization}</optimizationLevel>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>dev</id>
<activation>
<property>
<name>dev</name>
</property>
</activation>
<properties>
<tvm.minifying>false</tvm.minifying>
<tvm.source.maps>true</tvm.source.maps>
<tvm.debug.information>true</tvm.debug.information>
<tvm.optimization>SIMPLE</tvm.optimization>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>download-sources</id>
<phase>process-sources</phase>
<goals>
<goal>sources</goal>
</goals>
</execution>
<execution>
<id>extract-sources</id>
<phase>process-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<classifier>sources</classifier>
<outputDirectory>
${project.build.directory}/generated/js/teavm/src</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit 5338dba

Please sign in to comment.