Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Split out wicket-war from wicket-ear branches * Remove whitespace * Use standard groupId and artifactId * Remove custom ear packaging * Default is skip for jboss-as plugin * Move all dependencyManagement to parent * Add deployable datasources * Generate application.xml * Use JBoss Java EE APIs exclusively * Remove redundant Local suffix from ContactDao * Use fields for JPA annotations * Don't use synthetic ID for equality and hash code, well known anti-pattern * Use CDI not EJB injections into Wicket (promote modern approaches) * Improve comments
- Loading branch information
Showing
34 changed files
with
399 additions
and
1,121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,73 @@ | ||
| <?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/maven-v4_0_0.xsd"> | ||
| <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/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.jboss.as.quickstart.wicket-ear</groupId> | ||
| <artifactId>as7-quickstart-wicket-ear-parent</artifactId> | ||
| <groupId>org.jboss.as.quickstarts</groupId> | ||
| <artifactId>jboss-as-wicket-ear-parent</artifactId> | ||
| <version>7.1.1-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>as7-quickstart-wicket-ear-ear</artifactId> | ||
|
|
||
| <artifactId>jboss-as-wicket-ear-ear</artifactId> | ||
| <packaging>ear</packaging> | ||
|
|
||
| <name>JBoss AS Quickstarts: Wicket EAR: EAR package</name> | ||
|
|
||
|
|
||
| <dependencies> | ||
|
|
||
| <!-- EJB JAR module. --> | ||
| <dependency> | ||
| <groupId>org.jboss.as.quickstarts</groupId> | ||
| <artifactId>jboss-as-wicket-ear-ejb</artifactId> | ||
| <type>ejb</type> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>as7-quickstart-wicket-ear-ejb</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- WAR module. --> | ||
| <dependency> | ||
| <groupId>org.jboss.as.quickstarts</groupId> | ||
| <artifactId>jboss-as-wicket-ear-war</artifactId> | ||
| <type>war</type> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>as7-quickstart-wicket-ear-war</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
|
|
||
|
|
||
| <build> | ||
| <plugins> | ||
|
|
||
| <!-- EAR archive creation. --> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-ear-plugin</artifactId> | ||
| <version>2.6</version> | ||
| <configuration> | ||
| <!-- Tell Maven we are using Java EE 6 --> | ||
| <version>6</version> | ||
| <!-- Use Java EE ear libraries as needed. Java EE ear | ||
| libraries are in easy way to package any libraries needed in the ear, and | ||
| automatically have any modules (EJB-JARs and WARs) use them --> | ||
| <defaultLibBundleDir>lib</defaultLibBundleDir> | ||
| <modules> | ||
| <webModule> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>as7-quickstart-wicket-ear-war</artifactId> | ||
| <bundleFileName>as7-quickstart-wicket-ear.war</bundleFileName> | ||
| <contextRoot>/jboss-as-wicket-ear</contextRoot> | ||
| </webModule> | ||
| <ejbModule> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>as7-quickstart-wicket-ear-ejb</artifactId> | ||
| <bundleFileName>as7-quickstart-wicket-ear-ejb.jar</bundleFileName> | ||
| </ejbModule> | ||
| <!-- Default context root of the web app is /jboss-as-wicket-ear-web. | ||
| If a custom context root is needed, uncomment the following snippet to register | ||
| our War as a web module and set the contextRoot property --> | ||
| <!-- <webModule> --> | ||
| <!-- <groupId>org.jboss.as.quickstarts</groupId> --> | ||
| <!-- <artifactId>jboss-as-wicket-ear-web</artifactId> --> | ||
| <!-- <contextRoot>/jboss-as-wicket</contextRoot> --> | ||
| <!-- </webModule> --> | ||
| </modules> | ||
| </configuration> | ||
| </plugin> | ||
| <!-- Skip JBoss AS plugin - only applicable for the EAR package. --> | ||
|
|
||
| <!-- Enable JBoss AS plugin - only applicable for the EAR package. --> | ||
| <plugin> | ||
| <groupId>org.jboss.as.plugins</groupId> | ||
| <artifactId>jboss-as-maven-plugin</artifactId> | ||
| <version>7.1.0.Final</version> | ||
| <configuration> | ||
| <skip>false</skip> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
21 changes: 21 additions & 0 deletions
21
wicket-ear/ear/src/main/application/META-INF/wicket-ear-quickstart-ds.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- This is an unmanaged datasource. It should be used for proofs of concept | ||
| or testing only. It uses H2, an in memory database that ships with JBoss | ||
| AS. --> | ||
| <datasources xmlns="http://www.jboss.org/ironjacamar/schema" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd"> | ||
| <!-- The datasource is bound into JNDI at this location. We reference | ||
| this in META-INF/persistence.xml --> | ||
| <datasource jndi-name="java:jboss/datasources/WicketEarQuickstartDS" | ||
| pool-name="wicket-ear-quickstart" enabled="true" | ||
| use-java-context="true"> | ||
| <connection-url>jdbc:h2:mem:wicket-ear-quickstart;DB_CLOSE_DELAY=-1</connection-url> | ||
| <driver>h2</driver> | ||
| <security> | ||
| <user-name>sa</user-name> | ||
| <password>sa</password> | ||
| </security> | ||
| </datasource> | ||
| </datasources> | ||
|
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.