Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed jpa enhancing. Project boots up in debug mode. #3

Merged
merged 1 commit into from
Nov 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
221 changes: 96 additions & 125 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,24 @@
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>


<groupId>com.sencha.gxt</groupId>
<artifactId>gxt-demo-desktop</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Sencha Desktop Demo</name>

<properties>
<properties>
<!-- GXT -->
<gxt.version>4.0.2</gxt.version>
<gxt.version>4.0.3-SNAPSHOT</gxt.version>

<!-- GWT -->
<gwt.version>2.8.2</gwt.version>
<gwt.plugin.version>2.8.2</gwt.plugin.version>
<gwt.maven.version>2.8.2</gwt.maven.version>
<gwt.style>OBF</gwt.style>

<!-- Maven -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>

<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
</properties>

<build>
Expand All @@ -41,8 +37,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<fork>true</fork>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

Expand All @@ -69,7 +66,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>${gwt.plugin.version}</version>
<version>${gwt.maven.version}</version>
<configuration>
<strict>true</strict>

Expand All @@ -78,14 +75,14 @@
<excludes>**/*GwtTest.java</excludes>
<mode>htmlunit</mode>

<extraJvmArgs>-Xss1024K -Xmx1G -XX:MaxPermSize=256M</extraJvmArgs>
<extraJvmArgs>-Xss1024K -Xmx1g -XX:MaxPermSize=256M</extraJvmArgs>
<logLevel>INFO</logLevel>
<style>${gwt.style}</style>

<copyWebapp>true</copyWebapp>
<hostedWebapp>${webappDirectory}</hostedWebapp>

<runTarget>MyGxtProject40.html</runTarget>
<runTarget>desktop.html</runTarget>
<modules>
<module>com.sencha.gxt.examples.resources.Resources</module>
<module>com.sencha.gxt.desktop.Desktop</module>
Expand All @@ -95,34 +92,11 @@
<executions>
<execution>
<goals>
<goal>test</goal>
<goal>compile</goal>
<goal>test</goal>
</goals>
</execution>
</executions>

<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${gwt.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${gwt.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-codeserver</artifactId>
<version>${gwt.version}</version>
<scope>compile</scope>
</dependency>

</dependencies>
</plugin>

<plugin>
Expand All @@ -132,12 +106,12 @@
<configuration>
<includes>**/server/data/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
<!-- <toolProperties>
<toolProperties>
<property>
<name>directory</name>
<value>${project.build.directory}/classes</value>
<value>${project.build.outputDirectory}</value>
</property>
</toolProperties> -->
</toolProperties>
</configuration>
<executions>
<execution>
Expand All @@ -152,16 +126,12 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>2.1.0</version>
<version>2.4.2</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -171,6 +141,38 @@
</dependency>
</dependencies>
</plugin>

<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<!-- Provide a classes jar for source in the dist zip -->
<attachClasses>true</attachClasses>
<webResources>
<resource>
<filtering>true</filtering>
<directory>src/main/webapp</directory>
<includes>
<include>**/*.html</include>
</includes>
</resource>
</webResources>
<packagingExcludes>WEB-INF/deploy/**</packagingExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
Expand Down Expand Up @@ -227,82 +229,51 @@
</pluginManagement>
</build>

<repositories>
<repository>
<id>JBoss Repo</id>
<url>https://repository.jboss.org/nexus/content/repositories/releases</url>
<name>JBoss Repo</name>
</repository>
<repository>
<id>apache-snapshots</id>
<url>http://people.apache.org/repo/m2-incubating-repository</url>
</repository>
<repository>
<id>repo2-maven2</id>
<url>http://repo2.maven.org/maven2</url>
</repository>
<repository>
<id>sonatype.snapshots</id>
<name>Sonatype snapshot repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<layout>default</layout>
</repository>
<repository>
<!-- http://docs.sencha.com/gxt/3.1/getting_started/maven/Maven.html -->
<!-- ~/.m2/settings.xml add <server/> with the support portal credentials -->
<id>sencha-gxt-repository</id>
<name>Sencha GXT Repository</name>

<!-- Commercial (with Support) -->
<!-- <url>https://maven.sencha.com/repo/gxt-commercial-release</url> -->
<url>https://maven.sencha.com/repo/gxt-support-commercial-release</url>
<!-- <url>https://maven.sencha.com/repo/gxt-commercial-release-staging</url> -->


<!-- GPL -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-release</url> -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-snapshot</url> -->

<!-- GPL with Support -->
<!-- <url>https://maven.sencha.com/repo/gxt-support-gpl-release</url> -->

<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<!-- Maven Exec, it uses the theme builder -->
<pluginRepositories>
<pluginRepository>
<!-- http://docs.sencha.com/gxt/3.1/getting_started/maven/Maven.html -->
<!-- ~/.m2/settings.xml add <server/> with the support portal credentials -->
<id>sencha-gxt-repository</id>
<name>Sencha GXT Repository</name>

<!-- Commercial (with Support) -->
<!-- <url>https://maven.sencha.com/repo/gxt-commercial-release</url> -->
<url>https://maven.sencha.com/repo/gxt-support-commercial-release</url>
<!-- <url>https://maven.sencha.com/repo/gxt-commercial-release-staging</url> -->


<!-- GPL -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-release</url> -->
<!-- <url>https://maven.sencha.com/repo/gxt-gpl-snapshot</url> -->

<!-- GPL with Support -->
<!-- <url>https://maven.sencha.com/repo/gxt-support-gpl-release</url> -->
</pluginRepository>

<!-- GWT plugin snapshot repo -->
<!-- <pluginRepository> <id>google-snapshots</id> <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
<releases> <enabled>false</enabled> </releases> <snapshots> <enabled>true</enabled> </snapshots> </pluginRepository> -->
</pluginRepositories>
<profiles>
<profile>
<id>fast-build</id>
<properties>
<profile.fast.build>
&lt;set-property name="user.agent" value="safari" /&gt;
&lt;set-property
name="gxt.user.agent" value="chrome" /&gt;
&lt;set-property name="gxt.device" value="desktop" /&gt;
&lt;set-property name="gxt.theme" value="triton" /&gt; </profile.fast.build>
</properties>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
<filtering>true</filtering>
<includes>
<include>**/*.gwt.xml</include>
</includes>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<encoding>UTF-8</encoding>
<delimiters>&lt;!--{*}--&gt;</delimiters>
</configuration>
</plugin>
</plugins>
</build>
</profile>

</profiles>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
Expand Down Expand Up @@ -343,11 +314,17 @@
<version>${gxt.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sencha.gxt</groupId>
<artifactId>gxt-theme-triton</artifactId>
<version>${gxt.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.4.0</version>
<version>2.0.0</version>
</dependency>

<!-- Support for our JPA persistence -->
Expand Down Expand Up @@ -393,12 +370,6 @@
<artifactId>gxt-driver</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
18 changes: 0 additions & 18 deletions src/main/java/META-INF/persistence.xml

This file was deleted.

3 changes: 3 additions & 0 deletions src/main/java/com/sencha/gxt/desktop/Desktop.gwt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
<replace-with class="com.sencha.gxt.desktop.client.theme.base.taskbutton.TaskButtonCellDefaultAppearance">
<when-type-is class="com.sencha.gxt.desktop.client.widget.TaskButtonCell.TaskButtonCellAppearance" />
</replace-with>

<!-- The property below is replaced from maven profile mvn install -Pfast-build -->
<!--{profile.fast.build}-->
</module>
3 changes: 3 additions & 0 deletions src/main/java/com/sencha/gxt/desktopapp/DesktopApp.gwt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@
<!-- group ie -->
<collapse-property name="gxt.user.agent" values="ie8, ie9, ie10" />
<collapse-property name="user.agent" values="ie*" />

<!-- The property below is replaced from maven profile mvn install -Pfast-build -->
<!--{profile.fast.build}-->
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@
<!-- Specify the paths for translatable code -->
<source path='client' />
<source path='shared' />

<!-- The property below is replaced from maven profile mvn install -Pfast-build -->
<!--{profile.fast.build}-->
</module>