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.

Sign up for GitHub

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

Migration to Wicket 6.0 #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Migration to Wicket 6.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8974a7
fixed POMs for Wicket 6.0
BugHunterPhilosopher Apr 11, 2013
7a0e008
migrated to Wicket 6.0
BugHunterPhilosopher Apr 11, 2013
36c9ef0
IN-PROGRESS: migration to Wicket 7
BugHunterPhilosopher Aug 23, 2015
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
6 changes: 2 additions & 4 deletions mistletoe-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.3</version>
<version>0.4</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -29,7 +29,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
</configuration>
<executions>
Expand All @@ -47,7 +46,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<forkMode>once</forkMode>
<reportFormat>plain</reportFormat>
Expand All @@ -64,4 +62,4 @@

</build>

</project>
</project>
67 changes: 34 additions & 33 deletions mistletoe-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
<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">

<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.3</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>mistletoe-servlet</artifactId>
<packaging>jar</packaging>
<name>Mistletoe servlet-based web-runner</name>

<url>http://mistletoe.qos.ch</url>
<description>Mistletoe wicket-based web-runner</description>

<dependencies>
<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-core</artifactId>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>

</dependencies>

<build>
</build>
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">

<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.4</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>mistletoe-servlet</artifactId>
<packaging>jar</packaging>
<name>Mistletoe servlet-based web-runner</name>

<url>http://mistletoe.qos.ch</url>
<description>Mistletoe wicket-based web-runner</description>

<dependencies>
<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-core</artifactId>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>

</dependencies>

<build>
</build>

</project>
59 changes: 29 additions & 30 deletions mistletoe-site/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,38 @@
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">

<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.3</version>
</parent>
<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.4</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<artifactId>mistletoe-site</artifactId>
<packaging>jar</packaging>
<name>Mistletoe Site</name>
<artifactId>mistletoe-site</artifactId>
<packaging>jar</packaging>
<name>Mistletoe Site</name>

<url>http://mistletoe.qos.ch</url>
<description>Mistletoe Site</description>
<url>http://mistletoe.qos.ch</url>
<description>Mistletoe Site</description>

<build>
<resources>
<resource>
<directory>src/site/pages</directory>
<targetPath>../../../target/site</targetPath>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<configuration>
<outputDirectory>${project.parent.basedir}/target/site</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
<build>
<resources>
<resource>
<directory>src/site/pages</directory>
<targetPath>../../../target/site</targetPath>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<outputDirectory>${project.parent.basedir}/target/site</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>

</project>
122 changes: 60 additions & 62 deletions mistletoe-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,62 @@
<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">

<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.3</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>mistletoe-test</artifactId>
<packaging>war</packaging>
<name>Mistletoe Wicket Test</name>


<dependencies>
<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-core</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-servlet</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-wicket</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>


</dependencies>


<build>
<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.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${maven-jetty-plugin.version}</version>
</plugin>
</plugins>
</build>
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">

<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.4</version>
</parent>

<modelVersion>4.0.0</modelVersion>

<artifactId>mistletoe-test</artifactId>
<packaging>war</packaging>
<name>Mistletoe Wicket Test</name>


<dependencies>
<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-core</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-servlet</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-wicket</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>


</dependencies>


<build>
<plugins>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
3 changes: 1 addition & 2 deletions mistletoe-wicket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ch.qos.mistletoe</groupId>
<artifactId>mistletoe-parent</artifactId>
<version>0.3</version>
<version>0.4</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -55,7 +55,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<forkMode>once</forkMode>
<reportFormat>plain</reportFormat>
Expand Down
1 change: 1 addition & 0 deletions mistletoe-wicket/src/main/java/ch/qos/mistletoe/wicket/SummaryMarkupContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ void handleNullTestReport() {
}

void handleTestReport(TestReport testReport) {
System.out.println("handleTestReport**");
Label runsSummary = new Label(Constants.RUNS_SUMMARY_ID, "Total tests: "
+ testReport.getTestCount());
add(runsSummary);
Expand Down
1 change: 1 addition & 0 deletions mistletoe-wicket/src/main/java/ch/qos/mistletoe/wicket/TestReportPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ void handle_NOT_OK_Description() {
exception.add(new AttributeModifier("class", "exception"));
parent.add(exception);
if (ex.getLines() > 50) {
System.out.println("ex.getLines() > 50");
AttributeModifier sam = new AttributeModifier("style",
"height: 40em; overflow: scroll;");
exception.add(sam);
Expand Down
Loading