[Amavisadmin-svn] SF.net SVN: amavisadmin: [23] amavisadmin/trunk
Status: Beta
Brought to you by:
streindl
Menu
▾
▴
[Amavisadmin-svn] SF.net SVN: amavisadmin: [23] amavisadmin/trunk
|
From: <str...@us...> - 2007-01-17 21:21:13
|
Revision: 23
http://amavisadmin.svn.sourceforge.net/amavisadmin/?rev=23&view=rev
Author: streindl
Date: 2007-01-17 13:21:14 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
* Bug 1638044:
- Version number handling improved
- All web pages contain a footer now (except the maintenance HTML
page)
* Fix for bug #1638043.
Modified Paths:
--------------
amavisadmin/trunk/build.xml
amavisadmin/trunk/nbproject/private/private.properties
amavisadmin/trunk/src/java/amavisadmin.properties.in
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApplicationBean1.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApproveRequests.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Configuration.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditSingleJob.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/HandlePendingReleases.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Header.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/MyRequests.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/bo/VersionInfo.java
amavisadmin/trunk/tools/reposInfo.pl
amavisadmin/trunk/web/ApproveRequests.jsp
amavisadmin/trunk/web/ChangePassword.jsp
amavisadmin/trunk/web/Configuration.jsp
amavisadmin/trunk/web/EditJobs.jsp
amavisadmin/trunk/web/EditSingleJob.jsp
amavisadmin/trunk/web/EditUser.jsp
amavisadmin/trunk/web/HandlePendingReleases.jsp
amavisadmin/trunk/web/Header.jspf
amavisadmin/trunk/web/Login.jsp
amavisadmin/trunk/web/MyRequests.jsp
amavisadmin/trunk/web/ShowSingleMail.jsp
amavisadmin/trunk/web/UserManagement.jsp
amavisadmin/trunk/web/WEB-INF/managed-beans.xml
Added Paths:
-----------
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Footer.java
amavisadmin/trunk/web/Footer.jspf
Modified: amavisadmin/trunk/build.xml
===================================================================
--- amavisadmin/trunk/build.xml 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/build.xml 2007-01-17 21:21:14 UTC (rev 23)
@@ -78,19 +78,25 @@
</schemaexport>
</target>-->
- <target name="-post-init">
- <tstamp >
+ <!-- Build amavisadmin.properties for build and version information -->
+ <target name="-post-compile">
+ <tstamp>
<format property="build.timestamp"
- pattern="EEE, d MMM yyyy HH:mm:ss Z" locale="en"/>
+ pattern="yyyyMMdd'T'HHmmssZ" locale="en"/>
</tstamp>
+ <exec executable="/usr/bin/perl">
+ <arg value="tools/reposInfo.pl" />
+ <redirector output="reposinfo.properties" />
+ </exec>
<copy file="${src.dir}/amavisadmin.properties.in"
- tofile="${src.dir}/amavisadmin.properties"
+ tofile="${build.classes.dir}/amavisadmin.properties"
filtering="true" overwrite="true">
<filterset>
- <filter token="VERSION" value="VERSION"/>
+ <filtersfile file="reposinfo.properties" />
<filter token="TSTAMP" value="${build.timestamp}" />
</filterset>
</copy>
+ <delete file="reposinfo.properties" />
</target>
<target name="-pre-dist">
Modified: amavisadmin/trunk/nbproject/private/private.properties
===================================================================
--- amavisadmin/trunk/nbproject/private/private.properties 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/nbproject/private/private.properties 2007-01-17 21:21:14 UTC (rev 23)
@@ -1,5 +1,5 @@
deploy.ant.properties.file=/home/sreindl/.netbeans/5.5/tomcat55_1.properties
-j2ee.platform.classpath=/opt/apache-tomcat-5.5.17/common/lib/naming-factory.jar:/opt/apache-tomcat-5.5.17/common/lib/jsp-api.jar:/opt/apache-tomcat-5.5.17/common/lib/postgresql-8.1-404.jdbc3.jar:/opt/apache-tomcat-5.5.17/common/lib/jasper-runtime.jar:/opt/apache-tomcat-5.5.17/common/lib/commons-el.jar:/opt/apache-tomcat-5.5.17/common/lib/jasper-compiler-jdt.jar:/opt/apache-tomcat-5.5.17/common/lib/commons-logging.jar:/opt/apache-tomcat-5.5.17/common/lib/naming-factory-dbcp.jar:/opt/apache-tomcat-5.5.17/common/lib/jasper-compiler.jar:/opt/apache-tomcat-5.5.17/common/lib/log4j-1.2.11.jar:/opt/apache-tomcat-5.5.17/common/lib/naming-resources.jar:/opt/apache-tomcat-5.5.17/common/lib/servlet-api.jar
+j2ee.platform.classpath=/opt/apache-tomcat-5.5.17/common/lib/naming-factory.jar:/opt/apache-tomcat-5.5.17/common/lib/jsp-api.jar:/opt/apache-tomcat-5.5.17/common/lib/postgresql-8.1-404.jdbc3.jar:/opt/apache-tomcat-5.5.17/common/lib/jasper-runtime.jar:/opt/apache-tomcat-5.5.17/common/lib/commons-el.jar:/opt/apache-tomcat-5.5.17/common/lib/jasper-compiler-jdt.jar:/opt/apache-tomcat-5.5.17/common/lib/commons-logging.jar:/opt/apache-tomcat-5.5.17/common/lib/naming-factory-dbcp.jar:/opt/apache-tomcat-5.5.17/common/lib/jasper-compiler.jar:/opt/apache-tomcat-5.5.17/common/lib/naming-resources.jar:/opt/apache-tomcat-5.5.17/common/lib/servlet-api.jar
j2ee.server.instance=tomcat55:home=/opt/apache-tomcat-5.5.17
javac.debug=true
javadoc.preview=true
Modified: amavisadmin/trunk/src/java/amavisadmin.properties.in
===================================================================
--- amavisadmin/trunk/src/java/amavisadmin.properties.in 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/amavisadmin.properties.in 2007-01-17 21:21:14 UTC (rev 23)
@@ -18,5 +18,18 @@
# AmavisAdmin properties file
# This file contains basic settings
-amavisadmin.version = @VERSION@
+amavisadmin.major = 0
+amavisadmin.minor = 1
+
+# those fields are translated automatically
+amavisadmin.branch = @branch@
+amavisadmin.build = @revision@
+amavisadmin.build_type = @build_type@
+amavisadmin.clean_build = @clean_build@
+
+# If you ever change the datamodel, please increase this value
+# and provide an upgrade script in the db topic
+amavisadmin.db_version = 1
+
+# Build time
amavisadmin.buildtime = @TSTAMP@
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApplicationBean1.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApplicationBean1.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApplicationBean1.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -16,6 +16,7 @@
package de.sreindl.amavisadmin;
import com.sun.rave.web.ui.appbase.AbstractApplicationBean;
+import de.sreindl.amavisadmin.bo.ConfigurationBO;
import de.sreindl.amavisadmin.db.User;
import java.util.HashSet;
import java.util.Set;
@@ -156,4 +157,14 @@
public synchronized static boolean isLoggedOn (User user) {
return (userMap != null) && userMap.contains(user.getId());
}
+
+
+ public String getApplicationTitle() {
+ String appTitle = ConfigurationBO.getConfValue(ConfigurationBO.APP_TITLE);
+ if (appTitle == null || appTitle.length() == 0) {
+ appTitle = "AmavisAdmin";
+ }
+ return appTitle;
+ }
+
}
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApproveRequests.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApproveRequests.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/ApproveRequests.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -25,6 +25,7 @@
import com.sun.rave.web.ui.component.Hyperlink;
import com.sun.rave.web.ui.component.Link;
import com.sun.rave.web.ui.component.Page;
+import com.sun.rave.web.ui.component.PanelGroup;
import com.sun.rave.web.ui.component.StaticText;
import com.sun.rave.web.ui.component.Table;
import com.sun.rave.web.ui.component.TableColumn;
@@ -287,6 +288,16 @@
public void setBtnBack(Button b) {
this.btnBack = b;
}
+
+ private PanelGroup groupPanel1 = new PanelGroup();
+
+ public PanelGroup getGroupPanel1() {
+ return groupPanel1;
+ }
+
+ public void setGroupPanel1(PanelGroup pg) {
+ this.groupPanel1 = pg;
+ }
// </editor-fold>
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Configuration.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Configuration.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Configuration.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -28,6 +28,7 @@
import de.sreindl.amavisadmin.bo.UserBO;
import de.sreindl.amavisadmin.db.User;
import de.sreindl.amavisadmin.db.util.HibernateSessionFactory;
+import de.sreindl.amavisadmin.jobs.ReminderJob;
import java.text.ParseException;
import java.util.Date;
import javax.faces.FacesException;
@@ -506,26 +507,6 @@
this.longRangeValidator3 = lrv;
}
- private Property property20 = new Property();
-
- public Property getProperty20() {
- return property20;
- }
-
- public void setProperty20(Property p) {
- this.property20 = p;
- }
-
- private TextField fldRetentionWarning = new TextField();
-
- public TextField getFldRetentionWarning() {
- return fldRetentionWarning;
- }
-
- public void setFldRetentionWarning(TextField tf) {
- this.fldRetentionWarning = tf;
- }
-
private LongRangeValidator longRangeValidator4 = new LongRangeValidator();
public LongRangeValidator getLongRangeValidator4() {
@@ -762,11 +743,10 @@
chkDropMail.setValue(Boolean.valueOf(ConfigurationBO.getConfValue(MailHandler.KEY_DROP_MAIL, "")));
/* general settings */
- fldApplicationTitle.setText(ConfigurationBO.getConfValue(ConfigurationBO.APP_TITLE));
- fldRetentionDays.setText(ConfigurationBO.getConfValue(UserBO.CONF_DEFAULT_RETENTION));
- fldMaxRetention.setText(ConfigurationBO.getConfValue(UserManagement.CONF_MAX_RETENTION));
+ fldApplicationTitle.setText(ConfigurationBO.getConfValue(ConfigurationBO.APP_TITLE, "AmavisAdmin"));
+ fldRetentionDays.setText(ConfigurationBO.getConfValue(UserBO.CONF_DEFAULT_RETENTION, "14"));
+ fldMaxRetention.setText(ConfigurationBO.getConfValue(UserManagement.CONF_MAX_RETENTION, "365"));
fldBaseURL.setText(ConfigurationBO.getConfValue(ConfigurationBO.CONF_BASE_URL));
- //fldRetentionWarning.setText(ConfigurationBO.getConfValue());
}
/**
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -25,6 +25,7 @@
import com.sun.rave.web.ui.component.Hyperlink;
import com.sun.rave.web.ui.component.Link;
import com.sun.rave.web.ui.component.Page;
+import com.sun.rave.web.ui.component.PanelGroup;
import com.sun.rave.web.ui.component.StaticText;
import com.sun.rave.web.ui.component.Table;
import com.sun.rave.web.ui.component.TableColumn;
@@ -283,6 +284,26 @@
public void setBtnDeleteJob(Button b) {
this.btnDeleteJob = b;
}
+
+ private PanelGroup groupPanel1 = new PanelGroup();
+
+ public PanelGroup getGroupPanel1() {
+ return groupPanel1;
+ }
+
+ public void setGroupPanel1(PanelGroup pg) {
+ this.groupPanel1 = pg;
+ }
+
+ private PanelGroup groupPanel2 = new PanelGroup();
+
+ public PanelGroup getGroupPanel2() {
+ return groupPanel2;
+ }
+
+ public void setGroupPanel2(PanelGroup pg) {
+ this.groupPanel2 = pg;
+ }
// </editor-fold>
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditSingleJob.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditSingleJob.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditSingleJob.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -29,6 +29,7 @@
import com.sun.rave.web.ui.component.Link;
import com.sun.rave.web.ui.component.Message;
import com.sun.rave.web.ui.component.Page;
+import com.sun.rave.web.ui.component.PanelGroup;
import com.sun.rave.web.ui.component.StaticText;
import com.sun.rave.web.ui.component.Table;
import com.sun.rave.web.ui.component.TableColumn;
@@ -376,6 +377,26 @@
public void setMessage1(Message m) {
this.message1 = m;
}
+
+ private PanelGroup groupPanel1 = new PanelGroup();
+
+ public PanelGroup getGroupPanel1() {
+ return groupPanel1;
+ }
+
+ public void setGroupPanel1(PanelGroup pg) {
+ this.groupPanel1 = pg;
+ }
+
+ private PanelGroup groupPanel2 = new PanelGroup();
+
+ public PanelGroup getGroupPanel2() {
+ return groupPanel2;
+ }
+
+ public void setGroupPanel2(PanelGroup pg) {
+ this.groupPanel2 = pg;
+ }
// </editor-fold>
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditUser.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -22,6 +22,7 @@
import com.sun.rave.web.ui.component.DropDown;
import com.sun.rave.web.ui.component.Form;
import com.sun.rave.web.ui.component.Head;
+import com.sun.rave.web.ui.component.HiddenField;
import com.sun.rave.web.ui.component.Html;
import com.sun.rave.web.ui.component.Label;
import com.sun.rave.web.ui.component.Link;
@@ -382,6 +383,56 @@
public void setGroupPanel1(PanelGroup pg) {
this.groupPanel1 = pg;
}
+
+ private HtmlPanelGrid gridPanel2 = new HtmlPanelGrid();
+
+ public HtmlPanelGrid getGridPanel2() {
+ return gridPanel2;
+ }
+
+ public void setGridPanel2(HtmlPanelGrid hpg) {
+ this.gridPanel2 = hpg;
+ }
+
+ private HtmlPanelGrid gridPanel3 = new HtmlPanelGrid();
+
+ public HtmlPanelGrid getGridPanel3() {
+ return gridPanel3;
+ }
+
+ public void setGridPanel3(HtmlPanelGrid hpg) {
+ this.gridPanel3 = hpg;
+ }
+
+ private HtmlPanelGrid gridPanel4 = new HtmlPanelGrid();
+
+ public HtmlPanelGrid getGridPanel4() {
+ return gridPanel4;
+ }
+
+ public void setGridPanel4(HtmlPanelGrid hpg) {
+ this.gridPanel4 = hpg;
+ }
+
+ private HiddenField hiddenField1 = new HiddenField();
+
+ public HiddenField getHiddenField1() {
+ return hiddenField1;
+ }
+
+ public void setHiddenField1(HiddenField hf) {
+ this.hiddenField1 = hf;
+ }
+
+ private PanelGroup groupPanel2 = new PanelGroup();
+
+ public PanelGroup getGroupPanel2() {
+ return groupPanel2;
+ }
+
+ public void setGroupPanel2(PanelGroup pg) {
+ this.groupPanel2 = pg;
+ }
// </editor-fold>
@@ -404,6 +455,7 @@
* property values that were saved for this view when it was rendered.</p>
*/
public void init() {
+ log("init called");
// Perform initializations inherited from our superclass
super.init();
// Perform application initialization that must complete
@@ -467,6 +519,7 @@
* resources that will be required in your event handlers.</p>
*/
public void preprocess() {
+ log("Preprocess called");
}
/**
@@ -478,6 +531,7 @@
* this page.</p>
*/
public void prerender() {
+ log("Prerender Called");
ArrayList<Option> lst = null;
if (user == null) {
erase();
Added: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Footer.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Footer.java (rev 0)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Footer.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -0,0 +1,140 @@
+/*
+ * Footer.java
+ *
+ * Created on 17. Januar 2007, 19:43
+ * Copyright sreindl
+ */
+package de.sreindl.amavisadmin;
+
+import com.sun.rave.web.ui.appbase.AbstractFragmentBean;
+import com.sun.rave.web.ui.component.Hyperlink;
+import com.sun.rave.web.ui.component.Markup;
+import com.sun.rave.web.ui.component.PageSeparator;
+import com.sun.rave.web.ui.component.StaticText;
+import de.sreindl.amavisadmin.bo.VersionInfo;
+import javax.faces.FacesException;
+
+/**
+ * <p>Fragment bean that corresponds to a similarly named JSP page
+ * fragment. This class contains component definitions (and initialization
+ * code) for all components that you have defined on this fragment, as well as
+ * lifecycle methods and event handlers where you may add behavior
+ * to respond to incoming events.</p>
+ */
+public class Footer extends AbstractFragmentBean {
+ // <editor-fold defaultstate="collapsed" desc="Managed Component Definition">
+ private int __placeholder;
+
+ /**
+ * <p>Automatically managed component initialization. <strong>WARNING:</strong>
+ * This method is automatically generated, so any user-specified code inserted
+ * here is subject to being replaced.</p>
+ */
+ private void _init() throws Exception {
+ }
+
+ private PageSeparator pageSeparator1 = new PageSeparator();
+
+ public PageSeparator getPageSeparator1() {
+ return pageSeparator1;
+ }
+
+ public void setPageSeparator1(PageSeparator ps) {
+ this.pageSeparator1 = ps;
+ }
+
+ private StaticText staticText1 = new StaticText();
+
+ public StaticText getStaticText1() {
+ return staticText1;
+ }
+
+ public void setStaticText1(StaticText st) {
+ this.staticText1 = st;
+ }
+
+ private Hyperlink hyperlink1 = new Hyperlink();
+
+ public Hyperlink getHyperlink1() {
+ return hyperlink1;
+ }
+
+ public void setHyperlink1(Hyperlink h) {
+ this.hyperlink1 = h;
+ }
+ // </editor-fold>
+
+ public Footer() {
+ }
+
+ /**
+ * <p>Callback method that is called whenever a page containing
+ * this page fragment is navigated to, either directly via a URL,
+ * or indirectly via page navigation. Override this method to acquire
+ * resources that will be needed for event handlers and lifecycle methods.</p>
+ *
+ * <p>The default implementation does nothing.</p>
+ */
+ public void init() {
+ // Perform initializations inherited from our superclass
+ super.init();
+ // Perform application initialization that must complete
+ // *before* managed components are initialized
+ // TODO - add your own initialiation code here
+
+
+ // <editor-fold defaultstate="collapsed" desc="Visual-Web-managed Component Initialization">
+ // Initialize automatically managed components
+ // *Note* - this logic should NOT be modified
+ try {
+ _init();
+ } catch (Exception e) {
+ log("Page1 Initialization Failure", e);
+ throw e instanceof FacesException ? (FacesException) e: new FacesException(e);
+ }
+
+ // </editor-fold>
+ // Perform application initialization that must complete
+ // *after* managed components are initialized
+ // TODO - add your own initialization code here
+ }
+
+ /**
+ * <p>Callback method that is called after rendering is completed for
+ * this request, if <code>init()</code> was called. Override this
+ * method to release resources acquired in the <code>init()</code>
+ * resources that will be needed for event handlers and lifecycle methods.</p>
+ *
+ * <p>The default implementation does nothing.</p>
+ */
+ public void destroy() {
+ }
+
+ /**
+ * <p>Return a reference to the scoped data bean.</p>
+ */
+ protected ApplicationBean1 getApplicationBean1() {
+ return (ApplicationBean1)getBean("ApplicationBean1");
+ }
+
+ /**
+ * <p>Return a reference to the scoped data bean.</p>
+ */
+ protected SessionBean1 getSessionBean1() {
+ return (SessionBean1)getBean("SessionBean1");
+ }
+
+ /**
+ * <p>Return a reference to the scoped data bean.</p>
+ */
+ protected RequestBean1 getRequestBean1() {
+ return (RequestBean1)getBean("RequestBean1");
+ }
+
+ /**
+ * Return a versioned string
+ */
+ public String getVersionString () {
+ return VersionInfo.getApplicationVersion();
+ }
+}
Property changes on: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Footer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/HandlePendingReleases.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/HandlePendingReleases.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/HandlePendingReleases.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -25,6 +25,7 @@
import com.sun.rave.web.ui.component.Html;
import com.sun.rave.web.ui.component.Link;
import com.sun.rave.web.ui.component.Page;
+import com.sun.rave.web.ui.component.PanelGroup;
import com.sun.rave.web.ui.component.StaticText;
import com.sun.rave.web.ui.component.Table;
import com.sun.rave.web.ui.component.TableColumn;
@@ -241,6 +242,16 @@
public void setBtnRevert(Button b) {
this.btnRevert = b;
}
+
+ private PanelGroup groupPanel1 = new PanelGroup();
+
+ public PanelGroup getGroupPanel1() {
+ return groupPanel1;
+ }
+
+ public void setGroupPanel1(PanelGroup pg) {
+ this.groupPanel1 = pg;
+ }
// </editor-fold>
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Header.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Header.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/Header.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -21,6 +21,7 @@
import com.sun.rave.web.ui.component.MessageGroup;
import com.sun.rave.web.ui.component.PanelGroup;
import com.sun.rave.web.ui.component.StaticText;
+import de.sreindl.amavisadmin.bo.ConfigurationBO;
import de.sreindl.amavisadmin.bo.UserBO;
import javax.faces.FacesException;
import javax.faces.component.html.HtmlPanelGrid;
@@ -256,4 +257,5 @@
UserBO.logoutUser (getSessionBean1());
return "logout";
}
+
}
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/MyRequests.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/MyRequests.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/MyRequests.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -28,6 +28,7 @@
import com.sun.rave.web.ui.component.Hyperlink;
import com.sun.rave.web.ui.component.Link;
import com.sun.rave.web.ui.component.Page;
+import com.sun.rave.web.ui.component.PanelGroup;
import com.sun.rave.web.ui.component.StaticText;
import com.sun.rave.web.ui.component.Table;
import com.sun.rave.web.ui.component.TableColumn;
@@ -295,6 +296,26 @@
public void setTextPending(StaticText st) {
this.textPending = st;
}
+
+ private PanelGroup groupPanel1 = new PanelGroup();
+
+ public PanelGroup getGroupPanel1() {
+ return groupPanel1;
+ }
+
+ public void setGroupPanel1(PanelGroup pg) {
+ this.groupPanel1 = pg;
+ }
+
+ private PanelGroup groupPanel2 = new PanelGroup();
+
+ public PanelGroup getGroupPanel2() {
+ return groupPanel2;
+ }
+
+ public void setGroupPanel2(PanelGroup pg) {
+ this.groupPanel2 = pg;
+ }
// </editor-fold>
@@ -691,6 +712,8 @@
return "There is one request pending for approval by an admin";
} else if (pending > 1) {
return "There are " + pending + " requests pending for approval by an admin";
+ } else if (pending == 0) { // #1638043
+ return "";
} else {
return "Error: The number of pending requests for approval cannot be calculated.";
}
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/UserManagement.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -265,16 +265,6 @@
this.hyperlink1 = h;
}
- private PanelGroup groupPanel1 = new PanelGroup();
-
- public PanelGroup getGroupPanel1() {
- return groupPanel1;
- }
-
- public void setGroupPanel1(PanelGroup pg) {
- this.groupPanel1 = pg;
- }
-
private Button btnAdd = new Button();
public Button getBtnAdd() {
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/bo/VersionInfo.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/bo/VersionInfo.java 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/bo/VersionInfo.java 2007-01-17 21:21:14 UTC (rev 23)
@@ -30,7 +30,9 @@
private static Log log = LogFactory.getLog(VersionInfo.class);
- private static final Integer databaseVersion = 1;
+ private static Integer _databaseVersion = null;
+
+ private static String _localVersion = null;
/** Creates a new instance of VersionInfo */
public VersionInfo() {
@@ -42,7 +44,11 @@
* @return the database version
*/
public static Integer getDatabaseVersion() {
- return databaseVersion;
+ if (_databaseVersion == null) {
+ initProps();
+ _databaseVersion = Integer.decode(props.getProperty("amavisadmin.db_version"));
+ }
+ return _databaseVersion;
}
/**
@@ -59,12 +65,12 @@
}
try {
Integer numVersion = Integer.decode(db_version);
- if (numVersion.equals(databaseVersion)) {
+ if (numVersion.equals(getDatabaseVersion())) {
log.info("Database configuration is ok");
return true;
} else {
log.fatal("Database version mismatch: Version given " +
- db_version + ", Version required " + databaseVersion);
+ db_version + ", Version required " + getDatabaseVersion());
return false;
}
} catch (NumberFormatException nfe) {
@@ -76,8 +82,32 @@
}
public static String getApplicationVersion() {
- initProps();
- return props.getProperty("amavisadmin.version");
+ if (_localVersion == null) {
+ initProps();
+ StringBuffer str = new StringBuffer(20);
+ str.append(props.getProperty("amavisadmin.major", "Unknown"));
+ str.append('.');
+ str.append(props.getProperty("amavisadmin.minor", "unknown"));
+
+ String buildType = props.getProperty("amavisadmin.build_type");
+ if (buildType.equals("local")) {
+ str.append (" local");
+ }
+ str.append (" build ");
+ str.append (props.getProperty("amavisadmin.build"));
+ str.append (" (");
+ String branch = props.getProperty("amavisadmin.branch");
+ if (!(branch.startsWith("branch") || branch.startsWith("trunk"))) {
+ str.append ("release ");
+ }
+ str.append(branch);
+ if (props.getProperty("amavisadmin.clean_build").equals("false")) {
+ str.append (" -- <b>MODIFIED!</b>");
+ }
+ str.append (')');
+ _localVersion = str.toString();
+ }
+ return _localVersion;
}
synchronized private static void initProps() {
Modified: amavisadmin/trunk/tools/reposInfo.pl
===================================================================
--- amavisadmin/trunk/tools/reposInfo.pl 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/tools/reposInfo.pl 2007-01-17 21:21:14 UTC (rev 23)
@@ -36,31 +36,23 @@
};
my $ctx = SVN::Client->new();
-if ($op eq "REV") {
- $ctx->info( 'build.xml', undef, undef, \&funcRev, 0 );
- print $_info->rev;
-} elsif ($op eq "STATUS") {
- $ctx->status(getcwd(), undef, $funcStatus, 1, 0, 0, 0);
- if ($statusChanged) {
- print "CHANGED";
- } else {
- print "UNCHANGED";
- }
-} elsif ($op eq "BUILD") {
- my $cwd = getcwd();
- if ($cwd =~ /\/home\//) {
- print "LOCAL";
- } else {
- print "BUILD";
- }
-} elsif ($op eq "TAG") {
- $ctx->info( 'build.xml', undef, undef, \&funcRev, 0 );
- my $url = $_info->URL;
- if ($url =~ /trunk/) {
- print "trunk";
- } elsif ($url =~ /branches\/([^\/]+)\//) {
- print "branch $1";
- } elsif ($url =~ /tags\/([^\/]+)\//) {
- print "tag $1";
- }
+
+my $cwd = getcwd();
+$ctx->info( $cwd, undef, undef, \&funcRev, 0 );
+$ctx->status( $cwd, undef, $funcStatus, 1, 0, 0, 0);
+print "revision=", $_info->rev, "\n";
+print "clean_build=", $statusChanged ? "false" : "true", "\n";
+if ($cwd =~ /\/home\//) {
+ print "build_type=private\n";
+} else {
+ print "build_type=batch\n";
}
+
+my $url = $_info->URL;
+if ($url =~ /trunk/) {
+ print "branch=trunk\n";
+} elsif ($url =~ /branches\/([^\/]+)\//) {
+ print "branch=branch $1\n";
+} elsif ($url =~ /tags\/([^\/]+)\//) {
+ print "branch=$1\n";
+}
Modified: amavisadmin/trunk/web/ApproveRequests.jsp
===================================================================
--- amavisadmin/trunk/web/ApproveRequests.jsp 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/web/ApproveRequests.jsp 2007-01-17 21:21:14 UTC (rev 23)
@@ -7,37 +7,37 @@
<ui:head binding="#{ApproveRequests.head1}" id="head1" title="Approve Requests">
<ui:link binding="#{ApproveRequests.link1}" id="link1" url="/resources/stylesheet.css"/>
</ui:head>
- <ui:body binding="#{ApproveRequests.body1}" id="body1" style="-rave-layout: grid">
+ <ui:body binding="#{ApproveRequests.body1}" id="body1">
<ui:form binding="#{ApproveRequests.form1}" id="form1">
- <div style="left: 0px; top: 0px; position: absolute">
- <jsp:directive.include file="Header.jspf"/>
- </div>
- <ui:table augmentTitle="false" binding="#{ApproveRequests.table1}" id="table1"
- style="left: 24px; top: 216px; position: absolute; width: 720px" title="Table" width="720">
- <ui:tableRowGroup binding="#{ApproveRequests.tableRowGroup1}" id="tableRowGroup1" rows="10"
- sourceData="#{SessionBean1.approvePendingDataProvider}" sourceVar="currentRow">
- <ui:tableColumn binding="#{ApproveRequests.tableColumn1}" headerText="Received On" id="tableColumn1" sort="time_iso">
- <ui:staticText binding="#{ApproveRequests.staticText1}" id="staticText1" text="#{currentRow.value['time_iso']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{ApproveRequests.tableColumn2}" headerText="Requestor" id="tableColumn2" noWrap="true" sort="approve_username">
- <ui:staticText binding="#{ApproveRequests.staticText2}" id="staticText2" text="#{currentRow.value['approve_username']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{ApproveRequests.tableColumn3}" headerText="From" id="tableColumn3" sort="from_addr">
- <ui:hyperlink action="#{ApproveRequests.hlFrom_action}" binding="#{ApproveRequests.hlFrom}" id="hlFrom" text="#{currentRow.value['from_addr']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{ApproveRequests.tableColumn4}" headerText="Subject" id="tableColumn4" sort="subject">
- <ui:hyperlink action="#{ApproveRequests.hlSubject_action}" binding="#{ApproveRequests.hlSubject}" id="hlSubject" text="#{currentRow.value['subject']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{ApproveRequests.tableColumn5}" headerText="Content" id="tableColumn5" noWrap="true" sort="content">
- <ui:staticText binding="#{ApproveRequests.staticText3}" id="staticText3" text="#{ApproveRequests.contentType}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{ApproveRequests.tableColumn6}" embeddedActions="true" headerText="Action" id="tableColumn6">
- <ui:hyperlink action="#{ApproveRequests.hlApprove_action}" binding="#{ApproveRequests.hlApprove}" id="hlApprove" text="Approve"/>
- <ui:hyperlink action="#{ApproveRequests.hlReject_action}" binding="#{ApproveRequests.hlReject}" id="hlReject" text="Reject"/>
- </ui:tableColumn>
- </ui:tableRowGroup>
- </ui:table>
- <ui:button action="goHome" binding="#{ApproveRequests.btnBack}" id="btnBack" style="left: 23px; top: 192px; position: absolute" text="Go Back"/>
+ <jsp:directive.include file="Header.jspf"/>
+ <ui:panelGroup binding="#{ApproveRequests.groupPanel1}" id="groupPanel1">
+ <ui:button action="goHome" binding="#{ApproveRequests.btnBack}" id="btnBack" text="Go Back"/>
+ <ui:table augmentTitle="false" binding="#{ApproveRequests.table1}" id="table1" title="Table">
+ <ui:tableRowGroup binding="#{ApproveRequests.tableRowGroup1}" id="tableRowGroup1" rows="10"
+ sourceData="#{SessionBean1.approvePendingDataProvider}" sourceVar="currentRow">
+ <ui:tableColumn binding="#{ApproveRequests.tableColumn1}" headerText="Received On" id="tableColumn1" sort="time_iso">
+ <ui:staticText binding="#{ApproveRequests.staticText1}" id="staticText1" text="#{currentRow.value['time_iso']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{ApproveRequests.tableColumn2}" headerText="Requestor" id="tableColumn2" noWrap="true" sort="approve_username">
+ <ui:staticText binding="#{ApproveRequests.staticText2}" id="staticText2" text="#{currentRow.value['approve_username']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{ApproveRequests.tableColumn3}" headerText="From" id="tableColumn3" sort="from_addr">
+ <ui:hyperlink action="#{ApproveRequests.hlFrom_action}" binding="#{ApproveRequests.hlFrom}" id="hlFrom" text="#{currentRow.value['from_addr']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{ApproveRequests.tableColumn4}" headerText="Subject" id="tableColumn4" sort="subject">
+ <ui:hyperlink action="#{ApproveRequests.hlSubject_action}" binding="#{ApproveRequests.hlSubject}" id="hlSubject" text="#{currentRow.value['subject']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{ApproveRequests.tableColumn5}" headerText="Content" id="tableColumn5" noWrap="true" sort="content">
+ <ui:staticText binding="#{ApproveRequests.staticText3}" id="staticText3" text="#{ApproveRequests.contentType}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{ApproveRequests.tableColumn6}" embeddedActions="true" headerText="Action" id="tableColumn6">
+ <ui:hyperlink action="#{ApproveRequests.hlApprove_action}" binding="#{ApproveRequests.hlApprove}" id="hlApprove" text="Approve"/>
+ <ui:hyperlink action="#{ApproveRequests.hlReject_action}" binding="#{ApproveRequests.hlReject}" id="hlReject" text="Reject"/>
+ </ui:tableColumn>
+ </ui:tableRowGroup>
+ </ui:table>
+ </ui:panelGroup>
+ <jsp:directive.include file="Footer.jspf"/>
</ui:form>
</ui:body>
</ui:html>
Modified: amavisadmin/trunk/web/ChangePassword.jsp
===================================================================
--- amavisadmin/trunk/web/ChangePassword.jsp 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/web/ChangePassword.jsp 2007-01-17 21:21:14 UTC (rev 23)
@@ -8,11 +8,9 @@
<ui:link binding="#{ChangePassword.link1}" id="link1" url="/resources/stylesheet.css"/>
</ui:head>
<ui:body binding="#{ChangePassword.body1}" id="body1" style="-rave-layout: grid">
- <div style="left: 0px; top: 0px; position: absolute; width: 100%">
- <jsp:directive.include file="Header.jspf"/>
- </div>
+ <jsp:directive.include file="Header.jspf"/>
<ui:form binding="#{ChangePassword.form1}" id="form1">
- <h:panelGrid binding="#{ChangePassword.gridPanel1}" columns="2" id="gridPanel1" style="left: 48px; top: 168px; position: absolute">
+ <h:panelGrid binding="#{ChangePassword.gridPanel1}" columns="2" id="gridPanel1" style="left: 24px; top: 168px; position: absolute">
<ui:label binding="#{ChangePassword.labOldPassword}" for="oldPassword" id="labOldPassword" text="Old Password"/>
<ui:passwordField binding="#{ChangePassword.oldPassword}" id="oldPassword" required="true"/>
<ui:label binding="#{ChangePassword.label2}" for="fldNewPassword" id="label2" text="New Password"/>
@@ -22,8 +20,11 @@
<ui:button action="#{ChangePassword.btnSave_action}" binding="#{ChangePassword.btnSave}" id="btnSave" primary="true" text="Save"/>
<ui:button action="#{ChangePassword.btnCancel_action}" binding="#{ChangePassword.btnCancel}" id="btnCancel" text="Cancel"/>
</h:panelGrid>
+ <div style="left: 0px; top: 288px; position: absolute">
+ <jsp:directive.include file="Footer.jspf"/>
+ </div>
<ui:staticText binding="#{ChangePassword.staticText1}" escape="false" id="staticText1"
- style="height: 48px; left: 48px; top: 120px; position: absolute; width: 360px" text="Please enter your new password twice to ensure that you didn't 
made a mistake."/>
+ style="height: 48px; left: 24px; top: 120px; position: absolute; width: 360px" text="Please enter your new password twice to ensure that you didn't 
made a mistake."/>
</ui:form>
</ui:body>
</ui:html>
Modified: amavisadmin/trunk/web/Configuration.jsp
===================================================================
--- amavisadmin/trunk/web/Configuration.jsp 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/web/Configuration.jsp 2007-01-17 21:21:14 UTC (rev 23)
@@ -19,7 +19,7 @@
<ui:propertySheetSection binding="#{Configuration.generalSection}" id="generalSection" label="General Settings">
<ui:property binding="#{Configuration.property16}"
helpText="The application name which is displayed at the top of the window" id="property16" label="Application Title">
- <ui:textField binding="#{Configuration.fldApplicationTitle}" id="fldApplicationTitle" required="true"/>
+ <ui:textField binding="#{Configuration.fldApplicationTitle}" id="fldApplicationTitle" required="true" text="AmavisAdmin"/>
</ui:property>
<ui:property binding="#{Configuration.property12}"
helpText="URL used in mails and other output where the URL is needed. This might be different from the URL used by the application."
@@ -36,11 +36,6 @@
id="property19" label="Max Retention">
<ui:textField binding="#{Configuration.fldMaxRetention}" columns="5" id="fldMaxRetention" required="true" validator="#{Configuration.longRangeValidator3.validate}"/>
</ui:property>
- <ui:property binding="#{Configuration.property20}"
- helpText="Number of days where the receipient of the email will retrieve a warning message that 
his pending SPAM/VIRUS messages will be removed automatically. To disable this feature, set the value to 0."
- id="property20" label="Retention Warning Days">
- <ui:textField binding="#{Configuration.fldRetentionWarning}" columns="3" id="fldRetentionWarning" required="true" validator="#{Configuration.longRangeValidator4.validate}"/>
- </ui:property>
<ui:property binding="#{Configuration.property17}"
helpText="Mail Address used for sending system mails a typical mail address might be <code>ama...@ex...</code>"
id="property17" label="Mail Sender Address">
@@ -90,7 +85,7 @@
<ui:passwordField binding="#{Configuration.fldMailPassword}" id="fldMailPassword"/>
</ui:property>
<ui:property binding="#{Configuration.property3}"
- helpText="If this checkbox is selected, mails are acutally not send. They are dropped instead. <em>Please not that this should be used for developement purposes only."
+ helpText="If this checkbox is selected, mails are acutally not send. They are dropped instead. <em>Please not that this should be used for developement purposes only.</em>"
id="property3" label="Drop Mail">
<ui:checkbox binding="#{Configuration.chkDropMail}" id="chkDropMail"/>
</ui:property>
@@ -108,6 +103,7 @@
</ui:propertySheet>
</ui:panelGroup>
</ui:form>
+ <jsp:directive.include file="Footer.jspf"/>
</ui:body>
</ui:html>
</ui:page>
Modified: amavisadmin/trunk/web/EditJobs.jsp
===================================================================
--- amavisadmin/trunk/web/EditJobs.jsp 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/web/EditJobs.jsp 2007-01-17 21:21:14 UTC (rev 23)
@@ -7,38 +7,39 @@
<ui:head binding="#{EditJobs.head1}" id="head1" title="Edit jobs">
<ui:link binding="#{EditJobs.link1}" id="link1" url="/resources/stylesheet.css"/>
</ui:head>
- <ui:body binding="#{EditJobs.body1}" id="body1" style="-rave-layout: grid">
+ <ui:body binding="#{EditJobs.body1}" id="body1">
+ <jsp:directive.include file="Header.jspf"/>
<ui:form binding="#{EditJobs.form1}" id="form1">
- <div style="left: 0px; top: 0px; position: absolute">
- <jsp:directive.include file="Header.jspf"/>
- </div>
- <ui:table augmentTitle="false" binding="#{EditJobs.table1}" id="table1" style="left: 24px; top: 168px; position: absolute; width: 480px"
- title="Jobs" width="480">
- <ui:tableRowGroup binding="#{EditJobs.tableRowGroup1}" id="tableRowGroup1" rows="10" sourceData="#{SessionBean1.jobsDataProvider}" sourceVar="currentRow">
- <ui:tableColumn binding="#{EditJobs.tableColumn1}" headerText="Name" id="tableColumn1" noWrap="true" sort="job_name">
- <ui:hyperlink action="#{EditJobs.hlEditEntry_action}" binding="#{EditJobs.hlEditEntry}" id="hlEditEntry" text="#{currentRow.value['job_name']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{EditJobs.tableColumn2}" headerText="Description" id="tableColumn2">
- <ui:staticText binding="#{EditJobs.staticText2}" id="staticText2" text="#{currentRow.value['job_description']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{EditJobs.tableColumn3}" headerText="CRON Settings" id="tableColumn3" noWrap="true">
- <ui:staticText binding="#{EditJobs.staticText3}" id="staticText3" text="#{currentRow.value['job_cron_settings']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{EditJobs.tableColumn6}" headerText="Last Run" id="tableColumn6" noWrap="true">
- <ui:staticText binding="#{EditJobs.staticText5}" id="staticText5" text="#{currentRow.value['job_last_run_date']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{EditJobs.tableColumn4}" headerText="(En/Dis)abled" id="tableColumn4" noWrap="true">
- <ui:hyperlink action="#{EditJobs.hlToogle_action}" binding="#{EditJobs.hlToogle}" id="hlToogle" text="#{EditJobs.enabledDisabledText}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{EditJobs.tableColumn5}" id="tableColumn5">
- <ui:button binding="#{EditJobs.btnDeleteJob}" id="btnDeleteJob" text="Delete"/>
- </ui:tableColumn>
- </ui:tableRowGroup>
- </ui:table>
- <ui:button action="#{EditJobs.createDefault_action}" binding="#{EditJobs.createDefault}" id="createDefault"
- style="left: 23px; top: 120px; position: absolute" text="Create Default Job-Definitions"/>
- <ui:button action="#{EditJobs.btnAddNewEntry_action}" binding="#{EditJobs.btnAddNewEntry}" id="btnAddNewEntry"
- style="left: 263px; top: 120px; position: absolute" text="Add New"/>
+ <ui:panelGroup binding="#{EditJobs.groupPanel1}" block="true" id="groupPanel1" style="margin: 5px; padding: 5px; ">
+ <ui:panelGroup binding="#{EditJobs.groupPanel2}" id="groupPanel2">
+ <ui:button action="#{EditJobs.createDefault_action}" binding="#{EditJobs.createDefault}" id="createDefault" text="Create Default Job-Definitions"/>
+ <ui:button action="#{EditJobs.btnAddNewEntry_action}" binding="#{EditJobs.btnAddNewEntry}" id="btnAddNewEntry" text="Add New"/>
+ </ui:panelGroup>
+ <ui:table augmentTitle="false" binding="#{EditJobs.table1}" id="table1" title="Jobs">
+ <ui:tableRowGroup binding="#{EditJobs.tableRowGroup1}" id="tableRowGroup1" rows="10"
+ sourceData="#{SessionBean1.jobsDataProvider}" sourceVar="currentRow">
+ <ui:tableColumn binding="#{EditJobs.tableColumn1}" headerText="Name" id="tableColumn1" noWrap="true" sort="job_name">
+ <ui:hyperlink action="#{EditJobs.hlEditEntry_action}" binding="#{EditJobs.hlEditEntry}" id="hlEditEntry" text="#{currentRow.value['job_name']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{EditJobs.tableColumn2}" headerText="Description" id="tableColumn2">
+ <ui:staticText binding="#{EditJobs.staticText2}" id="staticText2" text="#{currentRow.value['job_description']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{EditJobs.tableColumn3}" headerText="CRON Settings" id="tableColumn3" noWrap="true">
+ <ui:staticText binding="#{EditJobs.staticText3}" id="staticText3" text="#{currentRow.value['job_cron_settings']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{EditJobs.tableColumn6}" headerText="Last Run" id="tableColumn6" noWrap="true">
+ <ui:staticText binding="#{EditJobs.staticText5}" id="staticText5" text="#{currentRow.value['job_last_run_date']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{EditJobs.tableColumn4}" headerText="(En/Dis)abled" id="tableColumn4" noWrap="true">
+ <ui:hyperlink action="#{EditJobs.hlToogle_action}" binding="#{EditJobs.hlToogle}" id="hlToogle" text="#{EditJobs.enabledDisabledText}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{EditJobs.tableColumn5}" id="tableColumn5">
+ <ui:button binding="#{EditJobs.btnDeleteJob}" id="btnDeleteJob" text="Delete"/>
+ </ui:tableColumn>
+ </ui:tableRowGroup>
+ </ui:table>
+ </ui:panelGroup>
+ <jsp:directive.include file="Footer.jspf"/>
</ui:form>
</ui:body>
</ui:html>
Modified: amavisadmin/trunk/web/EditSingleJob.jsp
===================================================================
--- amavisadmin/trunk/web/EditSingleJob.jsp 2007-01-17 18:37:34 UTC (rev 22)
+++ amavisadmin/trunk/web/EditSingleJob.jsp 2007-01-17 21:21:14 UTC (rev 23)
@@ -7,47 +7,46 @@
<ui:head binding="#{EditSingleJob.head1}" id="head1" title="Edit Job">
<ui:link binding="#{EditSingleJob.link1}" id="link1" url="/resources/stylesheet.css"/>
</ui:head>
- <ui:body binding="#{EditSingleJob.body1}" focus="form1:fldJobName" id="body1" style="-rave-layout: grid">
- <div style="left: 0px; top: 0px; position: absolute">
- <jsp:directive.include file="Header.jspf"/>
- </div>
+ <ui:body binding="#{EditSingleJob.body1}" focus="form1:fldJobName" id="body1">
+ <jsp:directive.include file="Header.jspf"/>
<ui:form binding="#{EditSingleJob.form1}" id="form1">
- <ui:button action="#{EditSingleJob.btnSave_action}" binding="#{EditSingleJob.btnSave}" id="btnSave"
- style="left: 23px; top: 144px; position: absolute" text="Save"/>
- <ui:button action="#{EditSingleJob.btnCancel_action}" binding="#{EditSingleJob.btnCancel}" id="btnCancel"
- style="position: absolute; left: 120px; top: 144px" text="Cancel"/>
- <h:panelGrid binding="#{EditSingleJob.gridPanel1}" cellpadding="5" columns="2" id="gridPanel1"
- style="height: 96px; left: 24px; top: 192px; position: absolute" width="648">
- <ui:label binding="#{EditSingleJob.label1}" for="fldJobName" id="label1" text="Job-Name"/>
- <ui:textField binding="#{EditSingleJob.fldJobName}" id="fldJobName" required="true"/>
- <ui:label binding="#{EditSingleJob.label3}" for="fldDescription" id="label3" text="Description"/>
- <ui:textArea binding="#{EditSingleJob.fldDescription}" columns="40" id="fldDescription" required="true" rows="4"/>
- <ui:label binding="#{EditSingleJob.labCRON}" for="fldCRONSchedule" id="labCRON" text="Scheduling"/>
- <ui:textField binding="#{EditSingleJob.fldCRONSchedule}" id="fldCRONSchedule" required="true" validator="#{EditSingleJob.fldCRONSchedule_validate}"/>
- <ui:label binding="#{EditSingleJob.label2}" for="dropDown1" id="label2" text="Job Class"/>
- <ui:dropDown binding="#{EditSingleJob.dropDown1}" id="dropDown1" items="#{EditSingleJob.dropDown1DefaultOptions.options}"
- onChange="common_timeoutSubmitForm(this.form, 'gridPanel1:dropDown1');" required="true" valueChangeListener="#{EditSingleJob.dropDown1_processValueChange}"/>
- <ui:hiddenField binding="#{EditSingleJob.hiddenField1}" id="hiddenField1"/>
- <ui:checkbox binding="#{EditSingleJob.chkEnabled}" id="chkEnabled" label="Enabled" labelLevel="2"/>
- </h:panelGrid>
- <ui:table augmentTitle="false" binding="#{EditSingleJob.table1}" id="table1"
- style="left: 24px; top: 432px; position: absolute; width: 440px" title="Configuration Settings">
- <ui:tableRowGroup binding="#{EditSingleJob.tableRowGroup1}" emptyDataMsg="No configuration entries defined for this job"
- id="tableRowGroup1" rows="10" sourceData="#{EditSingleJob.configurationTableEntries}" sourceVar="currentRow">
- <ui:tableColumn binding="#{EditSingleJob.tableColumn1}" headerText="Field" id="tableColumn1" sort="name">
- <ui:staticText binding="#{EditSingleJob.staticText1}" id="staticText1" text="#{currentRow.value['name']}"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{EditSingleJob.tableColumn2}" headerText="Value" id="tableColumn2" sort="value">
- <ui:textField binding="#{EditSingleJob.textField1}" id="textField1" required="#{EditSingleJob.inputRequired}" text="#{currentRow.value['value']}"/>
- <ui:message binding="#{EditSingleJob.message1}" for="textField1" id="message1" showDetail="false" showSummary="true"/>
- </ui:tableColumn>
- <ui:tableColumn binding="#{EditSingleJob.tableColumn3}" id="tableColumn3" width="200">
- <ui:button action="#{EditSingleJob.btnReset_action}" binding="#{EditSingleJob.btnReset}"
- disabled="#{EditSingleJob.resetPossible}" id="btnReset" text="Reset"/>
- </ui:tableColumn>
- </ui:tableRowGroup>
- </ui:table>
+ <ui:panelGroup binding="#{EditSingleJob.groupPanel1}" block="true" id="groupPanel1" style="margin: 5px; padding: 5px; ">
+ <ui:panelGroup binding="#{EditSingleJob.groupPanel2}" id="groupPanel2">
+ <ui:button action="#{EditSingleJob.btnSave_action}" binding="#{EditSingleJob.btnSave}" id="btnSave" text="Save"/>
+ <ui:button action="#{EditSingleJob.btnCancel_action}" binding="#{EditSingleJob.btnCancel}" id="btnCancel" text="Cancel"/>
+ </ui:panelGroup>
+ <h:panelGrid binding="#{EditSingleJob.gridPanel1}" cellpadding="5" columns="2" id="gridPanel1" style="height: 96px" width="648">
+ <ui:label binding="#{EditSingleJob.label1}" for="fldJobName" id="label1" text="Job-Name"/>
+ <ui:textField binding="#{EditSingleJob.fldJobName}" id="fldJobName" required="true"/>
+ <ui:label binding="#{EditSingleJob.label3}" for="fldDescription" id="label3" text="Description"/>
+ <ui:textArea binding="#{EditSingleJob.fldDescription}" columns="40" id="fldDescription" required="true" rows="4"/>
+ <ui:label binding="#{EditSingleJob.labCRON}" for="fldCRONSchedule" id="labCRON" text="Scheduling"/>
+ <ui:textField binding="#{EditSingleJob.fldCRONSchedule}" id="fldCRONSchedule" required="true" validator="#{EditSingleJob.fldCRONSchedule_validate}"/>
+ <ui:label binding="#{EditSingleJob.label2}" for="dropDown1" id="label2" text="Job Class"/>
+ <ui:dropDown binding="#{EditSingleJob.dropDown1}" id="dropDown1" items="#{EditSingleJob.dropDown1DefaultOptions.options}"
+ onChange="common_timeoutSubmitForm(this.form, 'gridPanel1:dropDown1');" required="true" valueChangeListener="#{EditSingleJob.dropDown1_processValueChange}"/>
+ <ui:hiddenField binding="#{EditSingleJob.hiddenField1}" id="hiddenField1"/>
+ <ui:checkbox binding="#{EditSingleJob.chkEnabled}" id="chkEnabled" label="Enabled" labelLevel="2"/>
+ </h:panelGrid>
+ <ui:table augmentTitle="false" binding="#{EditSingleJob.table1}" id="table1" style="width: 440px" title="Configuration Settings">
+ <ui:tableRowGroup binding="#{EditSingleJob.tableRowGroup1}" emptyDataMsg="No configuration entries defined for this job"
+ id="tableRowGroup1" rows="10" sourceData="#{EditSingleJob.configurationTableEntries}" sourceVar="currentRow">
+ <ui:tableColumn binding="#{EditSingleJob.tableColumn1}" headerText="Field" id="tableColumn1" sort="name">
+ <ui:staticText binding="#{EditSingleJob.staticText1}" id="staticText1" text="#{currentRow.value['name']}"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{EditSingleJob.tableColumn2}" headerText="Value" id="tableColumn2" sort="value">
+ <ui:textField binding="#{EditSingleJob.textField1}" id="textField1" required="#{EditSingleJob.inputRequired}" text="#{currentRow.value['value']}"/>
+ <ui:message binding="#{EditSingleJob.message1}" for="textField1" id="message1" showDetail="false" showSummary="true"/>
+ </ui:tableColumn>
+ <ui:tableColumn binding="#{EditSingleJob.tableColumn3}" id="tableColumn3" ...
[truncated message content] |
