proper formatting

This commit is contained in:
diego 2016-08-31 05:04:15 +02:00
parent 9b52b7a3ef
commit cfebd40b42
3 changed files with 167 additions and 168 deletions

View File

@ -1,136 +1,135 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung.wicket.examples</groupId> <groupId>com.baeldung.wicket.examples</groupId>
<artifactId>wicket-intro</artifactId> <artifactId>wicket-intro</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>WicketIntro</name> <name>WicketIntro</name>
<properties> <properties>
<wicket.version>7.4.0</wicket.version> <wicket.version>7.4.0</wicket.version>
<jetty9.version>9.2.13.v20150730</jetty9.version> <jetty9.version>9.2.13.v20150730</jetty9.version>
<log4j.version>2.5</log4j.version> <log4j.version>2.5</log4j.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<spring-web.version>4.1.1.RELEASE</spring-web.version> <spring-web.version>4.1.1.RELEASE</spring-web.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<wicket-spring.version>8.0.0-M1</wicket-spring.version> <wicket-spring.version>8.0.0-M1</wicket-spring.version>
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.6</maven-war-plugin.version> <maven-war-plugin.version>2.6</maven-war-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<wtp.version>none</wtp.version> <wtp.version>none</wtp.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- WICKET DEPENDENCIES --> <!-- WICKET DEPENDENCIES -->
<dependency> <dependency>
<groupId>org.apache.wicket</groupId> <groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId> <artifactId>wicket-core</artifactId>
<version>${wicket.version}</version> <version>${wicket.version}</version>
</dependency> </dependency>
<!-- SPRING DEPENDENCIES -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring-web.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
<version>${wicket-spring.version}</version>
</dependency>
<!-- JUNIT DEPENDENCY FOR TESTING --> <!-- SPRING DEPENDENCIES -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- JETTY DEPENDENCIES FOR TESTING --> <dependency>
<dependency> <groupId>org.springframework</groupId>
<groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>spring-web</artifactId>
<artifactId>jetty-all</artifactId> <version>${spring-web.version}</version>
<version>${jetty9.version}</version> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>javax.servlet</groupId>
</dependencies> <artifactId>javax.servlet-api</artifactId>
<build> <version>${javax.servlet-api.version}</version>
<finalName>WicketIntro</finalName> </dependency>
<resources> <dependency>
<resource> <groupId>org.apache.wicket</groupId>
<filtering>false</filtering> <artifactId>wicket-spring</artifactId>
<directory>src/main/resources</directory> <version>${wicket-spring.version}</version>
</resource> </dependency>
<resource>
<filtering>false</filtering>
<directory>src/main/java</directory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty9.version}</version>
<configuration>
<systemProperties>
<systemProperty>
<name>maven.project.build.directory.test-classes</name>
<value>${project.build.directory}/test-classes</value>
</systemProperty>
</systemProperties>
<jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
</configuration>
</plugin>
</plugins>
</build>
<repositories> <!-- JUNIT DEPENDENCY FOR TESTING -->
<repository> <dependency>
<id>Apache Nexus</id> <groupId>junit</groupId>
<url>https://repository.apache.org/content/repositories/snapshots/</url> <artifactId>junit</artifactId>
<releases> <version>${junit.version}</version>
<enabled>false</enabled> <scope>test</scope>
</releases> </dependency>
<snapshots>
<enabled>true</enabled> <!-- JETTY DEPENDENCIES FOR TESTING -->
</snapshots> <dependency>
</repository> <groupId>org.eclipse.jetty.aggregate</groupId>
</repositories> <artifactId>jetty-all</artifactId>
</project> <version>${jetty9.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>WicketIntro</finalName>
<resources>
<resource>
<filtering>false</filtering>
<directory>src/main/resources</directory>
</resource>
<resource>
<filtering>false</filtering>
<directory>src/main/java</directory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty9.version}</version>
<configuration>
<systemProperties>
<systemProperty>
<name>maven.project.build.directory.test-classes</name>
<value>${project.build.directory}/test-classes</value>
</systemProperty>
</systemProperties>
<jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>Apache Nexus</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project>

View File

@ -6,47 +6,47 @@
<style type="text/css" media="screen"> <style type="text/css" media="screen">
<!-- <!--
body { body {
margin: 0px margin: 0px
} }
#horizon { #horizon {
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 0px; left: 0px;
width: 100%; width: 100%;
height: 1px; height: 1px;
overflow: visible; overflow: visible;
visibility: visible; visibility: visible;
display: block display: block
} }
#content { #content {
font-family: Verdana, Geneva, Arial, sans-serif; font-family: Verdana, Geneva, Arial, sans-serif;
margin-left: -250px; margin-left: -250px;
position: absolute; position: absolute;
top: -35px; top: -35px;
left: 50%; left: 50%;
width: 500px; width: 500px;
height: 70px; height: 70px;
visibility: visible visibility: visible
} }
--> -->
</style> </style>
</head> </head>
<body> <body>
<div id="horizon"> <div id="horizon">
<div id="content"> <div id="content">
<div> <div>
<h3>Wicket Introduction Examples:</h3> <h3>Wicket Introduction Examples:</h3>
<wicket:link> <wicket:link>
<a href="helloworld/HelloWorld.html">Hello World!</a> <a href="helloworld/HelloWorld.html">Hello World!</a>
<br /> <br />
<br /> <br />
<a href="cafeaddress/CafeAddress.html">Cafes</a> <a href="cafeaddress/CafeAddress.html">Cafes</a>
</wicket:link> </wicket:link>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

View File

@ -5,11 +5,11 @@
<title>Cafes</title> <title>Cafes</title>
</head> </head>
<body> <body>
<div style="width: 800px; margin: 0 auto;"> <div style="width: 800px; margin: 0 auto;">
<select wicket:id="cafes"></select> <select wicket:id="cafes"></select>
<p> <p>
Address: <span wicket:id="address">address</span> Address: <span wicket:id="address">address</span>
</p> </p>
</div> </div>
</body> </body>
</html> </html>