renamed better
This commit is contained in:
Willem Cazander
parent
cc6331b7fe
commit
a523cc9122
289 changed files with 2546 additions and 1608 deletions
|
|
@ -2,17 +2,17 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>vasc</artifactId>
|
||||
<groupId>org.x4o.vasc</groupId>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<version>0.3.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>org.x4o.vasc</groupId>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-frontend-swing</artifactId>
|
||||
<version>0.3.5-SNAPSHOT</version>
|
||||
<name>vasc-frontend-swing</name>
|
||||
<description>vasc-frontend-swing</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.x4o.vasc</groupId>
|
||||
<groupId>net.forwardfire.vasc</groupId>
|
||||
<artifactId>vasc-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
|
@ -30,5 +30,11 @@
|
|||
<artifactId>microba</artifactId>
|
||||
<version>0.4.4.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>de.odysseus.juel</groupId>
|
||||
<artifactId>juel</artifactId>
|
||||
<version>${juel.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing;
|
||||
package net.forwardfire.vasc.frontends.swing;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Color;
|
||||
|
|
@ -64,24 +64,25 @@ import javax.swing.table.JTableHeader;
|
|||
import javax.swing.table.TableCellRenderer;
|
||||
import javax.swing.table.TableColumn;
|
||||
|
||||
import org.x4o.vasc.core.AbstractVascFrontend;
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascFrontendData;
|
||||
import org.x4o.vasc.core.actions.GlobalVascAction;
|
||||
import org.x4o.vasc.core.actions.RowVascAction;
|
||||
import org.x4o.vasc.core.entry.VascEntryExporter;
|
||||
import org.x4o.vasc.core.entry.VascEntryFrontendEventListener;
|
||||
import org.x4o.vasc.core.ui.VascColumnValueModelListener;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import org.x4o.vasc.frontends.swing.ui.SwingBoolean;
|
||||
import org.x4o.vasc.frontends.swing.ui.SwingButton;
|
||||
import org.x4o.vasc.frontends.swing.ui.SwingColorChooser;
|
||||
import org.x4o.vasc.frontends.swing.ui.SwingLabel;
|
||||
import org.x4o.vasc.frontends.swing.ui.SwingList;
|
||||
import org.x4o.vasc.frontends.swing.ui.SwingText;
|
||||
import org.x4o.vasc.frontends.swing.ui.SwingTextArea;
|
||||
import net.forwardfire.vasc.core.AbstractVascFrontend;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascFrontendData;
|
||||
import net.forwardfire.vasc.core.actions.GlobalVascAction;
|
||||
import net.forwardfire.vasc.core.actions.RowVascAction;
|
||||
import net.forwardfire.vasc.core.entry.VascEntryExporter;
|
||||
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
|
||||
import net.forwardfire.vasc.core.ui.VascColumnValueModelListener;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.frontends.swing.ui.SwingBoolean;
|
||||
import net.forwardfire.vasc.frontends.swing.ui.SwingButton;
|
||||
import net.forwardfire.vasc.frontends.swing.ui.SwingColorChooser;
|
||||
import net.forwardfire.vasc.frontends.swing.ui.SwingLabel;
|
||||
import net.forwardfire.vasc.frontends.swing.ui.SwingList;
|
||||
import net.forwardfire.vasc.frontends.swing.ui.SwingText;
|
||||
import net.forwardfire.vasc.frontends.swing.ui.SwingTextArea;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -100,7 +101,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.VascFrontend#getFrontendType()
|
||||
* @see net.forwardfire.vasc.core.VascFrontend#getFrontendType()
|
||||
*/
|
||||
public String getFrontendType() {
|
||||
return "swing";
|
||||
|
|
@ -145,7 +146,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
|
|||
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.VascViewRenderer#renderEdit(org.x4o.vasc.core.VascEntry, java.lang.Object)
|
||||
* @see net.forwardfire.vasc.core.VascViewRenderer#renderEdit(net.forwardfire.vasc.core.VascEntry, java.lang.Object)
|
||||
*/
|
||||
public void renderEdit() throws Exception {
|
||||
logger.fine("Rending Edit View");
|
||||
|
|
@ -327,7 +328,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
|
|||
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.VascViewRenderer#renderExport(org.x4o.vasc.core.VascEntry, org.x4o.vasc.core.VascDataExporter)
|
||||
* @see net.forwardfire.vasc.core.VascViewRenderer#renderExport(net.forwardfire.vasc.core.VascEntry, net.forwardfire.vasc.core.VascDataExporter)
|
||||
*/
|
||||
public void renderExport(VascEntryExporter exporter) throws Exception {
|
||||
|
||||
|
|
@ -361,7 +362,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
|
|||
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.VascViewRenderer#renderView(org.x4o.vasc.core.VascEntry)
|
||||
* @see net.forwardfire.vasc.core.VascViewRenderer#renderView(net.forwardfire.vasc.core.VascEntry)
|
||||
*/
|
||||
public void renderView() throws Exception {
|
||||
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.event.ActionEvent;
|
||||
|
|
@ -33,11 +33,12 @@ import java.awt.event.ActionListener;
|
|||
import javax.swing.JCheckBox;
|
||||
import javax.swing.JComponent;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -62,7 +63,7 @@ public class SwingBoolean implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (checkBox==null) {
|
||||
|
|
@ -72,7 +73,7 @@ public class SwingBoolean implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (checkBox==null) {
|
||||
|
|
@ -87,28 +88,28 @@ public class SwingBoolean implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !checkBox.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
checkBox.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return checkBox.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
checkBox.setVisible(rendered);
|
||||
|
|
@ -24,18 +24,19 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JComponent;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -58,7 +59,7 @@ public class SwingButton implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (vascButton==null) {
|
||||
|
|
@ -68,7 +69,7 @@ public class SwingButton implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (vascButton==null) {
|
||||
|
|
@ -83,28 +84,28 @@ public class SwingButton implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !vascButton.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
vascButton.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return vascButton.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
vascButton.setVisible(rendered);
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.event.ActionEvent;
|
||||
|
|
@ -34,11 +34,12 @@ import javax.swing.JButton;
|
|||
import javax.swing.JColorChooser;
|
||||
import javax.swing.JComponent;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -61,7 +62,7 @@ public class SwingColorChooser implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (colorButton==null) {
|
||||
|
|
@ -71,7 +72,7 @@ public class SwingColorChooser implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (colorButton==null) {
|
||||
|
|
@ -86,28 +87,28 @@ public class SwingColorChooser implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !colorButton.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
colorButton.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return colorButton.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
colorButton.setVisible(rendered);
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.event.ActionEvent;
|
||||
|
|
@ -34,11 +34,12 @@ import java.util.Date;
|
|||
|
||||
import javax.swing.JComponent;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
import com.michaelbaranov.microba.calendar.DatePicker;
|
||||
|
||||
|
|
@ -68,7 +69,7 @@ public class SwingDate implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (datePicker==null) {
|
||||
|
|
@ -78,7 +79,7 @@ public class SwingDate implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (datePicker==null) {
|
||||
|
|
@ -93,28 +94,28 @@ public class SwingDate implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !datePicker.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
datePicker.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return datePicker.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
datePicker.setVisible(rendered);
|
||||
|
|
@ -24,18 +24,19 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JLabel;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -59,7 +60,7 @@ public class SwingLabel implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (label==null) {
|
||||
|
|
@ -69,7 +70,7 @@ public class SwingLabel implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (label==null) {
|
||||
|
|
@ -84,28 +85,28 @@ public class SwingLabel implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !label.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
label.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return label.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
label.setVisible(rendered);
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
|
|
@ -37,13 +37,14 @@ import javax.swing.JLabel;
|
|||
import javax.swing.JList;
|
||||
import javax.swing.ListCellRenderer;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascSelectItem;
|
||||
import org.x4o.vasc.core.ui.VascSelectItemModel;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascSelectItem;
|
||||
import net.forwardfire.vasc.core.ui.VascSelectItemModel;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -98,7 +99,7 @@ public class SwingList implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (comboBox==null) {
|
||||
|
|
@ -108,7 +109,7 @@ public class SwingList implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (comboBox==null) {
|
||||
|
|
@ -123,28 +124,28 @@ public class SwingList implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !comboBox.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
comboBox.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return comboBox.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
comboBox.setVisible(rendered);
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
|
|
@ -33,11 +33,12 @@ import javax.swing.JTextField;
|
|||
import javax.swing.event.DocumentEvent;
|
||||
import javax.swing.event.DocumentListener;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -61,7 +62,7 @@ public class SwingText implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (textField==null) {
|
||||
|
|
@ -71,7 +72,7 @@ public class SwingText implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (textField==null) {
|
||||
|
|
@ -86,28 +87,28 @@ public class SwingText implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !textField.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
textField.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return textField.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
textField.setVisible(rendered);
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc.frontends.swing.ui;
|
||||
package net.forwardfire.vasc.frontends.swing.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
|
|
@ -34,11 +34,12 @@ import javax.swing.JTextArea;
|
|||
import javax.swing.event.DocumentEvent;
|
||||
import javax.swing.event.DocumentListener;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.ui.VascUIComponent;
|
||||
import org.x4o.vasc.core.ui.VascValueModel;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.ui.VascUIComponent;
|
||||
import net.forwardfire.vasc.core.ui.VascValueModel;
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -70,7 +71,7 @@ public class SwingTextArea implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
|
||||
*/
|
||||
public String getErrorText() {
|
||||
if (textArea==null) {
|
||||
|
|
@ -80,7 +81,7 @@ public class SwingTextArea implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
|
||||
*/
|
||||
public void setErrorText(String text) {
|
||||
if (textArea==null) {
|
||||
|
|
@ -95,28 +96,28 @@ public class SwingTextArea implements VascUIComponent {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return !textArea.isEnabled();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
|
||||
*/
|
||||
public void setDisabled(boolean disabled) {
|
||||
textArea.setEnabled(!disabled);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#isRendered()
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
|
||||
*/
|
||||
public boolean isRendered() {
|
||||
return textArea.isVisible();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
|
||||
*/
|
||||
public void setRendered(boolean rendered) {
|
||||
textArea.setVisible(rendered);
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc;
|
||||
package net.forwardfire.vasc;
|
||||
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
|
@ -35,8 +35,9 @@ import javax.swing.JMenuBar;
|
|||
import javax.swing.JMenuItem;
|
||||
import javax.swing.JPanel;
|
||||
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.frontends.swing.SwingVascFrontend;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.frontends.swing.SwingVascFrontend;
|
||||
|
||||
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
|
@ -61,7 +62,7 @@ public class SwingTest extends TestCase {
|
|||
|
||||
public void testNull() throws Exception {
|
||||
assertEquals(true, true);
|
||||
main(new String[] {});
|
||||
//main(new String[] {});
|
||||
}
|
||||
|
||||
public static void main(String[] argu){
|
||||
|
|
@ -25,19 +25,20 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc;
|
||||
package net.forwardfire.vasc;
|
||||
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.x4o.vasc.annotations.VascDefaultValue;
|
||||
import org.x4o.vasc.annotations.VascEntry;
|
||||
import org.x4o.vasc.annotations.VascI18n;
|
||||
import org.x4o.vasc.annotations.VascModelReference;
|
||||
import org.x4o.vasc.annotations.VascStyle;
|
||||
import org.x4o.vasc.validators.VascDateFuture;
|
||||
import org.x4o.vasc.validators.VascObjectNotNull;
|
||||
import org.x4o.vasc.validators.VascStringLength;
|
||||
import net.forwardfire.vasc.annotations.VascDefaultValue;
|
||||
import net.forwardfire.vasc.annotations.VascEntry;
|
||||
import net.forwardfire.vasc.annotations.VascI18n;
|
||||
import net.forwardfire.vasc.annotations.VascModelReference;
|
||||
import net.forwardfire.vasc.annotations.VascStyle;
|
||||
import net.forwardfire.vasc.validators.VascDateFuture;
|
||||
import net.forwardfire.vasc.validators.VascObjectNotNull;
|
||||
import net.forwardfire.vasc.validators.VascStringLength;
|
||||
|
||||
|
||||
//import org.hibernate.validator.NotNull;
|
||||
//import org.hibernate.validator.Max;
|
||||
|
|
@ -24,23 +24,24 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc;
|
||||
package net.forwardfire.vasc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.x4o.vasc.core.AbstractVascBackend;
|
||||
import org.x4o.vasc.core.VascBackendState;
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.entry.VascEntryFieldValue;
|
||||
import org.x4o.vasc.core.entry.VascEntryRecordCreator;
|
||||
import org.x4o.vasc.core.ui.VascSelectItem;
|
||||
import org.x4o.vasc.core.ui.VascSelectItemModel;
|
||||
import org.x4o.vasc.impl.entry.BeanPropertyVascEntryFieldValue;
|
||||
import org.x4o.vasc.impl.entry.BeanVascEntryRecordCreator;
|
||||
import net.forwardfire.vasc.core.AbstractVascBackend;
|
||||
import net.forwardfire.vasc.core.VascBackendState;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.entry.VascEntryFieldValue;
|
||||
import net.forwardfire.vasc.core.entry.VascEntryRecordCreator;
|
||||
import net.forwardfire.vasc.core.ui.VascSelectItem;
|
||||
import net.forwardfire.vasc.core.ui.VascSelectItemModel;
|
||||
import net.forwardfire.vasc.impl.entry.BeanPropertyVascEntryFieldValue;
|
||||
import net.forwardfire.vasc.impl.entry.BeanVascEntryRecordCreator;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -24,34 +24,35 @@
|
|||
* should not be interpreted as representing official policies, either expressed or implied, of IDCA.
|
||||
*/
|
||||
|
||||
package org.x4o.vasc;
|
||||
package net.forwardfire.vasc;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.x4o.vasc.core.VascBackend;
|
||||
import org.x4o.vasc.core.VascBackendControllerLocal;
|
||||
import org.x4o.vasc.core.VascController;
|
||||
import org.x4o.vasc.core.VascEntry;
|
||||
import org.x4o.vasc.core.VascEntryField;
|
||||
import org.x4o.vasc.core.VascException;
|
||||
import org.x4o.vasc.core.VascFrontendData;
|
||||
import org.x4o.vasc.impl.DefaultVascBackedEntryFinalizer;
|
||||
import org.x4o.vasc.impl.DefaultVascFactory;
|
||||
import org.x4o.vasc.impl.DefaultVascFrontendData;
|
||||
import org.x4o.vasc.impl.DefaultVascFrontendHelper;
|
||||
import org.x4o.vasc.impl.VascBackendProxyPaged;
|
||||
import org.x4o.vasc.impl.VascBackendProxySearch;
|
||||
import org.x4o.vasc.impl.VascBackendProxySort;
|
||||
import org.x4o.vasc.impl.actions.AddRowAction;
|
||||
import org.x4o.vasc.impl.actions.CSVExportGlobalAction;
|
||||
import org.x4o.vasc.impl.actions.DeleteRowAction;
|
||||
import org.x4o.vasc.impl.actions.EditRowAction;
|
||||
import org.x4o.vasc.impl.actions.RefreshDataGlobalAction;
|
||||
import org.x4o.vasc.impl.actions.XMLExportGlobalAction;
|
||||
import org.x4o.vasc.impl.x4o.VascParser;
|
||||
import net.forwardfire.vasc.core.VascBackend;
|
||||
import net.forwardfire.vasc.core.VascBackendControllerLocal;
|
||||
import net.forwardfire.vasc.core.VascController;
|
||||
import net.forwardfire.vasc.core.VascEntry;
|
||||
import net.forwardfire.vasc.core.VascEntryField;
|
||||
import net.forwardfire.vasc.core.VascException;
|
||||
import net.forwardfire.vasc.core.VascFrontendData;
|
||||
import net.forwardfire.vasc.impl.DefaultVascBackedEntryFinalizer;
|
||||
import net.forwardfire.vasc.impl.DefaultVascFactory;
|
||||
import net.forwardfire.vasc.impl.DefaultVascFrontendData;
|
||||
import net.forwardfire.vasc.impl.DefaultVascFrontendHelper;
|
||||
import net.forwardfire.vasc.impl.VascBackendProxyPaged;
|
||||
import net.forwardfire.vasc.impl.VascBackendProxySearch;
|
||||
import net.forwardfire.vasc.impl.VascBackendProxySort;
|
||||
import net.forwardfire.vasc.impl.actions.AddRowAction;
|
||||
import net.forwardfire.vasc.impl.actions.CSVExportGlobalAction;
|
||||
import net.forwardfire.vasc.impl.actions.DeleteRowAction;
|
||||
import net.forwardfire.vasc.impl.actions.EditRowAction;
|
||||
import net.forwardfire.vasc.impl.actions.RefreshDataGlobalAction;
|
||||
import net.forwardfire.vasc.impl.actions.XMLExportGlobalAction;
|
||||
import net.forwardfire.vasc.impl.x4o.VascParser;
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -76,7 +77,7 @@ public class TestTable {
|
|||
static public void fill(VascEntry entry,VascController vascController) {
|
||||
|
||||
|
||||
VascFrontendData frontendData = DefaultVascFactory.getDefaultVascFrontendData("i18n.vasc", Locale.getDefault());
|
||||
VascFrontendData frontendData = DefaultVascFactory.getDefaultVascFrontendData(null); //DefaultVascFactory.getDefaultVascFrontendData("i18n.vasc", Locale.getDefault());
|
||||
frontendData.setVascController(vascController);
|
||||
entry.setVascFrontendData(frontendData);
|
||||
VascBackend backend = DefaultVascFactory.getProxyVascBackend(entry);
|
||||
|
|
@ -109,7 +110,7 @@ public class TestTable {
|
|||
VascParser parser = new VascParser(c);
|
||||
File f = File.createTempFile("test-vasc", ".xml");
|
||||
parser.setDebugOutputStream(new FileOutputStream(f));
|
||||
parser.parseResource("vasc/tables.xml");
|
||||
parser.parseResource("net/forwardfire/vasc/tables.xml");
|
||||
|
||||
VascEntry entry = parser.getVascController().getVascEntryController().getVascEntryById("test1");
|
||||
fill(entry,c);
|
||||
|
|
@ -0,0 +1,318 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<x4o:root xmlns:v="http://vasc.idcanet.com/eld/vasc-lang.eld"
|
||||
xmlns:x4o="http://eld.x4o.org/eld/x4o-lang.eld"
|
||||
>
|
||||
<!--
|
||||
<v:simpleJdbcConnectionProvider
|
||||
el.id="dbDatafeeds"
|
||||
driverClassName="org.postgresql.Driver"
|
||||
dbUrl="jdbc:postgresql://db0.dev.lan.mbuyu.nl/datafeeds_dev"
|
||||
dbUser="mbuyu"
|
||||
dbPassword="eephoh2O"
|
||||
/>
|
||||
<v:jdbcBackend
|
||||
id="dbStreams"
|
||||
jdbcConnectionProvider="${dbDatafeeds}"
|
||||
idColumnName="id"
|
||||
sqlList="SELECT * FROM stream LIMIT 100"
|
||||
sqlDelete="DELETE FROM stream WHERE id = ?0"
|
||||
sqlPersist="INSERT INTO stream (name,url,importing,etc) VALUES (?0,?1,?2,?3,?4)"
|
||||
sqlMerge="UPDATE stream (name,url) VALUE (?0,?1)"
|
||||
/>
|
||||
|
||||
<v:entry id="streams" backendId="dbStreams">
|
||||
<v:field id="id" readOnly="true"/>
|
||||
<v:field id="name"/>
|
||||
<v:field id="url"/>
|
||||
<v:field id="importing" vascEntryFieldType="BooleanField"/>
|
||||
<v:field id="last_parsed" vascEntryFieldType="DateField" />
|
||||
<v:field id="last_checked" vascEntryFieldType="DateField"/>
|
||||
|
||||
<v:field id="parser_locale" list="false"/>
|
||||
<v:field id="column_mapping" list="false"/>
|
||||
</v:entry>
|
||||
|
||||
|
||||
|
||||
<v:simpleLdapConnectionProvider
|
||||
el.id="ldapSudoers"
|
||||
ldapHost="ldap2.lan.mbuyu.nl"
|
||||
bindUser="uid=admin-sudo,ou=services,dc=m4n,dc=nl"
|
||||
bindPass="adminSudo"
|
||||
/>
|
||||
<v:ldapBackend
|
||||
id="ldapBackendSudoers"
|
||||
ldapConnectionProvider="${ldapSudoers}"
|
||||
baseDN="ou=sudoers,dc=m4n,dc=nl"
|
||||
keyAttribute="cn"
|
||||
ldapFilter="(&(objectClass=sudoRole))"
|
||||
/>
|
||||
-->
|
||||
|
||||
<!--
|
||||
<v:entry id="sudoers" backendId="ldapBackendSudoers">
|
||||
<v:field id="user" backendName="cn" readOnly="true"/>
|
||||
<v:field id="description" rolesEdit="admin" rolesList="all"/>
|
||||
<v:field id="sudoCommand" vascEntryFieldType="MultiTextField"/>
|
||||
<v:field id="sudoHost" vascEntryFieldType="MultiTextField"/>
|
||||
<v:field id="sudoUser" vascEntryFieldType="MultiTextField"/>
|
||||
|
||||
|
||||
<v:ldapNextIdFunction name="nextUidNumber" ldapFilter="(&(objectClass=posixGroup))" ldapAttribute="gidnumber"/>
|
||||
|
||||
<v:listeners hook="post_create">
|
||||
<etc:loginToFtpServer/>
|
||||
</v:listeners>
|
||||
|
||||
<v:link fieldName="user" viewController="ldapUsers" parameterName="user_cn"/>
|
||||
<v:link fieldName="gidNumber" viewController="ldapGroups" parameterName="group_key,${baseDn}"/>
|
||||
|
||||
<v:detail fieldName="gidNumber" detailController="${ldapGroups}"/>
|
||||
</v:entry>
|
||||
-->
|
||||
|
||||
<!--
|
||||
<v:simpleLdapConnectionProvider
|
||||
el.id="ldapUsers"
|
||||
ldapHost="ldap2.lan.mbuyu.nl"
|
||||
bindUser="uid=admin-users,ou=services,dc=m4n,dc=nl"
|
||||
bindPass="superAU"
|
||||
/>
|
||||
<v:ldapBackend
|
||||
id="ldapBackendUsers"
|
||||
ldapConnectionProvider="${ldapUsers}"
|
||||
baseDN="ou=users,dc=m4n,dc=nl"
|
||||
keyAttribute="uid"
|
||||
ldapFilter="(&(objectClass=posixAccount))"
|
||||
/>
|
||||
<v:entry id="users" backendId="ldapBackendUsers">
|
||||
<v:field id="uid" />
|
||||
<v:field id="uidNumber" vascEntryFieldType="IntegerField"/>
|
||||
<v:field id="gidNumber" vascEntryFieldType="IntegerField"/>
|
||||
<v:field id="loginShell" list="false"/>
|
||||
<v:field id="homeDirectory" list="false"/>
|
||||
<v:field id="cn" list="false"/>
|
||||
<v:field id="givenName" />
|
||||
<v:field id="sn" />
|
||||
<v:field id="mailbox" list="false"/>
|
||||
<v:field id="mail" vascEntryFieldType="EmailField"/>
|
||||
<v:field id="mailActive" vascEntryFieldType="BooleanField"/>
|
||||
<v:field id="alias" vascEntryFieldType="MultiTextField" list="false"/>
|
||||
|
||||
<v:field id="autoResponseActive" vascEntryFieldType="BooleanField" />
|
||||
<v:field id="autoresponseMessage" vascEntryFieldType="TextAreaField" list="false"/>
|
||||
<v:field id="sambaAcctFlags" list="false"/>
|
||||
<v:field id="sambaPrimaryGroupSID" list="false"/>
|
||||
<v:field id="sambaSID" list="false"/>
|
||||
|
||||
<v:field id="m4nVPNActive" vascEntryFieldType="BooleanField"/>
|
||||
<v:field id="m4nDateInService" />
|
||||
<v:field id="m4nDateOutService" />
|
||||
<v:field id="m4nUserId" vascEntryFieldType="IntegerField"/>
|
||||
<v:field id="m4nHosts" vascEntryFieldType="MultiTextField"/>
|
||||
</v:entry>
|
||||
|
||||
|
||||
<v:simpleLdapConnectionProvider
|
||||
el.id="ldapMachines"
|
||||
ldapHost="ldap2.lan.mbuyu.nl"
|
||||
bindUser="uid=samba,ou=services,dc=m4n,dc=nl"
|
||||
bindPass="superS"
|
||||
/>
|
||||
<v:ldapBackend
|
||||
id="ldapBackendMachines"
|
||||
ldapConnectionProvider="${ldapMachines}"
|
||||
baseDN="ou=machines,dc=m4n,dc=nl"
|
||||
keyAttribute="uid"
|
||||
ldapFilter="(&(objectClass=sambaSamAccount))"
|
||||
/>
|
||||
<v:entry id="machines" backendId="ldapBackendMachines">
|
||||
<v:field id="uid" />
|
||||
<v:field id="sambaAcctFlags"/>
|
||||
<v:field id="sambaSID" />
|
||||
<v:field id="uidNumber" />
|
||||
</v:entry>
|
||||
-->
|
||||
|
||||
|
||||
<v:entry id="test1" backendId="testBackend1">
|
||||
<v:field id="name" defaultValue=""/>
|
||||
<v:field id="description" vascEntryFieldType="EmailField" defaultValue="email@address.nl"/>
|
||||
<v:field id="active" defaultValue="true"/>
|
||||
<v:field id="date" vascEntryFieldType="DateField" defaultValue=""/>
|
||||
<v:field id="hexColor" vascEntryFieldType="ColorField" defaultValue="#FF3355"/>
|
||||
<v:field id="testModel" vascEntryFieldType="ListField" dataObject="$myBean.testBackend1"
|
||||
vascEntryFieldType.dataObject="#{vascController.vascBackendControllerResolver.vascBackendController.vascBackendById('testBackend1')}"
|
||||
/>
|
||||
</v:entry>
|
||||
|
||||
|
||||
<!--
|
||||
|
||||
- View
|
||||
- States
|
||||
- Tables
|
||||
- Columns
|
||||
|
||||
|
||||
|
||||
Master
|
||||
- Details
|
||||
|
||||
-->
|
||||
<!--
|
||||
<x4o:bean el.id="dataSource" bean.class="com.id.."/>
|
||||
<x4o:bean el.id="tableController" bean.class="com.id.."/>
|
||||
|
||||
|
||||
<v:vascView name="test1">
|
||||
<v:vascTableController>
|
||||
</v:vascTableController>
|
||||
<v:vascBackendController>
|
||||
<v:vascJDBCQueryController>
|
||||
<x4o:property name="list">select id,name,blog_status_id,description,slug from blog_post</x4o:property>
|
||||
<x4o:property name="update">update (id,name,blog_status_id,description,slug) values(?,?,?,?,?) from blog_post where id=?</x4o:property>
|
||||
<x4o:property name="create">instert into (id,name,blog_status_id,description,slug) values(?,?,?,?,?) from blog_post where id=?</x4o:property>
|
||||
<x4o:property name="delete">delete from blog_post where id=?</x4o:property>
|
||||
</v:vascJDBCQueryController>
|
||||
</v:vascBackendController>
|
||||
|
||||
<v:vascField name="">
|
||||
<v:vascFieldOptions/>
|
||||
<v:vascFieldChoises/>
|
||||
</v:vascField>
|
||||
<v:vascField name="">
|
||||
<v:vascUserRoles list="admin"/>
|
||||
</v:vascField>
|
||||
|
||||
</v:vascView>
|
||||
|
||||
<x4o:template el.id="ldapServerTemplate">
|
||||
<v:ldapConnection name="main">
|
||||
<x4o:property name="connectionUrl" value="ldaps://ldap.office.mbuyu.nl"/>
|
||||
</v:ldapConnection>
|
||||
</x4o:template>
|
||||
|
||||
<v:ldapConnection el.id="sudoers" x4o.templates="ldapServerTemplate">
|
||||
<x4o:property name="user" value="uid=admin-sudo,ou=services,dc=m4n,dc=nl"/>
|
||||
<x4o:property name="pass" value="adminSudo"/>
|
||||
<x4o:property name="baseDn" value="ou=sudoers,dc=m4n,dc=nl"/>
|
||||
</v:ldapConnection>
|
||||
|
||||
<x4o:template el.id="sudoTemplate">
|
||||
<v:field name="user" backendName="cn" readOnly="true"/>
|
||||
<v:field name="description" backendName="description"/>
|
||||
<v:field name="sudoCommand" fieldEditor="listField"/>
|
||||
<v:field name="sudoHost" fieldEditor="listField"/>
|
||||
<v:field name="sudoUser" fieldEditor="listField"/>
|
||||
</x4o:template>
|
||||
|
||||
<x4o:template el.id="sambaUserSchema">
|
||||
<v:field name="sambaSID" fieldEditor="textField" edit="false" list="false" view="false" create="false" defaultValue="S-1-5-21-1200182392-965607725-1867741125-514"/>
|
||||
<v:field name="sambaGroupType" v.defaultValue="2"/>
|
||||
</x4o:template>
|
||||
|
||||
<v:viewController name="ldapUsers" primaryKey="user">
|
||||
<x4o:templateTag template="${posixUserSchema}"/>
|
||||
<x4o:templateTag template="${sambaUserSchema}">
|
||||
<v:field name="sambaGroupType" v.defaultValue="3"/>
|
||||
</x4o:templateTag>
|
||||
<v:field name="sambaGroupType" v.defaultValue="4"/>
|
||||
</v:viewController>
|
||||
|
||||
<vasc:fieldType name="EmailField2">
|
||||
<vasc:fieldHint key="validate" default="true"/>
|
||||
<vasc:fieldHint key="timeout" default="200"/>
|
||||
</vasc:fieldType>
|
||||
|
||||
<vasc:fieldType name="listField">
|
||||
<vasc:fieldHint key="validate" default="true"/>
|
||||
<vasc:fieldHint key="timeout" default="200"/>
|
||||
</vasc:fieldType>
|
||||
|
||||
-->
|
||||
|
||||
|
||||
<v:entry id="test2" backendId="testBackend1">
|
||||
<v:field id="name"/>
|
||||
<v:field id="description"/>
|
||||
<v:field id="active"/>
|
||||
<v:field id="testModel" vascEntryFieldType="ListField"/>
|
||||
</v:entry>
|
||||
|
||||
<v:entry
|
||||
id="test3"
|
||||
helpId="someHelpKey"
|
||||
image="imsdf"
|
||||
|
||||
headerName="sdf"
|
||||
headerDescription="sdfsdf"
|
||||
headerImage="sdfsdfsd"
|
||||
|
||||
primaryKeyFieldId="name"
|
||||
displayNameFieldId="name"
|
||||
|
||||
vascDisplayOnly="false"
|
||||
vascAdminList="true"
|
||||
vascAdminEdit="true"
|
||||
vascAdminCreate="true"
|
||||
vascAdminDelete="true"
|
||||
|
||||
backendId="testBackend1"
|
||||
>
|
||||
<v:field id="name"/>
|
||||
<v:field
|
||||
id="active"
|
||||
backendName="active"
|
||||
name="active"
|
||||
description="active"
|
||||
helpId="active"
|
||||
image="active"
|
||||
|
||||
defaultValue="true"
|
||||
|
||||
sizeList="100"
|
||||
sizeEdit="80"
|
||||
styleList="styleClass"
|
||||
styleEdit="styleClass"
|
||||
|
||||
choices=""
|
||||
choicesAsRadio="false"
|
||||
view="true"
|
||||
optional="false"
|
||||
|
||||
create="true"
|
||||
edit="true"
|
||||
editReadOnly="false"
|
||||
editBlank="false"
|
||||
list="true"
|
||||
|
||||
rolesCreate="admin|manager"
|
||||
rolesEdit=""
|
||||
rolesEditReadOnly=""
|
||||
rolesList=""
|
||||
|
||||
vascEntryFieldType=""
|
||||
vascEntryFieldEventChannel=""
|
||||
>
|
||||
<v:intSizeValidator min="20"/>
|
||||
</v:field>
|
||||
|
||||
<v:fieldSet
|
||||
id="set1"
|
||||
vascEntryFieldIds="name,active"
|
||||
|
||||
name="set1"
|
||||
description="set1"
|
||||
helpId="set1"
|
||||
image="set1"
|
||||
|
||||
styleList="styleClass"
|
||||
styleEdit="styleClass"
|
||||
|
||||
collapsed="false"
|
||||
optional="false"
|
||||
/>
|
||||
</v:entry>
|
||||
|
||||
</x4o:root>
|
||||
Loading…
Add table
Add a link
Reference in a new issue