Skip to content

Commit

Permalink
Merge commit 'c0af44e73c9a2a6799b3ecfa1cf451123348cc43'
Browse files Browse the repository at this point in the history
  • Loading branch information
@maiksd
maiksd committed Apr 3, 2024
2 parents c2d0772 + c0af44e commit d1703b2
Show file tree
Hide file tree
Showing 138 changed files with 283 additions and 245 deletions.
2 changes: 1 addition & 1 deletion Applications/BugTracker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.applications</groupId>
<artifactId>applications</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BugTracker</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Applications/ERMailer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.applications</groupId>
<artifactId>applications</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>wonder.applications</groupId>
Expand Down
1 change: 1 addition & 0 deletions Applications/JavaMonitor/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="WOFramework/WOOgnl"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
10 changes: 7 additions & 3 deletions Applications/JavaMonitor/Components/Main.wo/Main.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<!DOCTYPE html>
<html lang = "en">
<webobject name=LoginSucceeded>
<head>
<title>Monitor for WebObjects 5.4</title>
<webobject name=Refresh></webobject>
</head>
</webobject>

<webobject name=LoginRequired>
<html>
<head>
<title>Monitor for WebObjects 5.4</title>
<webobject name = "ERXStyleSheet"/>
</head>
<body id ="LoginPage" onload="document.getElementById('password').focus()">
<h1 style="text-align: center;">JavaMonitor for WebObjects</h1>
<h1>JavaMonitor for WebObjects</h1>
<webobject name = "HasLoginError">
<p class="Box ErrorBox LoginErrorBox"><webobject name="ErrorMsg" /></p>
</webobject>
Expand All @@ -22,5 +26,5 @@ <h4>A password is required to access this application</h4>
</div>

</body>
</html>
</webobject> <!-- LoginRequired -->
</html>
3 changes: 2 additions & 1 deletion Applications/JavaMonitor/Components/NavigationPage.wo/NavigationPage.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang = "en">
<head>
<title><webobject name="Title" /></title>
<webobject name = "ERXStyleSheet"/>
Expand Down
3 changes: 1 addition & 2 deletions Applications/JavaMonitor/Components/NavigationPage.wo/NavigationPage.wod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ AppleImage: WOImage {
filename = "AppleLogo.gif";
height = 36;
width = 30;
align = "right";
border = 0;
alt = "Apple logo";
}

Content : WOComponentContent {
Expand Down
8 changes: 7 additions & 1 deletion Applications/JavaMonitor/Resources/Properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,10 @@ ERXRest.MHost.type.alias = osType
er.javamonitor.showMigrationsTab=false

# Show the Mod_Proxy tab.
er.javamonitor.showModProxyTab=true
er.javamonitor.showModProxyTab=true

# OGNL
# See https://wiki.wocommunity.org/display/documentation/WOOgnl+Framework
ognl.helperFunctions=true
ognl.inlineBindings=true

10 changes: 10 additions & 0 deletions Applications/JavaMonitor/WebServerResources/javamonitor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ td {
margin-top: 50px;
}

#LoginPage h1 {
text-align: center;
}

.Box {
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
Expand Down Expand Up @@ -201,6 +205,12 @@ label {
float: right;
}

#NavigationLogo img
{
text-align: right;
}


.Notes {
margin-top: 10px;
}
Expand Down
6 changes: 5 additions & 1 deletion Applications/JavaMonitor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.applications</groupId>
<artifactId>applications</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -20,6 +20,10 @@
<groupId>wonder.core</groupId>
<artifactId>ERExtensions</artifactId>
</dependency>
<dependency>
<groupId>wonder.core</groupId>
<artifactId>WOOgnl</artifactId>
</dependency>
<dependency>
<groupId>wonder.ajax</groupId>
<artifactId>Ajax</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Applications/Uber/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.applications</groupId>
<artifactId>applications</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Uber</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Applications/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder</groupId>
<artifactId>wonder</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<groupId>wonder.applications</groupId>
<artifactId>applications</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Applications/wotaskd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.applications</groupId>
<artifactId>applications</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>wonder.applications</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Ajax/AjaxExample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>ajax</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>wonder.ajax</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Ajax/AjaxExample2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>ajax</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>wonder.ajax</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Ajax/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>examples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<artifactId>ajax</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion Examples/D2W/D2WComponentTour/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>d2w</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>wonder.d2w</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/D2W/ERModernMoviesDemo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>d2w</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/D2W/ERMovies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>d2w</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>wonder.d2w</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/D2W/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>examples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<artifactId>d2w</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERJaxWS/WebService_Created/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>erjaxws</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERJaxWS/WebService_Imported/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>erjaxws</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERJaxWS/WebService_Stateful/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>erjaxws</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERJaxWS/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>examples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<artifactId>erjaxws</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERXPartials/ERXPartialBaseModel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>erxpartials</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERXPartials/ERXPartialsExampleApp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>erxpartials</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERXPartials/ERXPartialsExampleModel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>erxpartials</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ERXPartials/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>examples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<artifactId>erxpartials</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions Examples/Misc/ERComponentTour/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<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>wonder.examples</groupId>
<artifactId>miscexamples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<groupId>wonder.misc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Misc/ERIndexingExample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>miscexamples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<groupId>wonder.misc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Misc/ERRestRouteExample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>miscexamples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<groupId>wonder.misc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Misc/ERSeleniumExample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>miscexamples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<groupId>wonder.misc</groupId>
<artifactId>ERSeleniumExample</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Misc/TickTockMan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>miscexamples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Misc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>examples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<artifactId>miscexamples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Reporting/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder.examples</groupId>
<artifactId>examples</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<artifactId>reporting</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion Examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder</groupId>
<artifactId>wonder</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<groupId>wonder.examples</groupId>
<artifactId>examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Frameworks/Ajax/Ajax/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>wonder.frameworks</groupId>
<artifactId>ajax</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>
<groupId>wonder.ajax</groupId>
<artifactId>Ajax</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion Frameworks/Ajax/ERCoolComponents/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>wonder.frameworks</groupId>
<artifactId>ajax</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<groupId>wonder.ajax</groupId>
Expand Down
2 changes: 1 addition & 1 deletion Frameworks/Ajax/ERJQuery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>wonder.frameworks</groupId>
<artifactId>ajax</artifactId>
<version>7.4-SNAPSHOT</version>
<version>7.5-SNAPSHOT</version>
</parent>

<groupId>wonder.ajax</groupId>
Expand Down
Loading

0 comments on commit d1703b2

Please sign in to comment.