Menu
▾
▴
equanda-svn-commit — svn commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
(41) |
Sep
(44) |
Oct
(31) |
Nov
(54) |
Dec
(53) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(71) |
Feb
(66) |
Mar
(65) |
Apr
(73) |
May
(68) |
Jun
(69) |
Jul
(28) |
Aug
(49) |
Sep
(44) |
Oct
(77) |
Nov
(64) |
Dec
(78) |
| 2009 |
Jan
(50) |
Feb
(28) |
Mar
(41) |
Apr
(30) |
May
(5) |
Jun
(30) |
Jul
(6) |
Aug
(2) |
Sep
(18) |
Oct
(11) |
Nov
(6) |
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(8) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tri...@us...> - 2007-09-06 16:36:22
|
Revision: 56
http://equanda.svn.sourceforge.net/equanda/?rev=56&view=rev
Author: triathlon98
Date: 2007-09-03 03:04:36 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
EQ-1 tests should be part of maven build, ifurther work
Modified Paths:
--------------
trunk/equanda-test/pom.xml
trunk/equanda-test/test-gui-t4-test/pom.xml
trunk/equanda-test/test-test/pom.xml
Added Paths:
-----------
trunk/equanda-test/test-gui-t4-test/src/
trunk/equanda-test/test-gui-t4-test/src/test/
trunk/equanda-test/test-gui-t4-test/src/test/selenium/
trunk/equanda-test/test-test/src/test/jndi.properties
trunk/test-core/
trunk/test-core/src/
trunk/test-core/src/main/
trunk/test-core/src/main/resources/
trunk/test-core/src/main/resources/META-INF/
Removed Paths:
-------------
trunk/equanda-tapestry4/src/test/selenium/
trunk/equanda-test/src/etc/META-INF/
trunk/equanda-test/src/main/equanda/
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2007-09-03 09:36:27 UTC (rev 55)
+++ trunk/equanda-test/pom.xml 2007-09-03 10:04:36 UTC (rev 56)
@@ -43,6 +43,11 @@
<type>ear</type>
</dependency>
<dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
<version>${project.version}</version>
Modified: trunk/equanda-test/test-gui-t4-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t4-test/pom.xml 2007-09-03 09:36:27 UTC (rev 55)
+++ trunk/equanda-test/test-gui-t4-test/pom.xml 2007-09-03 10:04:36 UTC (rev 56)
@@ -14,6 +14,61 @@
<description>test test</description>
<url>http://equanda.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.openqa.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>0.8.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <destFileName>selenium-server.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.agilepirates</groupId>
+ <artifactId>mavenium</artifactId>
+ <version>0.1</version>
+ <executions>
+ <execution>
+ <id>launch-selenium</id>
+ <phase>test</phase>
+ <goals>
+ <goal>launch-selenium</goal>
+ <goal>validate-selenium-tests</goal>
+ </goals>
+ <configuration>
+ <server.name>localhost</server.name>
+ <server.port>8080</server.port>
+ <server.timeout>10</server.timeout>
+ <browser.name>firefox ${firefox.path}</browser.name>
+ <!--<selenium.tests.source.dir>${selenium.test.path}</selenium.tests.source.dir>-->
+ <selenium.tests.source.dir>${build.dir}/src/test/selenium</selenium.tests.source.dir>
+ <!--currently this setting is ignored and the tests always fail because it cannot be verified-->
+ <selenium.tests.results.file>${build.dir}/target/selenium/selenium-firefox-results.html</selenium.tests.results.file>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.equanda.test</groupId>
@@ -25,6 +80,10 @@
<type>ear</type>
</dependency>
<dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-test</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Copied: trunk/equanda-test/test-gui-t4-test/src/test/selenium (from rev 50, trunk/equanda-tapestry4/src/test/selenium)
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2007-09-03 09:36:27 UTC (rev 55)
+++ trunk/equanda-test/test-test/pom.xml 2007-09-03 10:04:36 UTC (rev 56)
@@ -14,6 +14,56 @@
<description>test test</description>
<url>http://equanda.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <configuration>
+ <wait>${cargo.wait}</wait>
+ <container>
+ <containerId>jboss4x</containerId>
+ <home>${jboss.appserver.home}</home>
+ </container>
+ <configuration>
+ <type>existing</type>
+ <home>${equanda.jboss.home}/server/${equanda.jboss.config}/</home>
+ <properties>
+ <cargo.hostname>${equanda.jboss.host}</cargo.hostname>
+ <cargo.servlet.port>${equanda.jboss.port}</cargo.servlet.port>
+ <cargo.jboss.configuration>${equanda.jboss.config}</cargo.jboss.configuration>
+ <cargo.jvmargs>${equanda.jboss.jvmargs}</cargo.jvmargs>
+ <cargo.logging>${equanda.jboss.logging}</cargo.logging>
+ </properties>
+ <deployables>
+ <deployable>
+ <artifactId>test-t4-ear</artifactId>
+ <type>ear</type>
+ </deployable>
+ </deployables>
+ </configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.equanda.test</groupId>
Added: trunk/equanda-test/test-test/src/test/jndi.properties
===================================================================
--- trunk/equanda-test/test-test/src/test/jndi.properties (rev 0)
+++ trunk/equanda-test/test-test/src/test/jndi.properties 2007-09-03 10:04:36 UTC (rev 56)
@@ -0,0 +1,6 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=127.0.0.1
+;java.naming.provider.url=192.168.0.205
+jboss.login=local
+jboss.password=local
Copied: trunk/test-core/src/main/resources/META-INF (from rev 50, trunk/equanda-test/src/etc/META-INF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-06 12:42:43
|
Revision: 68
http://equanda.svn.sourceforge.net/equanda/?rev=68&view=rev
Author: triathlon98
Date: 2007-09-06 05:42:38 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
EQ-1 put some classes in the right place, down to 16+45 failures
Modified Paths:
--------------
trunk/equanda-test/src/etc/site_tapestry/site.war/reports/reports.xml
trunk/equanda-test/src/main/om/HideIf.table
trunk/equanda-test/src/main/om/HideIf2.table
trunk/equanda-test/test-core/src/main/resources/META-INF/persistence.xml
Added Paths:
-----------
trunk/equanda-tapestry4/src/main/java/org/equanda/test/
trunk/equanda-tapestry4/src/main/java/org/equanda/test/reporting/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHider.java
Removed Paths:
-------------
trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHiddener.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ParameterSample.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/validator/
Modified: trunk/equanda-test/src/etc/site_tapestry/site.war/reports/reports.xml
===================================================================
--- trunk/equanda-test/src/etc/site_tapestry/site.war/reports/reports.xml 2007-09-06 11:57:50 UTC (rev 67)
+++ trunk/equanda-test/src/etc/site_tapestry/site.war/reports/reports.xml 2007-09-06 12:42:38 UTC (rev 68)
@@ -6,7 +6,7 @@
<label>report1.i18n.label.for.the.parameter1</label>
<type base="integer"/>
</parameter>
- <parameter name="fParName2" class="org.equanda.test.validator.ParameterSample">
+ <parameter name="fParName2" class="org.equanda.test.reporting.ParameterSample">
<label>report1.i18n.label.for.the.parameter2</label>
<type base="double"/>
</parameter>
@@ -14,7 +14,7 @@
<report name="bla2" file="jasper2" category="ReportsLazyInst">
<label>some.label.for.report2</label>
- <parameter name="iPara" class="org.equanda.test.validator.ParameterSample">
+ <parameter name="iPara" class="org.equanda.test.reporting.ParameterSample">
<label>report2.i18n.label.for.the.parameter1</label>
<type base="integer"/>
</parameter>
@@ -27,19 +27,19 @@
<report name="bla4" file="jasper4">
<label>some.label.for.report4</label>
- <parameter name="bParName3" class="org.equanda.test.validator.ParameterSample">
+ <parameter name="bParName3" class="org.equanda.test.reporting.ParameterSample">
<label>report4.i18n.label.for.the.parameter3</label>
<type base="boolean"/>
</parameter>
- <parameter name="sParName4" class="org.equanda.test.validator.ParameterSample">
+ <parameter name="sParName4" class="org.equanda.test.reporting.ParameterSample">
<label>report4.i18n.label.for.the.parameter4</label>
<type base="string"/>
</parameter>
- <parameter name="dParName5" class="org.equanda.test.validator.ParameterSample">
+ <parameter name="dParName5" class="org.equanda.test.reporting.ParameterSample">
<label>report4.i18n.label.for.the.parameter5</label>
<type base="date"/>
</parameter>
- <parameter name="tParName6" class="org.equanda.test.validator.ParameterSample">
+ <parameter name="tParName6" class="org.equanda.test.reporting.ParameterSample">
<label>report4.i18n.label.for.the.parameter6</label>
<type base="time"/>
</parameter>
@@ -48,19 +48,19 @@
<report name="bla5" file="jasper4">
<label>some.label.for.report5</label>
- <parameter name="bParName3" class="org.equanda.test.validator.ParameterSample" hidden="true">
+ <parameter name="bParName3" class="org.equanda.test.reporting.ParameterSample" hidden="true">
<label>report4.i18n.label.for.the.parameter3</label>
<type base="boolean"/>
</parameter>
- <parameter name="sParName4" class="org.equanda.test.validator.ParameterSample" hidden="true">
+ <parameter name="sParName4" class="org.equanda.test.reporting.ParameterSample" hidden="true">
<label>report4.i18n.label.for.the.parameter4</label>
<type base="string"/>
</parameter>
- <parameter name="dParName5" class="org.equanda.test.validator.ParameterSample" hidden="true">
+ <parameter name="dParName5" class="org.equanda.test.reporting.ParameterSample" hidden="true">
<label>report4.i18n.label.for.the.parameter5</label>
<type base="date"/>
</parameter>
- <parameter name="tParName6" class="org.equanda.test.validator.ParameterSample" hidden="true">
+ <parameter name="tParName6" class="org.equanda.test.reporting.ParameterSample" hidden="true">
<label>report4.i18n.label.for.the.parameter6</label>
<type base="time"/>
</parameter>
@@ -70,19 +70,19 @@
<report name="bla6" file="jasper4">
<label>some.label.for.report6</label>
- <parameter name="bParName3" class="org.equanda.test.validator.ParameterSample" readonly="true">
+ <parameter name="bParName3" class="org.equanda.test.reporting.ParameterSample" readonly="true">
<label>report4.i18n.label.for.the.parameter3</label>
<type base="boolean"/>
</parameter>
- <parameter name="sParName4" class="org.equanda.test.validator.ParameterSample" readonly="true">
+ <parameter name="sParName4" class="org.equanda.test.reporting.ParameterSample" readonly="true">
<label>report4.i18n.label.for.the.parameter4</label>
<type base="string"/>
</parameter>
- <parameter name="dParName5" class="org.equanda.test.validator.ParameterSample" readonly="true">
+ <parameter name="dParName5" class="org.equanda.test.reporting.ParameterSample" readonly="true">
<label>report4.i18n.label.for.the.parameter5</label>
<type base="date"/>
</parameter>
- <parameter name="tParName6" class="org.equanda.test.validator.ParameterSample" readonly="true">
+ <parameter name="tParName6" class="org.equanda.test.reporting.ParameterSample" readonly="true">
<label>report4.i18n.label.for.the.parameter6</label>
<type base="time"/>
</parameter>
@@ -150,15 +150,15 @@
<report name="bla10" file="jasper6">
<label>some.label.for.report10</label>
- <parameter name="fParHeight" class="org.equanda.test.validator.ParameterSample" optional="true">
+ <parameter name="fParHeight" class="org.equanda.test.reporting.ParameterSample" optional="true">
<label>report10.i18n.label.for.the.parameter1</label>
<type base="integer"/>
</parameter>
- <parameter name="iParChildren" class="org.equanda.test.validator.ParameterSample" optional="true">
+ <parameter name="iParChildren" class="org.equanda.test.reporting.ParameterSample" optional="true">
<label>report1.i18n.label.for.the.parameter1</label>
<type base="integer"/>
</parameter>
- <parameter name="sParName4" class="org.equanda.test.validator.ParameterSample" optional="true">
+ <parameter name="sParName4" class="org.equanda.test.reporting.ParameterSample" optional="true">
<label>report4.i18n.label.for.the.parameter4</label>
<type base="string"/>
</parameter>
Modified: trunk/equanda-test/src/main/om/HideIf.table
===================================================================
--- trunk/equanda-test/src/main/om/HideIf.table 2007-09-06 11:57:50 UTC (rev 67)
+++ trunk/equanda-test/src/main/om/HideIf.table 2007-09-06 12:42:38 UTC (rev 68)
@@ -18,7 +18,7 @@
</field>
</group>
<group name="GroupHideIf">
- <hide if-class="org.equanda.test.validator.ItemHiddener"/>
+ <hide if-class="org.equanda.test.validator.ItemHider"/>
<field name="UselessField2">
<description>
Added a field to make sure the group is not hidden because it's empty
@@ -34,19 +34,19 @@
</field>
</group>
<field name="FieldShow"><hide if-class="org.equanda.test.validator.ItemDisplayer"/></field>
- <field name="FieldHideIf"><hide if-class="org.equanda.test.validator.ItemHiddener"/></field>
+ <field name="FieldHideIf"><hide if-class="org.equanda.test.validator.ItemHider"/></field>
<field name="FieldHide"><hide/></field>
</page>
<page name="PageHideIf">
- <hide if-class="org.equanda.test.validator.ItemHiddener"/>
+ <hide if-class="org.equanda.test.validator.ItemHider"/>
</page>
<page name="PageHide">
<hide/>
</page>
<select name="SelectShow"><hide if-class="org.equanda.test.validator.ItemDisplayer"/></select>
- <select name="SelectHideIf"><hide if-class="org.equanda.test.validator.ItemHiddener"/></select>
+ <select name="SelectHideIf"><hide if-class="org.equanda.test.validator.ItemHider"/></select>
<select name="SelectHide"><hide/></select>
<action name="ActionShow" return="void"><hide if-class="org.equanda.test.validator.ItemDisplayer"/></action>
- <action name="ActionHideIf" return="void"><hide if-class="org.equanda.test.validator.ItemHiddener"/></action>
+ <action name="ActionHideIf" return="void"><hide if-class="org.equanda.test.validator.ItemHider"/></action>
<action name="ActionHide" return="void"><hide/></action>
</table>
Modified: trunk/equanda-test/src/main/om/HideIf2.table
===================================================================
--- trunk/equanda-test/src/main/om/HideIf2.table 2007-09-06 11:57:50 UTC (rev 67)
+++ trunk/equanda-test/src/main/om/HideIf2.table 2007-09-06 12:42:38 UTC (rev 68)
@@ -2,7 +2,7 @@
<!DOCTYPE table SYSTEM "equanda.dtd">
<table name="HideIf2">
- <hide if-class="org.equanda.test.validator.ItemHiddener"/>
+ <hide if-class="org.equanda.test.validator.ItemHider"/>
<description>
A table for the Selenium testcases for hide if (should be invisible)
</description>
Copied: trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator (from rev 57, trunk/equanda-test/test-test/src/test/java/org/equanda/test/validator)
Deleted: trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHiddener.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/validator/ItemHiddener.java 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHiddener.java 2007-09-06 12:42:38 UTC (rev 68)
@@ -1,43 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-
-package org.equanda.test.validator;
-
-import org.equanda.validation.HideIfAdapter;
-
-/**
- * Implementation of HideIf, to always hide items.
- *
- * @author Florin
- */
-
-public class ItemHiddener extends HideIfAdapter
-{
- @Override
- public boolean isHidden()
- {
- return true;
- }
-}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHider.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHider.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHider.java 2007-09-06 12:42:38 UTC (rev 68)
@@ -0,0 +1,44 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+
+package org.equanda.test.validator;
+
+import org.equanda.validation.HideIfAdapter;
+
+/**
+ * Implementation of HideIf, to always hide items.
+ *
+ * @author Florin
+ */
+
+public class ItemHider
+ extends HideIfAdapter
+{
+ @Override
+ public boolean isHidden()
+ {
+ return true;
+ }
+}
Deleted: trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ParameterSample.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/validator/ParameterSample.java 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/ParameterSample.java 2007-09-06 12:42:38 UTC (rev 68)
@@ -1,71 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-
-package org.equanda.test.validator;
-
-import org.equanda.reporting.parameter.ParameterValueAdapter;
-
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.Timestamp;
-
-/**
- * This is used for testing reports, with parameters from classes
- *
- * @author NetRom team
- */
-public class ParameterSample
- extends ParameterValueAdapter
-{
- public Boolean getBooleanValue()
- {
- return new Boolean( true );
- }
-
- public Integer getIntValue()
- {
- return new Integer( 1 );
- }
-
- public BigDecimal getDecimalValue()
- {
- return new BigDecimal( 1 );
- }
-
- public String getStringValue()
- {
- return "sample string";
- }
-
- public Date getDateValue()
- {
- return new Date( System.currentTimeMillis() );
- }
-
- public Timestamp getTimeValue()
- {
- return new Timestamp( System.currentTimeMillis() );
- }
-}
Modified: trunk/equanda-test/test-core/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/equanda-test/test-core/src/main/resources/META-INF/persistence.xml 2007-09-06 11:57:50 UTC (rev 67)
+++ trunk/equanda-test/test-core/src/main/resources/META-INF/persistence.xml 2007-09-06 12:42:38 UTC (rev 68)
@@ -3,7 +3,8 @@
<jta-data-source>java:/equanda-testDS</jta-data-source>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.FirebirdDialect"/>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.hbm2ddl.auto" value="check"/>
+ <!--<property name="hibernate.hbm2ddl.auto" value="validate"/>-->
<!--<property name="hibernate.hbm2ddl.auto" value="update"/>-->
<property name="hibernate.cache.provider_class" value="org.jboss.ejb3.entity.TreeCacheProviderHook"/>
<property name="hibernate.treecache.mbean.object_name" value="jboss.cache:service=EJB3EntityTreeCache"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-06 11:58:53
|
Revision: 67
http://equanda.svn.sourceforge.net/equanda/?rev=67&view=rev
Author: triathlon98
Date: 2007-09-06 04:57:50 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
EQ-37 assure not duplicate index/pk/fk keys
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/Max31Convert.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/Max31Convert.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/Max31Convert.java 2007-09-04 21:55:44 UTC (rev 66)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/Max31Convert.java 2007-09-06 11:57:50 UTC (rev 67)
@@ -48,7 +48,14 @@
{
if ( name.length() > MAX_LENGTH )
{
- name = name.substring( 0, MAX_LENGTH );
+ if ( name.endsWith( "_UOID" ) )
+ {
+ name = name.substring( 0, MAX_LENGTH - 5 ) + "_UOID";
+ }
+ else
+ {
+ name = name.substring( 0, MAX_LENGTH );
+ }
}
return name;
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-09-04 21:55:44 UTC (rev 66)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-09-06 11:57:50 UTC (rev 67)
@@ -120,8 +120,7 @@
query = "ALTER TABLE " + tableName + " ADD " + fieldName + " Char(14)";
executeQuery( query );
// could not find a way to build
- //String fk = "FK_" + tableName.substring( 0, Math.min( 19, tableName.length() ) ) + "_" + fieldName;
- String fk = "FK_" + StringUtil.left( tableName, 10 ) + System.currentTimeMillis();
+ String fk = "FK_" + getShortTableName( tableName) +'_'+fieldName;
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
query = "ALTER TABLE " + tableName + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (" + fieldName + ") REFERENCES " + linkTableName + " (EQUANDA_UOID)";
@@ -509,13 +508,14 @@
{
try
{
- String table = tableInfo[ 0 ].toUpperCase();
+ String table = tableInfo[ 0 ];
+ String upTable=table.toUpperCase();
String field = tableInfo[ 1 ];
String fieldDef = tableInfo[ 2 ];
- ResultSet rs = connection.getMetaData().getTables( null, null, table.toUpperCase(), null );
+ ResultSet rs = connection.getMetaData().getTables( null, null, upTable, null );
if ( !rs.next() )
{
- String query = "CREATE TABLE " + table +
+ String query = "CREATE TABLE " + upTable +
"(\n" +
" EQUANDA_UOID Char(14) NOT NULL, \n" +
field.toUpperCase() + " " + fieldDef + ",\n" +
@@ -524,9 +524,9 @@
" PRIMARY KEY (EQUANDA_UOID)\n" +
")";
executeQuery( query );
- String fk = "FK_" + table.toUpperCase(); // so the constraint will be FK_M_{tableName}
+ String fk = "FK_" + getShortTableName( table ) + "_PARENT";
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
- String parentTable = "T_" + table.substring( 2, table.indexOf( "_", 3 ) );
+ String parentTable = "T_" + table.substring( 2, table.indexOf( "_", 3 ) ).toUpperCase();
query = "ALTER TABLE " + table + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (EQUANDA_PARENT_UOID) REFERENCES " + parentTable + " (EQUANDA_UOID)";
executeQuery( query );
@@ -544,7 +544,8 @@
{
try
{
- String table = tableInfo[ 0 ].toUpperCase();
+ String table = tableInfo[ 0 ];
+ String upTable = table.toUpperCase();
String field1 = tableInfo[ 1 ].toUpperCase();
String tablefield1 = tableInfo[ 2 ].toUpperCase();
String field2 = tableInfo[ 3 ].toUpperCase();
@@ -557,30 +558,28 @@
}
else
{
- String pk = "PK_" + table; // so the constraint will be FK_L_{tableName}
+ String pk = "PK_" + getShortTableName( table );
if ( pk.length() > 27 ) pk = pk.substring( 0, 27 );
contraint = "CONSTRAINT " + pk + " PRIMARY KEY (" + field1 + "," + field2 + ")";
}
- ResultSet rs = connection.getMetaData().getTables( null, null, table, null );
+ ResultSet rs = connection.getMetaData().getTables( null, null, upTable, null );
if ( !rs.next() )
{
- String query = "CREATE TABLE " + table + "(\n" +
+ String query = "CREATE TABLE " + upTable + "(\n" +
field1 + " Char(14) NOT NULL,\n" +
field2 + " Char(14) NOT NULL,\n" +
contraint + ")";
executeQuery( query );
// now add FK for the first field
- String fk = "FK_1_" + StringUtil.left( table, 10 ) + "_" + field2.substring( 2 );
- // so the constraint will be FK_1_L_{tableName(10chars)}_{field2name}
+ String fk = "FK_1_" + getShortTableName( table ) + '_' + field2.substring( 2 );
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
- query = "ALTER TABLE " + table + " ADD CONSTRAINT " + fk +
+ query = "ALTER TABLE " + upTable + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (" + field1 + ") REFERENCES " + tablefield1 + "(EQUANDA_UOID)";
executeQuery( query );
// now add FK for the second field
- fk = "FK_2_" + StringUtil.left( table, 10 ) + "_" + field2.substring( 2 );
- // so the constraint will be FK_2_L_{tableName(10chars)}_{field2name}
+ fk = "FK_2_" + getShortTableName( table ) + '_' + field2.substring( 2 );
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
- query = "ALTER TABLE " + table + " ADD CONSTRAINT " + fk +
+ query = "ALTER TABLE " + upTable + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (" + field2 + ") REFERENCES " + tablefield2 + "(EQUANDA_UOID)";
executeQuery( query );
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2007-09-04 21:55:44 UTC (rev 66)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2007-09-06 11:57:50 UTC (rev 67)
@@ -59,18 +59,12 @@
if ( args.length < 6 )
{
log.error(
- "Insufficient parameters, need URL, driver class, login, password, \"class\", classname and targets" );
+ "Insufficient parameters, need URL, driver class, login, password, classname and targets" );
System.exit( -1 );
}
- int i = 4;
+ int targetIndex = 5;
JdbcManager manager = new JdbcManager( args[ 0 ], args[ 1 ], args[ 2 ], args[ 3 ] );
String className = args[ 4 ];
- if ( "class".equals( className.toLowerCase() ) )
- {
- className = args[ 5 ];
- i++;
- }
-
DatabaseMap map = null;
try
{
@@ -91,30 +85,30 @@
}
map.init();
- while ( i < args.length )
+ while ( targetIndex < args.length )
{
- String next = args[ i ].toLowerCase();
+ String next = args[ targetIndex ].toLowerCase();
System.out.println( "process next option " + next );
if ( "indexes".equals( next ) )
{
boolean delete = false;
- if ( i + 1 < args.length && "delete".equals( args[ i + 1 ].toLowerCase() ) )
+ if ( targetIndex + 1 < args.length && "delete".equals( args[ targetIndex + 1 ].toLowerCase() ) )
{
delete = true;
- i++;
+ targetIndex++;
}
manager.restoreIndexes( map, delete );
}
else if ( "file".equals( next ) )
{
- if ( i + 1 == args.length )
+ if ( targetIndex + 1 == args.length )
{
System.err.println( "Query file was not specified!" );
log.error( "Query file was not specified!" );
}
else
{
- next = args[ i + 1 ];
+ next = args[ targetIndex + 1 ];
manager.executeQueryFile( next );
}
}
@@ -140,7 +134,7 @@
System.err.println( "Invalid option:" + next );
log.error( "Invalid option:" + next );
}
- i++;
+ targetIndex++;
}
manager.close();
if ( manager.getException() != null ) throw manager.getException();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-04 21:56:04
|
Revision: 66
http://equanda.svn.sourceforge.net/equanda/?rev=66&view=rev
Author: triathlon98
Date: 2007-09-04 14:55:44 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
EQ-1 start with empty db before tests and update using ddltool
Modified Paths:
--------------
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2007-09-04 20:38:46 UTC (rev 65)
+++ trunk/equanda-test/test-test/pom.xml 2007-09-04 21:55:44 UTC (rev 66)
@@ -25,7 +25,8 @@
<phase>test-compile</phase>
<configuration>
<tasks>
- <copy file="${equanda.db.empty}" tofile="${equanda.db.location}"/>
+ <copy file="${equanda.db.empty}" tofile="${equanda.db.location}" overwrite="true"/>
+ <chmod file="${equanda.db.location}" perm="a+rw"/>
</tasks>
</configuration>
<goals>
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-09-04 20:38:46 UTC (rev 65)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-09-04 21:55:44 UTC (rev 66)
@@ -109,14 +109,14 @@
private boolean addColumn( String tableName, String columnDefinition )
{
boolean result = true;
+ String query = null;
try
{
String fieldName = columnDefinition.substring( 0, columnDefinition.indexOf( " " ) ).toUpperCase();
- String linkTableName = columnDefinition.substring( columnDefinition.indexOf( " " ) + 1 ).toUpperCase();
boolean isLink = fieldName.endsWith( "_UOID" );
- String query;
if ( isLink )
{
+ String linkTableName = columnDefinition.substring( columnDefinition.indexOf( " " ) + 1 ).toUpperCase();
query = "ALTER TABLE " + tableName + " ADD " + fieldName + " Char(14)";
executeQuery( query );
// could not find a way to build
@@ -125,18 +125,17 @@
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
query = "ALTER TABLE " + tableName + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (" + fieldName + ") REFERENCES " + linkTableName + " (EQUANDA_UOID)";
- executeQuery( query );
}
else
{
query = "ALTER TABLE " + tableName + " ADD " + columnDefinition;
- executeQuery( query );
}
+ executeQuery( query );
}
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ System.err.println( query + " " + e );
log.error( e, e );
result = false;
}
@@ -372,16 +371,10 @@
/* recreate indexes from map */
Hashtable<String, Collection<String>> dbMap = map.getIndexedFields();
- Enumeration<String> cols = dbMap.keys();
- while ( cols.hasMoreElements() )
+ for ( String tableName : dbMap.keySet() )
{
- String tableName = cols.nextElement();
- Collection<String> columns = dbMap.get( tableName );
-
- it = columns.iterator();
- while ( it.hasNext() )
+ for ( String colName : dbMap.get( tableName ) )
{
- String colName = it.next();
if ( !createIndex( tableName, colName ) )
{
log.error( "On table " + tableName + " index not created!" );
@@ -436,7 +429,6 @@
}
catch ( SQLException e )
{
- oops = e;
System.err.println( e );
log.error( e, e );
res = false;
@@ -578,7 +570,7 @@
contraint + ")";
executeQuery( query );
// now add FK for the first field
- String fk = "FK_1_" + StringUtil.left( table, 10 ) + "_" + field2.substring( 2 );
+ String fk = "FK_1_" + StringUtil.left( table, 10 ) + "_" + field2.substring( 2 );
// so the constraint will be FK_1_L_{tableName(10chars)}_{field2name}
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
query = "ALTER TABLE " + table + " ADD CONSTRAINT " + fk +
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2007-09-04 20:38:46 UTC (rev 65)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2007-09-04 21:55:44 UTC (rev 66)
@@ -93,39 +93,30 @@
while ( i < args.length )
{
- boolean valid = true;
String next = args[ i ].toLowerCase();
- if ( next.equals( "indexes" ) )
+ System.out.println( "process next option " + next );
+ if ( "indexes".equals( next ) )
{
- if ( i + 1 < args.length )
+ boolean delete = false;
+ if ( i + 1 < args.length && "delete".equals( args[ i + 1 ].toLowerCase() ) )
{
- next = args[ ++i ];
- if ( next.toLowerCase().equals( "delete" ) )
- {
- manager.restoreIndexes( map, true );
- i++;
- continue;
- }
- else
- {
- manager.restoreIndexes( map, false );
- }
+ delete = true;
+ i++;
}
- else
- {
- manager.restoreIndexes( map, false );
- continue;
- }
+ manager.restoreIndexes( map, delete );
}
- if ( "file".equals( next ) )
+ else if ( "file".equals( next ) )
{
if ( i + 1 == args.length )
{
System.err.println( "Query file was not specified!" );
log.error( "Query file was not specified!" );
}
- next = args[ ++i ];
- manager.executeQueryFile( next );
+ else
+ {
+ next = args[ i + 1 ];
+ manager.executeQueryFile( next );
+ }
}
else if ( "remove".equals( next ) )
{
@@ -146,10 +137,6 @@
}
else
{
- valid = false;
- }
- if ( !valid )
- {
System.err.println( "Invalid option:" + next );
log.error( "Invalid option:" + next );
}
@@ -171,7 +158,7 @@
log.info( "update - create all tables and fields, update definition if possible;" );
log.info( "defaults - update field values where there is null and a default value is specified." );
log.info( "createpk - creates primary keys for tables that don't have any;" );
- log.info( "indexes - delete and restore indexes;" );
+ log.info( "indexes - create indexes (and delete if next word is delete);" );
log.info( "file - executes a query file. The file name with full path has to be specified next." );
System.exit( 0 );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-04 20:38:47
|
Revision: 65
http://equanda.svn.sourceforge.net/equanda/?rev=65&view=rev
Author: triathlon98
Date: 2007-09-04 13:38:46 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
EQ-1 start with empty db before tests and update using ddltool
Modified Paths:
--------------
trunk/equanda-test/pom.xml
trunk/equanda-test/test-test/pom.xml
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2007-09-04 20:35:27 UTC (rev 64)
+++ trunk/equanda-test/pom.xml 2007-09-04 20:38:46 UTC (rev 65)
@@ -45,6 +45,11 @@
</dependency>
<dependency>
<groupId>org.equanda.test</groupId>
+ <artifactId>test-ddltool</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
<artifactId>test-test</artifactId>
<version>${project.version}</version>
</dependency>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2007-09-04 20:35:27 UTC (rev 64)
+++ trunk/equanda-test/test-test/pom.xml 2007-09-04 20:38:46 UTC (rev 65)
@@ -17,6 +17,44 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-empty-database</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <tasks>
+ <copy file="${equanda.db.empty}" tofile="${equanda.db.location}"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <configuration>
+ <database>${equanda.db.url}</database>
+ <dblogin>${equanda.db.login}</dblogin>
+ <dbpassword>${equanda.db.password}</dbpassword>
+ <dbmap>org.equanda.test.ddltool.EquandaMap</dbmap>
+ <ddltargets>update defaults createpk indexes</ddltargets>
+ </configuration>
+ <executions>
+ <execution>
+ <id>ddltool</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>ddltool</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>0.3</version>
@@ -48,14 +86,16 @@
<executions>
<execution>
<id>start-container</id>
- <phase>test-compile</phase><!-- should be <phase>pre-test</phase>-->
+ <phase>test-compile</phase>
+ <!-- should be <phase>pre-test</phase>-->
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>stop-container</id>
- <phase>prepare-package</phase><!-- should be <phase>post-test</phase>-->
+ <phase>prepare-package</phase>
+ <!-- should be <phase>post-test</phase>-->
<goals>
<goal>stop</goal>
</goals>
@@ -72,6 +112,10 @@
</dependency>
<dependency>
<groupId>org.equanda.test</groupId>
+ <artifactId>test-ddltool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
<artifactId>test-t4-ear</artifactId>
<type>ear</type>
</dependency>
@@ -118,7 +162,11 @@
<artifactId>jboss-client</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.firebirdsql</groupId>
+ <artifactId>jaybird</artifactId>
+ <version>1.5.5</version>
+ </dependency>
</dependencies>
<repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-04 20:35:29
|
Revision: 64
http://equanda.svn.sourceforge.net/equanda/?rev=64&view=rev
Author: triathlon98
Date: 2007-09-04 13:35:27 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
EQ-34, EQ-33, EQ-36 ddltool maven plugin, various ddltool improvements
Modified Paths:
--------------
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
Added Paths:
-----------
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DdltoolPlugin.java
Added: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DdltoolPlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DdltoolPlugin.java (rev 0)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DdltoolPlugin.java 2007-09-04 20:35:27 UTC (rev 64)
@@ -0,0 +1,303 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.plugin;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.equanda.tool.ddltool.Utility;
+import org.equanda.util.SaveException;
+import org.equanda.util.StringSplitter;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.*;
+
+/**
+ * Run the ddltool to update/create database tables
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @goal ddltool
+ * @requiresDependencyResolution runtime
+ * @description equanda maven plugin to run the ddltool
+ */
+public class DdltoolPlugin
+ extends AbstractMojo
+{
+ /**
+ * Database URL, for example "jdbc:firebirdsql:localhost/3050:/home/joachim/data/equanda.fdb"
+ *
+ * @parameter expression=""
+ */
+ private String database;
+
+ /**
+ * @parameter expression="org.firebirdsql.jdbc.FBDriver"
+ */
+ private String dbclass;
+
+ /**
+ * Class name for database map, eg org.equanda.test.ddltool.EquandaMap
+ *
+ * @parameter expression="org.equanda.test.ddltool.EquandaMap"
+ */
+ private String dbmap;
+
+ /**
+ * @parameter expression="sysdba"
+ */
+ private String dblogin;
+
+ /**
+ * @parameter expression="masterkey"
+ */
+ private String dbpassword;
+
+ /**
+ * @parameter expression="update defaults createpk indexes"
+ */
+ private String ddltargets;
+
+ /**
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * @parameter expression="${plugin.artifacts}"
+ * @required
+ */
+ private List pluginArtifacts;
+
+ /**
+ * Artifact resolver, needed to download source jars for inclusion in
+ * classpath.
+ *
+ * @component role="org.apache.maven.artifact.resolver.ArtifactResolver"
+ * @required
+ * @readonly
+ */
+ private ArtifactResolver artifactResolver;
+
+ /**
+ * @parameter expression="${localRepository}"
+ * @required
+ * @readonly
+ */
+ private ArtifactRepository localRepository;
+
+ /**
+ * @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
+ * @required
+ * @readonly
+ */
+ private ArtifactFactory factory;
+
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ try
+ {
+ if ( null == database || "".equals( database ) ) return;
+
+ final Set classpathElements = new LinkedHashSet( this.project.getRuntimeClasspathElements() );
+ classpathElements.addAll( this.getProvidedClasspathElements() );
+ this.initializeClasspathFromClassPathElements( classpathElements );
+
+ int count = 0;
+ for ( String s : new StringSplitter( ddltargets, ' ' ) ) count++;
+ final String[] parameters = new String[count + 5];
+ parameters[ 0 ] = database;
+ parameters[ 1 ] = dbclass;
+ parameters[ 2 ] = dblogin;
+ parameters[ 3 ] = dbpassword;
+ parameters[ 4 ] = dbmap;
+ count = 5;
+ for ( String s : new StringSplitter( ddltargets, ' ' ) ) parameters[ count++ ] = s;
+
+ final Throwable[] remember = new Throwable[1];
+ remember[ 0 ] = null;
+ final Object waitFor = new Object();
+ Thread.currentThread().setUncaughtExceptionHandler( new Thread.UncaughtExceptionHandler()
+ {
+ public void uncaughtException( Thread thread, Throwable throwable )
+ {
+
+ SaveException.saveException( throwable, "during equanda:ddltool" );
+ remember[ 0 ] = throwable;
+ synchronized ( waitFor )
+ {
+ waitFor.notifyAll();
+ }
+ }
+ } );
+
+ Thread thread = new Thread()
+ {
+ public void run()
+ {
+ try
+ {
+ new Utility( parameters );
+ }
+ catch ( Exception ex ) { remember[ 0 ] = ex; }
+ synchronized ( waitFor )
+ {
+ waitFor.notifyAll();
+ }
+ }
+ };
+ thread.start();
+ synchronized ( waitFor )
+ {
+ try { waitFor.wait(); } catch ( InterruptedException ex ) {/*ignore*/}
+ if ( remember[ 0 ] != null ) throw remember[ 0 ];
+ }
+ }
+ catch ( Throwable ex )
+ {
+ SaveException.saveException( ex );
+ throw new MojoExecutionException( "problems while running ddltool", ex );
+ }
+ }
+
+ /**
+ * Adds any dependencies with a scope of 'provided' to the current project
+ * with a scope of runtime.
+ *
+ * @throws org.apache.maven.artifact.resolver.ArtifactNotFoundException oops
+ * @throws org.apache.maven.artifact.resolver.ArtifactResolutionException oops
+ */
+ protected List getProvidedClasspathElements()
+ throws ArtifactResolutionException, ArtifactNotFoundException
+ {
+ final List classpathElements = new ArrayList();
+ final List dependencies = this.project.getDependencies();
+ if ( dependencies != null && !dependencies.isEmpty() )
+ {
+ for ( final Iterator iterator = dependencies.iterator(); iterator.hasNext() ; )
+ {
+ final Dependency dependency = (Dependency) iterator.next();
+ if ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() ) )
+ {
+ final String file = this.getDependencyFile( dependency );
+ if ( file != null )
+ {
+ classpathElements.add( file );
+ }
+ }
+ }
+ }
+ return classpathElements;
+ }
+
+ /**
+ * Sets the current context class loader from the given runtime classpath
+ * elements.
+ *
+ * @throws java.net.MalformedURLException
+ */
+ protected void initializeClasspathFromClassPathElements( final Set classpathFiles )
+ throws MalformedURLException
+ {
+ // - for some reason some of the plugind dependencies are being excluded from the classloader,
+ // so we explicity load them
+ if ( this.pluginArtifacts != null )
+ {
+ for ( final Iterator iterator = this.pluginArtifacts.iterator(); iterator.hasNext() ; )
+ {
+ final Artifact artifact = (Artifact) iterator.next();
+ final File artifactFile = artifact.getFile();
+ if ( artifactFile != null )
+ {
+ classpathFiles.add( artifactFile.toString() );
+ }
+ }
+ }
+
+ final List files = new ArrayList( classpathFiles );
+ if ( files != null && files.size() > 0 )
+ {
+ final URL[] classpathUrls = new URL[classpathFiles.size()];
+
+ for ( int ctr = 0; ctr < classpathFiles.size() ; ++ctr )
+ {
+ final File file = new File( (String) files.get( ctr ) );
+ if ( this.getLog().isDebugEnabled() )
+ {
+ getLog().debug( "adding to classpath '" + file + "'" );
+ }
+ classpathUrls[ ctr ] = file.toURL();
+ }
+
+ final URLClassLoader loader =
+ new URLClassLoader( classpathUrls,
+ Thread.currentThread().getContextClassLoader() );
+ Thread.currentThread().setContextClassLoader( loader );
+ }
+ }
+
+ /**
+ * Adds a dependency to the current project's dependencies.
+ *
+ * @param dependency
+ * @throws ArtifactNotFoundException
+ * @throws ArtifactResolutionException
+ */
+ private String getDependencyFile( final Dependency dependency )
+ throws ArtifactResolutionException, ArtifactNotFoundException
+ {
+ String file = null;
+ if ( dependency != null )
+ {
+ final Artifact artifact =
+ this.factory.createArtifact(
+ dependency.getGroupId(),
+ dependency.getArtifactId(),
+ dependency.getVersion(),
+ null,
+ dependency.getType() );
+
+ this.artifactResolver.resolve(
+ artifact,
+ project.getRemoteArtifactRepositories(),
+ this.localRepository );
+ file = artifact.getFile() != null ? artifact.getFile().toString() : null;
+ }
+ return file;
+ }
+}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-09-04 20:17:06 UTC (rev 63)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-09-04 20:35:27 UTC (rev 64)
@@ -25,6 +25,7 @@
package org.equanda.tool.ddltool;
import org.apache.log4j.Logger;
+import org.equanda.util.StringUtil;
import java.io.BufferedReader;
import java.io.FileInputStream;
@@ -44,18 +45,32 @@
{
private Logger log = Logger.getLogger( this.getClass() );
private Connection connection;
+ private Exception oops;
- public JdbcManager( String location, String user, String password )
+ public JdbcManager( String location, String clazz, String user, String password )
{
try
{
- Class.forName( "org.firebirdsql.jdbc.FBDriver" );
- connection = DriverManager.getConnection( location, user, password );
+ Driver driver;
+ try
+ {
+ driver = (Driver) Class.forName( clazz ).newInstance();
+ System.out.println( "loaded from Class " + clazz );
+ }
+ catch ( Exception e )
+ {
+ driver = (Driver) Thread.currentThread().getContextClassLoader().loadClass( clazz ).newInstance();
+ System.out.println( "loaded from context " + clazz );
+ }
+ Properties properties = new Properties();
+ properties.put( "user", user );
+ properties.put( "password", password );
+ connection = driver.connect( location, properties );
connection.setAutoCommit( true );
}
catch ( Exception e )
{
- System.err.println( e );
+ System.err.println( "trying to connect to " + location + " failed with " + e );
log.error( e, e );
System.exit( -1 );
}
@@ -84,6 +99,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
}
@@ -101,13 +117,11 @@
String query;
if ( isLink )
{
- query =
- "ALTER TABLE " + tableName + " ADD " + fieldName + " Char(14)";
+ query = "ALTER TABLE " + tableName + " ADD " + fieldName + " Char(14)";
executeQuery( query );
// could not find a way to build
//String fk = "FK_" + tableName.substring( 0, Math.min( 19, tableName.length() ) ) + "_" + fieldName;
- String fk =
- "FK_" + tableName.substring( 0, Math.min( 10, tableName.length() ) ) + System.currentTimeMillis();
+ String fk = "FK_" + StringUtil.left( tableName, 10 ) + System.currentTimeMillis();
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
query = "ALTER TABLE " + tableName + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (" + fieldName + ") REFERENCES " + linkTableName + " (EQUANDA_UOID)";
@@ -121,6 +135,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
result = false;
@@ -139,6 +154,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
result = false;
@@ -146,15 +162,14 @@
return result;
}
- private String getIndexName( String tableName, String columnName )
+ private Map<String, String> tabletoShort = new HashMap<String, String>();
+ private Map<String, String> shortToTable = new HashMap<String, String>();
+
+ private String getShortTableName( String tableName )
{
- StringBuffer name = new StringBuffer( "I_" );
- if ( tableName.length() < 5 )
+ String res = tabletoShort.get( tableName );
+ if ( res == null )
{
- name.append( tableName );
- }
- else
- {
StringBuffer camel = new StringBuffer();
for ( int i = 0; i < tableName.length() ; i++ )
@@ -166,20 +181,40 @@
}
if ( camel.length() > 1 )
{
- name.append( camel );
+ res = camel.toString();
}
else
{
- name.append( tableName.substring( 0, 5 ) );
+ res = tableName.substring( 0, 5 );
}
+ int count = 1;
+ String base = res;
+ while ( shortToTable.containsKey( res ) ) {res = base + ( count++ );}
+ tabletoShort.put( tableName, res );
+ shortToTable.put( res, tableName );
}
- name.append( '_' );
- name.append( columnName );
- if ( name.length() > 27 )
+ return res;
+ }
+
+ private String getSimplifiedFieldName( String name )
+ {
+ return StringUtil.replace( name, "EQUANDA_", "EQ_" );
+ }
+
+ private String getIndexName( String tableName, String columnName )
+ {
+ StringBuffer name = new StringBuffer( "I_" );
+ if ( tableName.length() < 5 )
{
- return validateIndexName( name.substring( 0, 27 ), tableName );
+ name.append( tableName );
}
-
+ else
+ {
+ name.append( getShortTableName( tableName ) );
+ }
+ name.append( '_' );
+ name.append( getSimplifiedFieldName( columnName ) );
+ if ( name.length() > 27 ) name.setLength( 27 );
return validateIndexName( name.toString(), tableName );
}
@@ -193,6 +228,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
result = false;
@@ -210,6 +246,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
result = false;
@@ -229,6 +266,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
result = false;
@@ -249,6 +287,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
}
@@ -397,6 +436,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
res = false;
@@ -418,7 +458,7 @@
}
}
- public void checkPrimaryKeys( DatabaseMap map )
+ public void checkPrimaryKeys()
{
Collection<String> col = getTables();
for ( String table : col )
@@ -442,7 +482,7 @@
}
}
- public void updateTables( DatabaseMap map )
+ public void createTables( DatabaseMap map )
{
// update main tables
for ( String tableName : map.getTables() )
@@ -467,6 +507,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
}
@@ -501,6 +542,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
}
@@ -530,22 +572,20 @@
ResultSet rs = connection.getMetaData().getTables( null, null, table, null );
if ( !rs.next() )
{
- String query = "CREATE TABLE " + table +
- "(\n" +
+ String query = "CREATE TABLE " + table + "(\n" +
field1 + " Char(14) NOT NULL,\n" +
field2 + " Char(14) NOT NULL,\n" +
- contraint +
- ")";
+ contraint + ")";
executeQuery( query );
// now add FK for the first field
- String fk = "FK_1_" + table.subSequence( 0, 10 ) + "_" + field2.substring( 2 );
+ String fk = "FK_1_" + StringUtil.left( table, 10 ) + "_" + field2.substring( 2 );
// so the constraint will be FK_1_L_{tableName(10chars)}_{field2name}
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
query = "ALTER TABLE " + table + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (" + field1 + ") REFERENCES " + tablefield1 + "(EQUANDA_UOID)";
executeQuery( query );
// now add FK for the second field
- fk = "FK_2_" + table.subSequence( 0, 10 ) + "_" + field2.substring( 2 );
+ fk = "FK_2_" + StringUtil.left( table, 10 ) + "_" + field2.substring( 2 );
// so the constraint will be FK_2_L_{tableName(10chars)}_{field2name}
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
query = "ALTER TABLE " + table + " ADD CONSTRAINT " + fk +
@@ -555,13 +595,14 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
}
}
}
- public void updateFields( DatabaseMap map, boolean update )
+ public void updateFields( DatabaseMap map )
{
// get all tables from db .. and check each field ..
Hashtable<String, Collection<String>> dbFields = map.getDbFields();
@@ -598,7 +639,7 @@
}
catch ( SQLException e )
{
- e.printStackTrace();
+ oops = e;
System.err.println( e );
log.error( e, e );
}
@@ -609,6 +650,7 @@
}
catch ( SQLException e )
{
+ oops = e;
System.err.println( e );
log.error( e, e );
return;
@@ -627,52 +669,60 @@
log.info( "Column could not be created" );
}
}
- if ( update )
- {
- updateField( tableName, fieldName, field );
- log.info( "Field updated: " + field );
- }
}
}
}
- private void updateField( String tableName, String fieldName, String fieldDef )
+ public void updateDefault( DatabaseMap map )
{
- /* get Default value */
- int pos = fieldDef.indexOf( "DEFAULT" );
- if ( pos == -1 ) return;
-
- boolean isVarchar = false;
- char endchar = ' ';
- fieldDef = fieldDef.substring( pos + 8 );
- if ( fieldDef.startsWith( "'" ) )
+ // get all tables from db .. and check each field ..
+ Hashtable<String, Collection<String>> dbFields = map.getDbFields();
+ Collection<String> tables = map.getTables();
+ for ( String tableName : tables )
{
- fieldDef = fieldDef.substring( 1 );
- endchar = '\'';
- isVarchar = true;
- }
- String defaultValue = fieldDef;
- for ( int i = 0; i < fieldDef.length() ; i++ )
- {
- if ( fieldDef.charAt( i ) == endchar )
+ Collection<String> fields = dbFields.get( tableName );
+ for ( String field : fields )
{
- defaultValue = fieldDef.substring( 0, i );
- break;
+ String fieldName = field.substring( 0, field.indexOf( " " ) );
+ /* get Default value */
+ int pos = field.indexOf( "DEFAULT" );
+ if ( pos == -1 ) return;
+
+ boolean isVarchar = false;
+ char endchar = ' ';
+ field = field.substring( pos + 8 );
+ if ( field.startsWith( "'" ) )
+ {
+ field = field.substring( 1 );
+ endchar = '\'';
+ isVarchar = true;
+ }
+ String defaultValue = field;
+ for ( int i = 0; i < field.length() ; i++ )
+ {
+ if ( field.charAt( i ) == endchar )
+ {
+ defaultValue = field.substring( 0, i );
+ break;
+ }
+ }
+ if ( isVarchar ) defaultValue = '\'' + defaultValue + '\'';
+
+ try
+ {
+ String query = "UPDATE " + tableName + " SET " + fieldName + '=' + defaultValue +
+ " WHERE " + fieldName + " IS NULL";
+ executeQuery( query );
+ }
+ catch ( SQLException e )
+ {
+ oops = e;
+ System.err.println( e );
+ log.error( e, e );
+ }
+ log.info( "Field updated: " + field );
}
}
- if ( isVarchar ) defaultValue = '\'' + defaultValue + '\'';
-
- try
- {
- String query = "UPDATE " + tableName + " SET " + fieldName + '=' + defaultValue +
- " WHERE " + fieldName + " IS NULL";
- executeQuery( query );
- }
- catch ( SQLException e )
- {
- System.err.println( e );
- log.error( e, e );
- }
}
public void executeQueryFile( String fileName )
@@ -824,5 +874,13 @@
}
return false;
}
+
+ /**
+ * Return the exception if one occured during the jdbc access
+ *
+ * @return exception which occured or null
+ */
+ public Exception getException()
+ { return oops; }
}
\ No newline at end of file
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2007-09-04 20:17:06 UTC (rev 63)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2007-09-04 20:35:27 UTC (rev 64)
@@ -44,30 +44,31 @@
{
public void run()
{
- new Utility( args );
+ try
+ {
+ new Utility( args );
+ }
+ catch ( Exception ex ) {/*ignore*/}
}
}.start();
}
public void openManager( String[] args )
+ throws Exception
{
- int i = 3;
- JdbcManager manager = new JdbcManager( args[ 0 ], args[ 1 ], args[ 2 ] );
- String className = args[ 3 ];
- if ( className.toLowerCase().equals( "class" ) )
+ if ( args.length < 6 )
{
- if ( args.length < 5 )
- {
- log.error( "No class name specified." );
- System.exit( -1 );
- }
- className = args[ 4 ];
-
- i = 5;
+ log.error(
+ "Insufficient parameters, need URL, driver class, login, password, \"class\", classname and targets" );
+ System.exit( -1 );
}
- else
+ int i = 4;
+ JdbcManager manager = new JdbcManager( args[ 0 ], args[ 1 ], args[ 2 ], args[ 3 ] );
+ String className = args[ 4 ];
+ if ( "class".equals( className.toLowerCase() ) )
{
- className = "DefaultInterface";
+ className = args[ 5 ];
+ i++;
}
DatabaseMap map = null;
@@ -75,11 +76,18 @@
{
map = (DatabaseMap) Class.forName( className ).newInstance();
}
- catch ( Exception e )
+ catch ( Exception eft )
{
- System.err.println( "Cannot find DatabaseMap class " + className );
- log.error( "Cannot find DatabaseMap class " + className, e );
- System.exit( -1 );
+ try
+ {
+ map = (DatabaseMap) Thread.currentThread().getContextClassLoader().loadClass( className ).newInstance();
+ }
+ catch ( Exception e )
+ {
+ System.err.println( "Cannot find DatabaseMap class " + className );
+ log.error( "Cannot find DatabaseMap class " + className, e );
+ System.exit( -1 );
+ }
}
map.init();
@@ -125,16 +133,16 @@
}
else if ( "createpk".equals( next ) )
{
- manager.checkPrimaryKeys( map );
+ manager.checkPrimaryKeys();
}
- else if ( "checkfields".equals( next ) )
+ else if ( "defaults".equals( next ) )
{
- manager.updateFields( map, false );
+ manager.updateDefault( map );
}
- else if ( "updatefields".equals( next ) )
+ else if ( "update".equals( next ) )
{
- manager.updateTables( map );
- manager.updateFields( map, true );
+ manager.createTables( map );
+ manager.updateFields( map );
}
else
{
@@ -148,22 +156,23 @@
i++;
}
manager.close();
+ if ( manager.getException() != null ) throw manager.getException();
}
public Utility( String[] args )
+ throws Exception
{
if ( args.length < 3 )
{
log.info(
- "Usage: utitity <location> <username> <password> [class Databasemap] [operations] [file query.sql]" );
- log.info( "DatabaseMap - class which contains database information (tables and fields)" );
+ "Usage: utitity <location> <driverclass> <username> <password> [class Databasemap] [operations] [file query.sql]" );
+ log.info( "DatabaseMap - class which contains database information (tables and fields)" );
log.info( "Operations:" );
- log.info( "createpk - creates primary keys for tables that don't have any;" );
- log.info( "checkfields - check that all table fields exist;" );
- log.info( "file - executes a query file. The file name with full path has to be specified next." );
- log.info( "indexes - delete and restore indexes;" );
- log.info(
- "updatefields - updates table fields values where there is null and a default value is specified." );
+ log.info( "update - create all tables and fields, update definition if possible;" );
+ log.info( "defaults - update field values where there is null and a default value is specified." );
+ log.info( "createpk - creates primary keys for tables that don't have any;" );
+ log.info( "indexes - delete and restore indexes;" );
+ log.info( "file - executes a query file. The file name with full path has to be specified next." );
System.exit( 0 );
}
if ( args.length > 3 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-04 20:17:09
|
Revision: 63
http://equanda.svn.sourceforge.net/equanda/?rev=63&view=rev
Author: triathlon98
Date: 2007-09-04 13:17:06 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
template is not required, allows targets which do not have the generate parameters
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java
Modified: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java 2007-09-04 19:12:19 UTC (rev 62)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java 2007-09-04 20:17:06 UTC (rev 63)
@@ -61,7 +61,6 @@
/**
* @parameter expression=""
- * @required
*/
private String template;
@@ -129,6 +128,8 @@
public void execute()
throws MojoExecutionException
{
+ if ( template == null || "".equals( template ) ) return;
+
boolean isResources = Boolean.valueOf( resources );
if ( "?".equals( outputDirectory ) )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-04 19:12:24
|
Revision: 62
http://equanda.svn.sourceforge.net/equanda/?rev=62&view=rev
Author: triathlon98
Date: 2007-09-04 12:12:19 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
EQ-35 add left and right methods
Modified Paths:
--------------
trunk/equanda-util/src/main/java/org/equanda/util/StringUtil.java
trunk/equanda-util/src/test/java/org/equanda/util/StringUtilTest.java
Modified: trunk/equanda-util/src/main/java/org/equanda/util/StringUtil.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/StringUtil.java 2007-09-04 11:04:39 UTC (rev 61)
+++ trunk/equanda-util/src/main/java/org/equanda/util/StringUtil.java 2007-09-04 19:12:19 UTC (rev 62)
@@ -117,9 +117,9 @@
/**
* Apply wordwrap to the given string, for given line length, and return the line requested.
*
- * @param base String which needs wordwrap
+ * @param base String which needs wordwrap
* @param linelen Line length to be used when wrapping
- * @param line line which is requested
+ * @param line line which is requested
* @return selecting line taking wordwrap into account
*/
public static String wordwrap( String base, int linelen, int line )
@@ -327,4 +327,33 @@
{
return ( obj1 == null && obj2 == null ) || ( obj1 != null && obj1.equals( obj2 ) );
}
+
+ /**
+ * Return first x characters from a string, or less if string is not long enough
+ *
+ * @param base base string
+ * @param length mas number of characters to return
+ * @return limited string
+ */
+ public static String left( String base, int length )
+ {
+ if ( length < 0 ) length = 0;
+ if ( base.length() <= length ) return base;
+ return base.substring( 0, length );
+ }
+
+ /**
+ * Return last x characters from a string, or less if string is not long enough
+ *
+ * @param base base string
+ * @param length mas number of characters to return
+ * @return limited string
+ */
+ public static String right( String base, int length )
+ {
+ if ( length < 0 ) length = 0;
+ int tot = base.length();
+ if ( tot <= length ) return base;
+ return base.substring( tot - length );
+ }
}
\ No newline at end of file
Modified: trunk/equanda-util/src/test/java/org/equanda/util/StringUtilTest.java
===================================================================
--- trunk/equanda-util/src/test/java/org/equanda/util/StringUtilTest.java 2007-09-04 11:04:39 UTC (rev 61)
+++ trunk/equanda-util/src/test/java/org/equanda/util/StringUtilTest.java 2007-09-04 19:12:19 UTC (rev 62)
@@ -117,4 +117,22 @@
String ab = "ab", ba = "ba";
assertTrue( StringUtil.objectEquals( ab + "a", "a" + ba ) );
}
+
+ public void testLeft()
+ {
+ assertEquals( "bla", StringUtil.left( "bla", 3 ) );
+ assertEquals( "bl", StringUtil.left( "bla", 2 ) );
+ assertEquals( "bla", StringUtil.left( "bla", 4 ) );
+ assertEquals( "", StringUtil.left( "bla", 0 ) );
+ assertEquals( "", StringUtil.left( "bla", -1 ) );
+ }
+
+ public void testRight()
+ {
+ assertEquals( "bla", StringUtil.right( "bla", 3 ) );
+ assertEquals( "la", StringUtil.right( "bla", 2 ) );
+ assertEquals( "bla", StringUtil.right( "bla", 4 ) );
+ assertEquals( "", StringUtil.right( "bla", 0 ) );
+ assertEquals( "", StringUtil.right( "bla", -1 ) );
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-04 11:04:56
|
Revision: 61
http://equanda.svn.sourceforge.net/equanda/?rev=61&view=rev
Author: triathlon98
Date: 2007-09-04 04:04:39 -0700 (Tue, 04 Sep 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build (partial)
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-generate/pom.xml
trunk/equanda-maven-plugin/pom.xml
trunk/equanda-server/pom.xml
trunk/equanda-t4-template/pom.xml
trunk/equanda-tool/pom.xml
trunk/equanda-util/pom.xml
Removed Paths:
-------------
trunk/equanda-test/src/equanda/
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
+++ trunk/equanda-client/pom.xml 2007-09-04 11:04:39 UTC (rev 61)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<version>0.8-SNAPSHOT</version>
<name>equanda-client</name>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: trunk/equanda-generate/pom.xml
===================================================================
--- trunk/equanda-generate/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
+++ trunk/equanda-generate/pom.xml 2007-09-04 11:04:39 UTC (rev 61)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<version>0.8-SNAPSHOT</version>
<name>equanda-generate</name>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<build>
<resources>
<resource>
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
+++ trunk/equanda-maven-plugin/pom.xml 2007-09-04 11:04:39 UTC (rev 61)
@@ -14,7 +14,7 @@
<description>
Provide a maven plugin to the equanda generate functionality.
</description>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: trunk/equanda-server/pom.xml
===================================================================
--- trunk/equanda-server/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
+++ trunk/equanda-server/pom.xml 2007-09-04 11:04:39 UTC (rev 61)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<version>0.8-SNAPSHOT</version>
<name>equanda-server</name>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: trunk/equanda-t4-template/pom.xml
===================================================================
--- trunk/equanda-t4-template/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
+++ trunk/equanda-t4-template/pom.xml 2007-09-04 11:04:39 UTC (rev 61)
@@ -11,5 +11,5 @@
<packaging>war</packaging>
<version>0.8-SNAPSHOT</version>
<name>equanda-t4-template</name>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
</project>
Modified: trunk/equanda-tool/pom.xml
===================================================================
--- trunk/equanda-tool/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
+++ trunk/equanda-tool/pom.xml 2007-09-04 11:04:39 UTC (rev 61)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<version>0.8-SNAPSHOT</version>
<name>equanda-tool</name>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: trunk/equanda-util/pom.xml
===================================================================
--- trunk/equanda-util/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
+++ trunk/equanda-util/pom.xml 2007-09-04 11:04:39 UTC (rev 61)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<version>0.8-SNAPSHOT</version>
<name>equanda-util</name>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-03 18:37:44
|
Revision: 60
http://equanda.svn.sourceforge.net/equanda/?rev=60&view=rev
Author: triathlon98
Date: 2007-09-03 11:37:41 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build (partial, now still 76 test failing of the 216)
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/SelectorsStateType.java
trunk/equanda-test/test-t4-ear/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/pom.xml
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/SelectorsStateType.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/SelectorsStateType.java 2007-09-03 16:28:21 UTC (rev 59)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/SelectorsStateType.java 2007-09-03 18:37:41 UTC (rev 60)
@@ -24,8 +24,9 @@
package org.equanda.persistence.om;
+import java.io.Serializable;
+import java.util.Hashtable;
import java.util.Map;
-import java.util.Hashtable;
/**
* type which combines the selector state for use in the thread local object.
@@ -33,6 +34,7 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class SelectorsStateType
+ implements Serializable
{
private Map<String, String> filters = new Hashtable<String, String>();
private Map<String, String> tableOrder = new Hashtable<String, String>();
Modified: trunk/equanda-test/test-t4-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t4-ear/pom.xml 2007-09-03 16:28:21 UTC (rev 59)
+++ trunk/equanda-test/test-t4-ear/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
@@ -48,11 +48,6 @@
</webModule>
<!-- exclude files which are either unneeded or part of jboss distro -->
<javaModule>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <excluded>true</excluded>
- </javaModule>
- <javaModule>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
<excluded>true</excluded>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2007-09-03 16:28:21 UTC (rev 59)
+++ trunk/equanda-test/test-test/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
@@ -113,6 +113,12 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<repositories>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-09-03 16:28:21 UTC (rev 59)
+++ trunk/pom.xml 2007-09-03 18:37:41 UTC (rev 60)
@@ -318,6 +318,11 @@
<version>4.0.4</version>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-client</artifactId>
+ <version>4.0.5</version>
+ </dependency>
+ <dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>1.2.4</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-03 17:36:42
|
Revision: 57
http://equanda.svn.sourceforge.net/equanda/?rev=57&view=rev
Author: triathlon98
Date: 2007-09-03 03:07:28 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
EQ-1 fix location
Added Paths:
-----------
trunk/equanda-test/test-core/src/main/resources/META-INF/
Removed Paths:
-------------
trunk/equanda-test/src/test/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/translation/
trunk/test-core/src/main/resources/META-INF/
Copied: trunk/equanda-test/test-core/src/main/resources/META-INF (from rev 56, trunk/test-core/src/main/resources/META-INF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-03 17:06:02
|
Revision: 55
http://equanda.svn.sourceforge.net/equanda/?rev=55&view=rev
Author: triathlon98
Date: 2007-09-03 02:36:27 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
fix tracker link (now jira)
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-30 12:43:45 UTC (rev 54)
+++ trunk/pom.xml 2007-09-03 09:36:27 UTC (rev 55)
@@ -39,8 +39,8 @@
</license>
</licenses>
<issueManagement>
- <system>sourceforge trackers</system>
- <url>http://sourceforge.net/tracker/?group_id=200146</url>
+ <system>Atlassian JIRA</system>
+ <url>http://jira.equanda.org/</url>
</issueManagement>
<scm>
<connection>
@@ -400,7 +400,7 @@
and the running of the integration tests.
Including this will add "some" time to the build :-(
-->
- <id>test</id>
+ <id>fulltest</id>
<activation>
<property>
<name>fulltest</name>
@@ -410,6 +410,36 @@
<module>equanda-test</module>
</modules>
</profile>
+ <profile>
+ <!--
+ It would be better for these settings (or the local equivalents to be defined in
+ %USER_HOME%/.m2/settings.xml or %M2_HOME%/conf/settings.xml. That way the pom does not need modifying
+ and the profile does not need to be selected.
+ The settings here are provided as example.
+ -->
+ <id>dev-example</id>
+ <activation>
+ <property>
+ <name>dev</name>
+ <value>example</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- jboss properties-->
+ <equanda.jboss.home>/home/joachim/java/equandajboss</equanda.jboss.home>
+ <equanda.jboss.config>equanda</equanda.jboss.config>
+ <equanda.jboss.host>localhost</equanda.jboss.host>
+ <equanda.jboss.port>8080</equanda.jboss.port>
+ <equanda.jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </equanda.jboss.jvmargs>
+ <equanda.jboss.logging>medium</equanda.jboss.logging>
+ <!-- selenium properties-->
+ <firefox.path>firefox</firefox.path>
+ </properties>
+ </profile>
</profiles>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-03 16:28:28
|
Revision: 59
http://equanda.svn.sourceforge.net/equanda/?rev=59&view=rev
Author: triathlon98
Date: 2007-09-03 09:28:21 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build (partial)
Modified Paths:
--------------
trunk/equanda-tapestry4/pom.xml
Modified: trunk/equanda-tapestry4/pom.xml
===================================================================
--- trunk/equanda-tapestry4/pom.xml 2007-09-03 16:24:03 UTC (rev 58)
+++ trunk/equanda-tapestry4/pom.xml 2007-09-03 16:28:21 UTC (rev 59)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<version>0.8-SNAPSHOT</version>
<name>equanda-tapestry4</name>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -90,5 +90,10 @@
<artifactId>jboss-serialization</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-03 16:24:12
|
Revision: 58
http://equanda.svn.sourceforge.net/equanda/?rev=58&view=rev
Author: triathlon98
Date: 2007-09-03 09:24:03 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
EQ-1 cargo deploy working, start/stop
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
trunk/equanda-test/pom.xml
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java
Added Paths:
-----------
trunk/equanda-test/test-test/src/test/resources/
trunk/equanda-test/test-test/src/test/resources/jndi.properties
Removed Paths:
-------------
trunk/equanda-test/test-test/src/test/jndi.properties
trunk/test-core/
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java 2007-09-03 16:24:03 UTC (rev 58)
@@ -32,6 +32,7 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
+@MappedSuperclass
public abstract class EquandaEntityBean
implements EquandaEntity
{
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java 2007-09-03 16:24:03 UTC (rev 58)
@@ -27,6 +27,7 @@
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Version;
+import javax.persistence.MappedSuperclass;
import java.sql.Timestamp;
/**
@@ -34,6 +35,7 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
+@MappedSuperclass
public class EquandaFieldBean
{
// fields
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-09-03 16:24:03 UTC (rev 58)
@@ -81,15 +81,15 @@
public abstract EquandaProxy getProxy();
- /**
+ /*
* ************************************ Bean defintions: *************************************
*/
@Bean( EquandaFormValidator.class )
public abstract ValidationDelegate getValidationDelegate();
- /**
- * ********************************** Assets defintions: *************************************
+ /*
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/action/equandaAction/EquandaAction.html" )
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-test/pom.xml 2007-09-03 16:24:03 UTC (rev 58)
@@ -18,6 +18,7 @@
<module>test-core</module>
<module>test-t4-gui</module>
<module>test-t4-ear</module>
+ <module>test-ddltool</module>
<module>test-test</module>
<module>test-gui-t4-test</module>
</modules>
@@ -157,69 +158,4 @@
</dependencies>
</dependencyManagement>
- <profiles>
- <!-- each profile contains properties used to start jboss and run selenium testcases
- in order to activate the profile you must add to the maven command line the following :
- -Dmachine=linux - to activate your profile
- -Dselenium-tests - to run selenium tests cases
- -Dstart-jboss - to start jboss from maven(it also automatically deploys the ear file)
-
- note : if you run selenium test you'll need to change the RMI port of the jboss server (4444) because
- the jetty used by the selenium server also uses it ... and I dont know of any way to change that one
- so , in the '\conf\jboss-service.xml' file
- replace this: <attribute name="RMIObjectPort">4444</attribute>
- with this: <attribute name="RMIObjectPort">14444</attribute>
- -->
- <profile>
- <id>config-win</id>
- <activation>
- <property>
- <name>machine</name>
- <value>win</value>
- </property>
- </activation>
- <properties>
- <!-- jboss properties-->
- <jboss.appserver.home>C:\java\synjboss</jboss.appserver.home>
- <jboss.configuration>equanda</jboss.configuration>
- <jboss.host>localhost</jboss.host>
- <jboss.port>8080</jboss.port>
- <jboss.jvmargs>
- -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
- -Dsun.rmi.dgc.client.gcInterval=3600000
- -Dsun.rmi.dgc.server.gcInterval=3600000
- </jboss.jvmargs>
- <jboss.logging>medium</jboss.logging>
- <!-- selenium properties-->
- <firefox.path>C:\Program Files\Mozilla Firefox\firefox.exe</firefox.path>
- <selenium.test.path>C:/equanda/src/test/resources/selenium</selenium.test.path>
- </properties>
- </profile>
- <profile>
- <id>config-linux</id>
- <activation>
- <property>
- <name>machine</name>
- <value>linux</value>
- </property>
- </activation>
- <properties>
- <!-- jboss properties-->
- <jboss.appserver.home>~/java/synjboss</jboss.appserver.home>
- <jboss.configuration>equanda</jboss.configuration>
- <jboss.host>localhost</jboss.host>
- <jboss.port>8080</jboss.port>
- <jboss.jvmargs>
- -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
- -Dsun.rmi.dgc.client.gcInterval=3600000
- -Dsun.rmi.dgc.server.gcInterval=3600000
- </jboss.jvmargs>
- <jboss.logging>medium</jboss.logging>
- <!-- selenium properties-->
- <firefox.path>firefox</firefox.path>
- <selenium.test.path>/home/tom/apps/java/equanda/equanda-test/test-t4-gui/src/test/resources/selenium</selenium.test.path>
- </properties>
- </profile>
- </profiles>
-
</project>
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-test/test-ddltool/pom.xml 2007-09-03 16:24:03 UTC (rev 58)
@@ -14,71 +14,26 @@
<description>test ddltool</description>
<url>http://equanda.org</url>
- <profiles>
- <profile>
- <activation>
- <property>
- <name>!skip-ddltool</name>
- </property>
- </activation>
- <build>
- <plugins>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <configuration>
+ <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <template>ddltool</template>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.equanda</groupId>
- <artifactId>equanda-tool</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/classes
- </outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/classes
- </outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.equanda</groupId>
- <artifactId>equanda-maven-plugin</artifactId>
- <configuration>
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
- <template>ddltool</template>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-test/test-test/pom.xml 2007-09-03 16:24:03 UTC (rev 58)
@@ -19,12 +19,12 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>0.3-SNAPSHOT</version>
+ <version>0.3</version>
<configuration>
- <wait>${cargo.wait}</wait>
+ <wait>false</wait>
<container>
<containerId>jboss4x</containerId>
- <home>${jboss.appserver.home}</home>
+ <home>${equanda.jboss.home}</home>
</container>
<configuration>
<type>existing</type>
@@ -40,6 +40,7 @@
<deployable>
<artifactId>test-t4-ear</artifactId>
<type>ear</type>
+ <pingURL>http://${equanda.jboss.host}:${equanda.jboss.port}/equanda/index.html</pingURL>
</deployable>
</deployables>
</configuration>
@@ -47,14 +48,14 @@
<executions>
<execution>
<id>start-container</id>
- <phase>pre-integration-test</phase>
+ <phase>test-compile</phase><!-- should be <phase>pre-test</phase>-->
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>stop-container</id>
- <phase>post-integration-test</phase>
+ <phase>prepare-package</phase><!-- should be <phase>post-test</phase>-->
<goals>
<goal>stop</goal>
</goals>
@@ -63,7 +64,7 @@
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.equanda.test</groupId>
@@ -79,16 +80,28 @@
<artifactId>equanda-tapestry4</artifactId>
</dependency>
<dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-util</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbosssx</artifactId>
- <version>4.0.4</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jnp-client</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-ejb3x</artifactId>
</dependency>
<dependency>
@@ -99,7 +112,22 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>openqa</id>
+ <name>OpenQA Repository</name>
+ <url>http://maven.openqa.org/</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>codehaus</id>
+ <name>codehaus repository</name>
+ <url>http://repository.codehaus.org/</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+
</project>
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java 2007-09-03 16:24:03 UTC (rev 58)
@@ -30,11 +30,12 @@
import org.jboss.security.SimplePrincipal;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Properties;
/**
- * ...
+ * Base testcase which assures the user is logged in to the application server.
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
@@ -55,10 +56,15 @@
try
{
Properties prop = new Properties();
- prop.load( Thread.currentThread().getContextClassLoader().getResourceAsStream( "jndi.properties" ) );
- String login = prop.getProperty( "jboss.login" );
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( "jndi.properties" );
+ String login = null, paswd = null;
+ if ( is != null )
+ {
+ prop.load( is );
+ login = prop.getProperty( "jboss.login" );
+ paswd = prop.getProperty( "jboss.password" );
+ }
if ( login == null ) login = "local";
- String paswd = prop.getProperty( "jboss.password" );
if ( paswd == null ) paswd = "local";
importCredentials = new ImportCredentials( login, paswd );
Deleted: trunk/equanda-test/test-test/src/test/jndi.properties
===================================================================
--- trunk/equanda-test/test-test/src/test/jndi.properties 2007-09-03 10:07:28 UTC (rev 57)
+++ trunk/equanda-test/test-test/src/test/jndi.properties 2007-09-03 16:24:03 UTC (rev 58)
@@ -1,6 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=127.0.0.1
-;java.naming.provider.url=192.168.0.205
-jboss.login=local
-jboss.password=local
Copied: trunk/equanda-test/test-test/src/test/resources/jndi.properties (from rev 56, trunk/equanda-test/test-test/src/test/jndi.properties)
===================================================================
--- trunk/equanda-test/test-test/src/test/resources/jndi.properties (rev 0)
+++ trunk/equanda-test/test-test/src/test/resources/jndi.properties 2007-09-03 16:24:03 UTC (rev 58)
@@ -0,0 +1,6 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=127.0.0.1
+;java.naming.provider.url=192.168.0.205
+jboss.login=local
+jboss.password=local
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-30 12:44:00
|
Revision: 54
http://equanda.svn.sourceforge.net/equanda/?rev=54&view=rev
Author: triathlon98
Date: 2007-08-30 05:43:45 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build (partial)
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMInclude.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java
trunk/equanda-test/src/main/om/CocoonMan.table
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ActionMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/AutoFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/EquandaRoleMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/LinkableMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ProgrConstraintsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/VehicleWithWingsMediator.java
trunk/equanda-test/test-gui-t4-test/pom.xml
trunk/equanda-test/test-t4-gui/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-test/test-test/src/test/java/org/equanda/test/applet/TestApplet.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/pages/testFilters/TestFilters.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ActionTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/BuilderSetTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ChoicesTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/CloneableTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/CompareTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DefaultTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DelegateTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DowngradeTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EntityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/FieldTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ImmutableIfGlobalInheritedTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ImmutableIfGlobalTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/InheritanceTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/LazyInstTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/LinkTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ModifiedProxyTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/MultipleFieldTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/PriorityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ProgrConstraintsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ProxyTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveLinksTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RequiredFieldsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SecurityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectionTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorUpdateTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsFiltersTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsSortingTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/StringLengthTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SubselectTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TypeTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/UniqueFieldsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportInvalidTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java
trunk/pom.xml
Added Paths:
-----------
trunk/equanda-test/test-core/src/main/java/org/equanda/test/TestExceptionCodes.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/translation/
trunk/equanda-test/test-core/src/main/resources/
trunk/equanda-test/test-core/src/main/resources/translations.txt
trunk/equanda-test/test-t4-gui/src/
trunk/equanda-test/test-t4-gui/src/main/
trunk/equanda-test/test-t4-gui/src/main/webapp/
trunk/equanda-test/test-t4-gui/src/main/webapp/META-INF/
trunk/equanda-test/test-t4-gui/src/main/webapp/WEB-INF/
trunk/equanda-test/test-t4-gui/src/main/webapp/border.xml
trunk/equanda-test/test-t4-gui/src/main/webapp/config.properties
trunk/equanda-test/test-t4-gui/src/main/webapp/css/
trunk/equanda-test/test-t4-gui/src/main/webapp/images/
trunk/equanda-test/test-t4-gui/src/main/webapp/test/
trunk/equanda-test/test-test/src/test/java/org/equanda/test/applet/EquandaView.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SetEquandaRollbackTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java
Removed Paths:
-------------
trunk/equanda-test/src/etc/site_tapestry/META-INF/
trunk/equanda-test/src/etc/site_tapestry/site.war/WEB-INF/
trunk/equanda-test/src/etc/site_tapestry/site.war/border.xml
trunk/equanda-test/src/etc/site_tapestry/site.war/config.properties
trunk/equanda-test/src/etc/site_tapestry/site.war/css/
trunk/equanda-test/src/etc/site_tapestry/site.war/images/
trunk/equanda-test/src/etc/site_tapestry/site.war/test/
trunk/equanda-test/src/etc/site_tapestry/site.war/translations.txt
trunk/equanda-test/test-test/src/test/java/org/equanda/test/applet/UnidView.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/translation/
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ExtractionOfValueTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/GetSetUsingValueTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SetUnidRollbackTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/UnidQueryTest.java
Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2007-08-28 10:53:36 UTC (rev 53)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2007-08-30 12:43:45 UTC (rev 54)
@@ -629,6 +629,36 @@
}
}
+ /**
+ * Check whether a document which could be parse exists
+ *
+ * @param filename file name to test
+ * @return true when file is found
+ */
+ public boolean documentExists( final String filename )
+ {
+ if ( !filename.startsWith( "classpath://" ) )
+ {
+ File file = new File( appDir + filename );
+ return file.exists();
+ }
+ else
+ {
+ ClassLoader classLoader = this.getClass().getClassLoader();
+ InputStream stream = classLoader.getResourceAsStream( filename.substring( 12, filename.length() ) );
+ if ( stream != null )
+ {
+ try { stream.close(); } catch ( IOException ioe ) {/*ignore*/}
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ }
+
public Document getDocument( final String filename )
{
return getDocument( filename, true, true );
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMInclude.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMInclude.java 2007-08-28 10:53:36 UTC (rev 53)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMInclude.java 2007-08-30 12:43:45 UTC (rev 54)
@@ -87,8 +87,6 @@
public void include()
{
- boolean saveFailed = gen.getFailed();
-
if ( !( getParentNode() instanceof NodeForInclude ) )
{
// shouldn't happen
@@ -97,51 +95,48 @@
" which does not implement NodeForInclude" );
}
OMTable table = ( (NodeForInclude) getParentNode() ).getOMTable();
- Document doc = gen.getDocument( file, false, false );
- if ( doc != null )
+ if ( required || gen.documentExists( file ) )
{
- OMIncludedata includeData = (OMIncludedata) doc.getDocumentRoot();
- includeData.setOMTable( table );
- doc.removeChild( includeData );
- Node parent = this.getParentNode();
-
- // first, set the "table" correctly to all children who need this:
- Node next, element = includeData;
- while ( element != null )
+ Document doc = gen.getDocument( file, false, false );
+ if ( doc != null )
{
- if ( element instanceof NodeForInclude )
+ OMIncludedata includeData = (OMIncludedata) doc.getDocumentRoot();
+ includeData.setOMTable( table );
+ doc.removeChild( includeData );
+ Node parent = this.getParentNode();
+
+ // first, set the "table" correctly to all children who need this:
+ Node next, element = includeData;
+ while ( element != null )
{
- ( (NodeForInclude) element ).setOMTable( table );
+ if ( element instanceof NodeForInclude )
+ {
+ ( (NodeForInclude) element ).setOMTable( table );
+ }
+ next = element.getFirstChild();
+ while ( next == null && element != null )
+ {
+ next = element.getNextSibling();
+ element = element.getParentNode();
+ }
+ element = next;
}
- next = element.getFirstChild();
- while ( next == null && element != null )
- {
- next = element.getNextSibling();
- element = element.getParentNode();
- }
- element = next;
- }
- // move children to parent node
- Node child;
- next=includeData.getFirstChild();
- while (next!=null)
- {
- child=next;
- next=next.getNextSibling();
- if ( parent.canAppendChild( child.getTagName(), includeData.getAttributes( child.getTagName() ) ) )
+ // move children to parent node
+ Node child;
+ next = includeData.getFirstChild();
+ while ( next != null )
{
- this.getParentNode().appendChild( child );
+ child = next;
+ next = next.getNextSibling();
+ if ( parent.canAppendChild( child.getTagName(), includeData.getAttributes( child.getTagName() ) ) )
+ {
+ this.getParentNode().appendChild( child );
+ }
}
+ getParentNode().removeChild( this );
}
- getParentNode().removeChild( this );
}
- if ( doc == null && !required )
- {
- // in generator, failed was set to true if the file was not found
- // but we want to ignore this
- gen.setFailed( saveFailed );
- }
}
public String toString()
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-08-28 10:53:36 UTC (rev 53)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-08-30 12:43:45 UTC (rev 54)
@@ -266,11 +266,11 @@
{
if ( selects != null ) return selects;
selects = (ArrayList<OMSelect>) getChildren( "select" );
- if ( !hasSelect( "equandaAll" ) )
+ if ( !hasSelect( "EquandaAll" ) )
{
- // add equandaAll select for all tables
+ // add EquandaAll select for all tables
OMSelect findall = new OMSelect();
- findall.setName( "equandaAll" );
+ findall.setName( "EquandaAll" );
findall.setSecurityRole( getSecurityRole() );
findall.setTableName( name );
findall.setRootTable( this );
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java 2007-08-28 10:53:36 UTC (rev 53)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java 2007-08-30 12:43:45 UTC (rev 54)
@@ -250,7 +250,7 @@
}
/**
- * Allow to set tableName when adding an automatic select (like equandaAll)
+ * Allow to set tableName when adding an automatic select (like EquandaAll)
*
* @param tableName
*/
@@ -260,7 +260,7 @@
}
/**
- * Allow to set rootTable when adding an automatic select (like equandaAll)
+ * Allow to set rootTable when adding an automatic select (like EquandaAll)
*
* @param rootTable
*/
@@ -399,7 +399,7 @@
if ( o.equals( "EQUANDA_MODIFIED" ) )
{
OMField field = new OMField();
- field.name = "equandaModificationDate";
+ field.name = "EquandaModificationDate";
field.varName = "equandaModificationDate";
field.xDocletName = "equandaModificationDate";
field.type = OMField.TYPE_TIMESTAMP;
@@ -408,7 +408,7 @@
else if ( o.equals( "EQUANDA_CREATION" ) )
{
OMField field = new OMField();
- field.name = "equandaCreationDate";
+ field.name = "EquandaCreationDate";
field.varName = "equandaCreationDate";
field.xDocletName = "equandaCreationDate";
field.type = OMField.TYPE_TIMESTAMP;
@@ -417,7 +417,7 @@
else if ( o.equals( "EQUANDA_STATUS" ) )
{
OMField field = new OMField();
- field.name = "equandaStatus";
+ field.name = "EquandaStatus";
field.varName = "equandaStatus";
field.xDocletName = "equandaStatus";
field.type = OMField.TYPE_STRING;
Deleted: trunk/equanda-test/src/etc/site_tapestry/site.war/border.xml
===================================================================
--- trunk/equanda-test/src/etc/site_tapestry/site.war/border.xml 2007-08-28 10:53:36 UTC (rev 53)
+++ trunk/equanda-test/src/etc/site_tapestry/site.war/border.xml 2007-08-30 12:43:45 UTC (rev 54)
@@ -1,9 +0,0 @@
-<items>
- <item page="/app?service=page&page=TablesIndexPage" icon="/images/gui.jpg" key="menu.gui.label" id="cbGUI"/>
- <item page="/app?service=page&page=ReportList" icon="/images/report.jpg" key="menu.reports.label"
- id="cbREPORT"/>
- <item page="/app?service=page&page=Import" icon="/images/import.jpg" key="menu.import.label" id="cbIMPORT"/>
- <item page="/app?service=page&page=Alerts" icon="/images/import.jpg" key="menu.alerts.label" id="cbALERTS"/>
- <item page="/app?service=page&page=TestFilters" icon="/images/import.jpg" key="menu.testFilters.label" id="cbTESTFILTERS"/>
- <item page="/app?service=page&page=TestApplet" icon="/images/import.jpg" key="menu.testApplet.label" id="cbTESTAPPLET"/>
-</items>
Deleted: trunk/equanda-test/src/etc/site_tapestry/site.war/config.properties
===================================================================
--- trunk/equanda-test/src/etc/site_tapestry/site.war/config.properties 2007-08-28 10:53:36 UTC (rev 53)
+++ trunk/equanda-test/src/etc/site_tapestry/site.war/config.properties 2007-08-30 12:43:45 UTC (rev 54)
@@ -1,12 +0,0 @@
-ejb-client-package=org.equanda.test.om.client.
-gui-max-field-length=20
-finder-limit=1000
-logo-file=logo.png
-maximum_links_in_combobox=3
-gui-select-page-size=2
-keep-alive-refresh-time=300000
-show-stack-items=4
-timeout-sec=600
-max-alerts=20
-alerts-show-warnings=true
-
Deleted: trunk/equanda-test/src/etc/site_tapestry/site.war/translations.txt
===================================================================
--- trunk/equanda-test/src/etc/site_tapestry/site.war/translations.txt 2007-08-28 10:53:36 UTC (rev 53)
+++ trunk/equanda-test/src/etc/site_tapestry/site.war/translations.txt 2007-08-30 12:43:45 UTC (rev 54)
@@ -1,1675 +0,0 @@
-;Last edited: 2007-06-05
-.languages en;nl;ro;fr
-.key 100001/equanda-application-exceptions
-.label.en Problem in autoPassport
-.key 100002/equanda-application-exceptions
-.label.en Problem in autoMultipleAuto
-.key 100003/equanda-application-exceptions
-.label.en Problem in autoMultiplePassport
-.key 100004/equanda-application-exceptions
-.label.en Same identifier is used for edit access and run access&
-.key 100005/equanda-application-exceptions
-.label.en resultName must be a name for a new role, not null
-.key 100006/equanda-application-exceptions
-.label.en mergeName must be a name for an existing role, not null
-.key 100007/equanda-application-exceptions
-.label.en Role not found&
-.key 110001/equanda-application-exceptions
-.label.en Number is not a multiple of 100&
-.key 110002/equanda-application-exceptions
-.label.en $1 is not allowed as a values to TheString field of the record you want to add
-.key 110003/equanda-application-exceptions
-.label.en $1 is not allowed as a values to TheString field of the record you want to remove
-.key 140001/equanda-application-exceptions
-.label.en Too slow for a vehicle with wings&
-.key AllTables/equanda-skin
-.label.en List of tables
-.label.ro Lista de tabele
-.key CurrentTable/equanda-skin
-.label.en Current table
-.label.ro Tabela curenta
-.key Error/LoginErrorPage
-.label.en Oooops, unexpected problems!
-.label.ro Problema la login
-.key action.Action.addAction/equanda-table
-.label.en addAction
-.key action.Action.failingAction/equanda-table
-.label.en failingAction
-.key action.Action.hashCode/equanda-table
-.label.en hashCode
-.key action.Action.suggestFieldAction/equanda-table
-.label.en suggestFieldAction
-.key action.Action.suggestPathAction/equanda-table
-.label.en suggestPathAction
-.key action.Action.suggestTableAction/equanda-table
-.label.en suggestTableAction
-.key action.Action.suggestValueAction/equanda-table
-.label.en suggestValueAction
-.key action.Action.suggestValueListAction/equanda-table
-.label.en suggestValueListAction
-.key action.Action.voidAction/equanda-table
-.label.en voidAction
-.key action.CocoonMan.TestAction/equanda-table
-.label.en TestAction
-.key action.HideIf.ActionHide/equanda-table
-.label.en ActionHide
-.key action.HideIf.ActionHideIf/equanda-table
-.label.en ActionHideIf
-.key action.HideIf.ActionShow/equanda-table
-.label.en ActionShow
-.key action.Secur.testProc1/equanda-table
-.label.en testProc1
-.key action.Secur.testProc2/equanda-table
-.label.en testProc2
-.key action.EquandaRole.mergeRestrictions/equanda-table
-.label.en mergeRestrictions
-.key action.EquandaRole.mergeRights/equanda-table
-.label.en mergeRights
-.key action.VeryDocumented.hashCode/equanda-table
-.label.en hashCode
-.key action.VeryDocumented.hashCode2/equanda-table
-.label.en hashCode2
-.key category.CocoonMan/equanda-table
-.label.en CocoonMan
-.key category.Other2Reports/ReportList
-.label.en Other 2 reports
-.key category.ReportsLazyInst/ReportList
-.label.en Reports LazyInst
-.key category.default/ReportList
-.label.en Default category
-.key category.default/equanda-table
-.label.en default
-.key choice.Choices.Countries.COUNTRY_AUS/equanda-table
-.label.en COUNTRY_AUS
-.key choice.Choices.Countries.COUNTRY_NZ/equanda-table
-.label.en COUNTRY_NZ
-.key choice.Choices.Countries.COUNTRY_USA/equanda-table
-.label.en COUNTRY_USA
-.key choice.Choices.ImmutableWeight.WEIGHT_BIG/equanda-table
-.label.en WEIGHT_BIG
-.key choice.Choices.ImmutableWeight.WEIGHT_SMALL/equanda-table
-.label.en WEIGHT_SMALL
-.key choice.Choices.MonitorSize.MONITOR_SIZE_BIG/equanda-table
-.label.en MONITOR_SIZE_BIG
-.key choice.Choices.MonitorSize.MONITOR_SIZE_MEDIUM/equanda-table
-.label.en MONITOR_SIZE_MEDIUM
-.key choice.Choices.MonitorSize.MONITOR_SIZE_SMALL/equanda-table
-.label.en MONITOR_SIZE_SMALL
-.key choice.Choices.Season.SEASON_AUTOMN/equanda-table
-.label.en SEASON_AUTOMN
-.key choice.Choices.Season.SEASON_SPRING/equanda-table
-.label.en SEASON_SPRING
-.key choice.Choices.Season.SEASON_SUMMER/equanda-table
-.label.en SEASON_SUMMER
-.key choice.Choices.Season.SEASON_WINTER/equanda-table
-.label.en SEASON_WINTER
-.key choice.EquandaAlert.AlertType.ALERT_TYPE_CRITICAL/equanda-table
-.label.en ALERT_TYPE_CRITICAL
-.key choice.EquandaAlert.AlertType.ALERT_TYPE_WARNING/equanda-table
-.label.en ALERT_TYPE_WARNING
-.key choice.EquandaAlert.Cause.CAUSE_TYPE_1/equanda-table
-.label.en CAUSE_TYPE_1
-.key choice.EquandaAlert.Cause.CAUSE_TYPE_2/equanda-table
-.label.en CAUSE_TYPE_2
-.key choice.EquandaAlert.Cause.CAUSE_TYPE_IMPORT/equanda-table
-.label.en CAUSE_TYPE_IMPORT
-.key choice.EquandaAlert.Cause.CAUSE_TYPE_OTHER/equanda-table
-.label.en CAUSE_TYPE_OTHER
-.key choice.EquandaAlert.Status.ALERT_ACTIVE/equanda-table
-.label.en ALERT_ACTIVE
-.key choice.EquandaAlert.Status.ALERT_IGNORED/equanda-table
-.label.en ALERT_IGNORED
-.key choice.EquandaAlert.Status.ALERT_SOLVED/equanda-table
-.label.en ALERT_SOLVED
-.key choice.EquandaUser.Language.LANGUAGE_DUTCH/equanda-table
-.label.en LANGUAGE_DUTCH
-.key choice.EquandaUser.Language.LANGUAGE_ENGLISH/equanda-table
-.label.en LANGUAGE_ENGLISH
-.key choice.EquandaUser.Language.LANGUAGE_FRENCH/equanda-table
-.label.en LANGUAGE_FRENCH
-.key choice.EquandaUser.Language.LANGUAGE_ROMANIAN/equanda-table
-.label.en LANGUAGE_ROMANIAN
-.key field.Action.MulStr/equanda-table
-.label.en MulStr
-.key field.Action.Passport/equanda-table
-.label.en Passport
-.key field.Action.TheBool/equanda-table
-.label.en TheBool
-.key field.Action.TheDate/equanda-table
-.label.en TheDate
-.key field.Action.TheDouble/equanda-table
-.label.en TheDouble
-.key field.Action.TheInt/equanda-table
-.label.en TheInt
-.key field.Action.TheString/equanda-table
-.label.en TheString
-.key field.Action.TheTime/equanda-table
-.label.en TheTime
-.key field.AutoFields.AutoInt/equanda-table
-.label.en AutoInt
-.key field.AutoFields.Extra/equanda-table
-.label.en Extra
-.key field.AutoFields.MultipleAuto/equanda-table
-.label.en MultipleAuto
-.key field.AutoFields.MultiplePassport/equanda-table
-.label.en MultiplePassport
-.key field.AutoFields.Passport/equanda-table
-.label.en Passport
-.key field.BuilderSet.TestInt/equanda-table
-.label.en TestInt
-.key field.CalculatedFields.CalculatedInt/equanda-table
-.label.en CalculatedInt
-.key field.CalculatedFields.Extra/equanda-table
-.label.en Extra
-.key field.Car.Brand/equanda-table
-.label.en Brand
-.key field.Car.Extra/equanda-table
-.label.en Extra
-.key field.Car.ExtraUnique/equanda-table
-.label.en ExtraUnique
-.key field.Car.Fans/equanda-table
-.label.en Fans
-.key field.Car.Owners/equanda-table
-.label.en Owners
-.key field.Choices.Countries/equanda-table
-.label.en Countries
-.key field.Choices.Country2Letter/equanda-table
-.label.en Country2Letter
-.key field.Choices.Country3Letter/equanda-table
-.label.en Country3Letter
-.key field.Choices.Country3LetterShortField/equanda-table
-.label.en Country3LetterShortField
-.key field.Choices.CountryCodeString/equanda-table
-.label.en CountryCodeString
-.key field.Choices.CountryCodeValue/equanda-table
-.label.en CountryCodeValue
-.key field.Choices.ImmutableName/equanda-table
-.label.en ImmutableName
-.key field.Choices.ImmutableWeight/equanda-table
-.label.en ImmutableWeight
-.key field.Choices.MonitorSize/equanda-table
-.label.en MonitorSize
-.key field.Choices.Season/equanda-table
-.label.en Season
-.key field.Cloneable.TestCarLink/equanda-table
-.label.en TestCarLink
-.key field.Cloneable.TestCarLinkValueInclude/equanda-table
-.label.en TestCarLinkValueInclude
-.key field.Cloneable.TestCarMultipleLink/equanda-table
-.label.en TestCarMultipleLink
-.key field.Cloneable.TestMultipleString/equanda-table
-.label.en TestMultipleString
-.key field.Cloneable.TestStringCloneable/equanda-table
-.label.en TestStringCloneable
-.key field.Cloneable.TestStringNotCloneable/equanda-table
-.label.en TestStringNotCloneable
-.key field.Cloneable.TestValueIncludeCarMultipleLink/equanda-table
-.label.en TestValueIncludeCarMultipleLink
-.key field.CocoonMan.Atm/equanda-table
-.label.en Atm
-.key field.CocoonMan.Ats/equanda-table
-.label.en Ats
-.key field.CocoonMan.Blob/equanda-table
-.label.en Blob
-.key field.CocoonMan.BlobMultiple/equanda-table
-.label.en BlobMultiple
-.key field.CocoonMan.Car/equanda-table
-.label.en Car
-.key field.CocoonMan.Clob/equanda-table
-.label.en Clob
-.key field.CocoonMan.ClobMultiple/equanda-table
-.label.en ClobMultiple
-.key field.CocoonMan.DateOfBirth/equanda-table
-.label.en DateOfBirth
-.key field.CocoonMan.DatesToRemember/equanda-table
-.label.en DatesToRemember
-.key field.CocoonMan.Employed/equanda-table
-.label.en Employed
-.key field.CocoonMan.FirstName/equanda-table
-.label.en FirstName
-.key field.CocoonMan.Height/equanda-table
-.label.en Height
-.key field.CocoonMan.HiddenCar/equanda-table
-.label.en HiddenCar
-.key field.CocoonMan.HiddenInt/equanda-table
-.label.en HiddenInt
-.key field.CocoonMan.LastName/equanda-table
-.label.en LastName
-.key field.CocoonMan.LazyInst/equanda-table
-.label.en LazyInst
-.key field.CocoonMan.ManyCars/equanda-table
-.label.en ManyCars
-.key field.CocoonMan.NoOfChildren/equanda-table
-.label.en NoOfChildren
-.key field.CocoonMan.Passport/equanda-table
-.label.en Passport
-.key field.CocoonMan.PreviousJobs/equanda-table
-.label.en PreviousJobs
-.key field.CocoonMan.Sometime/equanda-table
-.label.en Sometime
-.key field.CocoonMan.WikiClob/equanda-table
-.label.en WikiClob
-.key field.CocoonMan.WikiMultipleClob/equanda-table
-.label.en WikiMultipleClob
-.key field.CocoonMan.WikiString/equanda-table
-.label.en WikiString
-.key field.Compare.Bool1/equanda-table
-.label.en Bool1
-.key field.Compare.Bool2/equanda-table
-.label.en Bool2
-.key field.Compare.Dat1/equanda-table
-.label.en Dat1
-.key field.Compare.Dat2/equanda-table
-.label.en Dat2
-.key field.Compare.DateFuture/equanda-table
-.label.en DateFuture
-.key field.Compare.Double1/equanda-table
-.label.en Double1
-.key field.Compare.Double2/equanda-table
-.label.en Double2
-.key field.Compare.Int1/equanda-table
-.label.en Int1
-.key field.Compare.Int2/equanda-table
-.label.en Int2
-.key field.Compare.Str1/equanda-table
-.label.en Str1
-.key field.Compare.Str2/equanda-table
-.label.en Str2
-.key field.Compare.TestImmutableDouble/equanda-table
-.label.en TestImmutableDouble
-.key field.Compare.TestImmutableInt/equanda-table
-.label.en TestImmutableInt
-.key field.Compare.Time1/equanda-table
-.label.en Time1
-.key field.Compare.Time2/equanda-table
-.label.en Time2
-.key field.Compare.TimePast/equanda-table
-.label.en TimePast
-.key field.Default.TestBlob/equanda-table
-.label.en TestBlob
-.key field.Default.TestClob/equanda-table
-.label.en TestClob
-.key field.Default.TestDate/equanda-table
-.label.en TestDate
-.key field.Default.TestDateDefaultNow/equanda-table
-.label.en TestDateDefaultNow
-.key field.Default.TestInt/equanda-table
-.label.en TestInt
-.key field.Default.TestIntDefault100/equanda-table
-.label.en TestIntDefault100
-.key field.Default.TestIntDefaultAuto/equanda-table
-.label.en TestIntDefaultAuto
-.key field.Default.TestIntDefaultClass/equanda-table
-.label.en TestIntDefaultClass
-.key field.Default.TestStringDefault10/equanda-table
-.label.en TestStringDefault10
-.key field.Delegate.Link1/equanda-table
-.label.en Link1
-.key field.Delegate.Link2/equanda-table
-.label.en Link2
-.key field.Delegate.Name/equanda-table
-.label.en Name
-.key field.Delegate.Passport/equanda-table
-.label.en Passport
-.key field.Delegate.TestDate/equanda-table
-.label.en TestDate
-.key field.Delegate.TestDateDelegate/equanda-table
-.label.en TestDateDelegate
-.key field.Delegate.TestStr/equanda-table
-.label.en TestStr
-.key field.Delegate.TestStrDelegate/equanda-table
-.label.en TestStrDelegate
-.key field.Delegate.TestTimestamp/equanda-table
-.label.en TestTimestamp
-.key field.Delegate.TestTimestampDelegate/equanda-table
-.label.en TestTimestampDelegate
-.key field.ExtractionOfValue.TestDate/equanda-table
-.label.en TestDate
-.key field.ExtractionOfValue.TestInt/equanda-table
-.label.en TestInt
-.key field.ExtractionOfValue.TestStr/equanda-table
-.label.en TestStr
-.key field.FootballPlayer.Defender/equanda-table
-.label.en Defender
-.key field.FootballPlayer.Goalkeeper/equanda-table
-.label.en Goalkeeper
-.key field.FootballPlayer.Midfielder/equanda-table
-.label.en Midfielder
-.key field.FootballPlayer.Name/equanda-table
-.label.en Name
-.key field.FootballPlayer.Striker/equanda-table
-.label.en Striker
-.key field.GetSetUsingValue.TestDate/equanda-table
-.label.en TestDate
-.key field.GetSetUsingValue.TestInt/equanda-table
-.label.en TestInt
-.key field.GetSetUsingValue.TestStr/equanda-table
-.label.en TestStr
-.key field.HideIf.FieldHide/equanda-table
-.label.en FieldHide
-.key field.HideIf.FieldHideIf/equanda-table
-.label.en FieldHideIf
-.key field.HideIf.FieldShow/equanda-table
-.label.en FieldShow
-.key field.HideIf.UselessField1/equanda-table
-.label.en UselessField1
-.key field.HideIf.UselessField2/equanda-table
-.label.en UselessField2
-.key field.HideIf.UselessField3/equanda-table
-.label.en UselessField3
-.key field.ImmutableIfGlobal.ChildLock/equanda-table
-.label.en ChildLock
-.key field.ImmutableIfGlobal.Free/equanda-table
-.label.en Free
-.key field.ImmutableIfGlobal.Free2/equanda-table
-.label.en Free2
-.key field.ImmutableIfGlobal.FreeChild/equanda-table
-.label.en FreeChild
-.key field.ImmutableIfGlobal.Locked/equanda-table
-.label.en Locked
-.key field.ImmutableIfGlobal.Locked2/equanda-table
-.label.en Locked2
-.key field.ImmutableIfGlobal.Locked3/equanda-table
-.label.en Locked3
-.key field.ImmutableIfGlobal.Locked4/equanda-table
-.label.en Locked4
-.key field.ImmutableIfGlobal.Name/equanda-table
-.label.en Name
-.key field.ImmutableIfGlobal.Name2/equanda-table
-.label.en Name2
-.key field.ImmutableIfGlobal.Release/equanda-table
-.label.en Release
-.key field.ImmutableIfGlobal.Released/equanda-table
-.label.en Released
-.key field.InternalFields.Extra/equanda-table
-.label.en Extra
-.key field.InternalFields.InternalBool/equanda-table
-.label.en InternalBool
-.key field.LazyInst.AnotherOwner/equanda-table
-.label.en AnotherOwner
-.key field.LazyInst.Owner/equanda-table
-.label.en Owner
-.key field.LazyInst.TestInt/equanda-table
-.label.en TestInt
-.key field.Linkable.MultipleRemove/equanda-table
-.label.en MultipleRemove
-.key field.Linkable.MultipleRemove3/equanda-table
-.label.en MultipleRemove3
-.key field.Linkable.MultipleRemove4/equanda-table
-.label.en MultipleRemove4
-.key field.Linkable.Name/equanda-table
-.label.en Name
-.key field.Linkable.OtherSideCallFacade/equanda-table
-.label.en OtherSideCallFacade
-.key field.Linkable.OtherSideCallFacadeMultiple/equanda-table
-.label.en OtherSideCallFacadeMultiple
-.key field.Linkable.Passport/equanda-table
-.label.en Passport
-.key field.Linkable.SingleBiOverride/equanda-table
-.label.en SingleBiOverride
-.key field.Linkable.SingleBidirectional/equanda-table
-.label.en SingleBidirectional
-.key field.Linkable.SingleKeep/equanda-table
-.label.en SingleKeep
-.key field.Linkable.SingleRemove2/equanda-table
-.label.en SingleRemove2
-.key field.Owner.Cars/equanda-table
-.label.en Cars
-.key field.Owner.CarsWichHeLikes/equanda-table
-.label.en CarsWichHeLikes
-.key field.Owner.DreamCar/equanda-table
-.label.en DreamCar
-.key field.Owner.GarageCars/equanda-table
-.label.en GarageCars
-.key field.Owner.GarageCount/equanda-table
-.label.en GarageCount
-.key field.Owner.GarageM2/equanda-table
-.label.en GarageM2
-.key field.Owner.LazyInstEmbedded/equanda-table
-.label.en LazyInstEmbedded
-.key field.Owner.LazyInstEmbeddedBi/equanda-table
-.label.en LazyInstEmbeddedBi
-.key field.Owner.LazyInstEmbeddedMul/equanda-table
-.label.en LazyInstEmbeddedMul
-.key field.Owner.LazyInstEmbeddedMulBi/equanda-table
-.label.en LazyInstEmbeddedMulBi
-.key field.Owner.LicencePlate/equanda-table
-.label.en LicencePlate
-.key field.Owner.Name/equanda-table
-.label.en Name
-.key field.Owner.Passport/equanda-table
-.label.en Passport
-.key field.Owner.PreferedCar/equanda-table
-.label.en PreferedCar
-.key field.Passport.Identifier/equanda-table
-.label.en Identifier
-.key field.Passport.Owner/equanda-table
-.label.en Owner
-.key field.Priority.Field1/equanda-table
-.label.en Field1
-.key field.Priority.Field2/equanda-table
-.label.en Field2
-.key field.Priority.Field3/equanda-table
-.label.en Field3
-.key field.Priority.Field4/equanda-table
-.label.en Field4
-.key field.Priority.Identifier/equanda-table
-.label.en Identifier
-.key field.PriorityFields.Field0/equanda-table
-.label.en Field0
-.key field.PriorityFields.Field1/equanda-table
-.label.en Field1
-.key field.PriorityFields.Field2/equanda-table
-.label.en Field2
-.key field.PriorityFields.Field3/equanda-table
-.label.en Field3
-.key field.PriorityFields.Field4/equanda-table
-.label.en Field4
-.key field.PriorityFields.Field5/equanda-table
-.label.en Field5
-.key field.PriorityFields.Field6/equanda-table
-.label.en Field6
-.key field.PriorityFields.Field7/equanda-table
-.label.en Field7
-.key field.PriorityFields.Field8/equanda-table
-.label.en Field8
-.key field.PriorityFields.Field9/equanda-table
-.label.en Field9
-.key field.PriorityFields.Test/equanda-table
-.label.en Test
-.key field.ProgrConstraints.MultipleOf100/equanda-table
-.label.en MultipleOf100
-.key field.Remove.Field1LinkCascadeDelete/equanda-table
-.label.en Field1LinkCascadeDelete
-.key field.Remove.Field2BiLinkCascadeDelete/equanda-table
-.label.en Field2BiLinkCascadeDelete
-.key field.Remove.Field3BiLinkCascadeKeep/equanda-table
-.label.en Field3BiLinkCascadeKeep
-.key field.Remove.Field4BiMultipleLinkCascadeKeep/equanda-table
-.label.en Field4BiMultipleLinkCascadeKeep
-.key field.Remove.Field5LinkCascadeKeep/equanda-table
-.label.en Field5LinkCascadeKeep
-.key field.Remove.Field6MultipleLinkCascadeKeep/equanda-table
-.label.en Field6MultipleLinkCascadeKeep
-.key field.Remove.Field7MultipleLinkCascadeRemove/equanda-table
-.label.en Field7MultipleLinkCascadeRemove
-.key field.Remove.Field8BiMultipleLinkCascadeRemove/equanda-table
-.label.en Field8BiMultipleLinkCascadeRemove
-.key field.Remove.TestInt/equanda-table
-.label.en TestInt
-.key field.Remove2.CallLinkableFacade/equanda-table
-.label.en CallLinkableFacade
-.key field.Remove2.CallLinkableFacade2/equanda-table
-.label.en CallLinkableFacade2
-.key field.Remove2.Field1Bidirectional/equanda-table
-.label.en Field1Bidirectional
-.key field.Remove2.Field2Override/equanda-table
-.label.en Field2Override
-.key field.Remove2.TheString/equanda-table
-.label.en TheString
-.key field.RequiredFields.RequiredDate/equanda-table
-.label.en RequiredDate
-.key field.RequiredFields.RequiredLink/equanda-table
-.label.en RequiredLink
-.key field.RequiredFields.RequiredMulDate/equanda-table
-.label.en RequiredMulDate
-.key field.RequiredFields.RequiredMulLink/equanda-table
-.label.en RequiredMulLink
-.key field.RequiredFields.RequiredMulString/equanda-table
-.label.en RequiredMulString
-.key field.RequiredFields.RequiredMulTime/equanda-table
-.label.en RequiredMulTime
-.key field.RequiredFields.RequiredString/equanda-table
-.label.en RequiredString
-.key field.RequiredFields.RequiredTime/equanda-table
-.label.en RequiredTime
-.key field.Secur.TestIntAdmin/equanda-table
-.label.en TestIntAdmin
-.key field.Secur.TestIntImmutableLocalUser/equanda-table
-.label.en TestIntImmutableLocalUser
-.key field.Secur.TestIntLocalUser/equanda-table
-.label.en TestIntLocalUser
-.key field.Secur.TestIntNobody/equanda-table
-.label.en TestIntNobody
-.key field.Secur.TestStringUnchecked/equanda-table
-.label.en TestStringUnchecked
-.key field.SelectorUpdate.MultipleLinks/equanda-table
-.label.en MultipleLinks
-.key field.SelectorUpdate.MultipleStr/equanda-table
-.label.en MultipleStr
-.key field.SelectorUpdate.SingleLink/equanda-table
-.label.en SingleLink
-.key field.SelectorUpdate.SingleStr/equanda-table
-.label.en SingleStr
-.key field.StringMaxLen.StrMax10Chars/equanda-table
-.label.en StrMax10Chars
-.key field.StringMaxLen.StrMax10CharsImmutable/equanda-table
-.label.en StrMax10CharsImmutable
-.key field.StringMaxLen.StrMax10CharsMultiple/equanda-table
-.label.en StrMax10CharsMultiple
-.key field.SubSelect.AnimalType/equanda-table
-.label.en AnimalType
-.key field.SubSelect.Article/equanda-table
-.label.en Article
-.key field.SubSelect.ArticleGroup/equanda-table
-.label.en ArticleGroup
-.key field.SubSelect.Data/equanda-table
-.label.en Data
-.key field.SubSelect.Reference/equanda-table
-.label.en Reference
-.key field.EquandaAlert.AlertType/equanda-table
-.label.en AlertType
-.key field.EquandaAlert.Cause/equanda-table
-.label.en Cause
-.key field.EquandaAlert.FileData/equanda-table
-.label.en FileData
-.key field.EquandaAlert.Message/equanda-table
-.label.en Message
-.key field.EquandaAlert.MoreInfo/equanda-table
-.label.en MoreInfo
-.key field.EquandaAlert.Status/equanda-table
-.label.en Status
-.key field.EquandaAlert.Time/equanda-table
-.label.en Time
-.key field.EquandaAttachment.Data/equanda-table
-.label.en Data
-.key field.EquandaAttachment.Date/equanda-table
-.label.en Date
-.key field.EquandaAttachment.MimeType/equanda-table
-.label.en MimeType
-.key field.EquandaAttachment.Name/equanda-table
-.label.en Name
-.key field.EquandaAttachment.Size/equanda-table
-.label.en Size
-.key field.EquandaNavigation.NavigationEntry/equanda-table
-.label.en NavigationEntry
-.key field.EquandaRight.EditAccess/equanda-table
-.label.en EditAccess
-.key field.EquandaRight.Identifier/equanda-table
-.label.en Identifier
-.key field.EquandaRight.Percentage/equanda-table
-.label.en Percentage
-.key field.EquandaRight.Preference/equanda-table
-.label.en Preference
-.key field.EquandaRight.RunAccess/equanda-table
-.label.en RunAccess
-.key field.EquandaRight.TablePreference/equanda-table
-.label.en TablePreference
-.key field.EquandaRight.Width/equanda-table
-.label.en Width
-.key field.EquandaRole.Administrator/equanda-table
-.label.en Administrator
-.key field.EquandaRole.AppserverRole/equanda-table
-.label.en AppserverRole
-.key field.EquandaRole.Description/equanda-table
-.label.en Description
-.key field.EquandaRole.GuiAccessProhibited/equanda-table
-.label.en GuiAccessProhibited
-.key field.EquandaRole.Rights/equanda-table
-.label.en Rights
-.key field.EquandaRole.RoleName/equanda-table
-.label.en RoleName
-.key field.EquandaUser.FieldsPreferences/equanda-table
-.label.en FieldsPreferences
-.key field.EquandaUser.FirstName/equanda-table
-.label.en FirstName
-.key field.EquandaUser.Language/equanda-table
-.label.en Language
-.key field.EquandaUser.LastName/equanda-table
-.label.en LastName
-.key field.EquandaUser.ListPreferences/equanda-table
-.label.en ListPreferences
-.key field.EquandaUser.Password/equanda-table
-.label.en Password
-.key field.EquandaUser.ReportPreferences/equanda-table
-.label.en ReportPreferences
-.key field.EquandaUser.Roles/equanda-table
-.label.en Roles
-.key field.EquandaUser.StartPage/equanda-table
-.label.en StartPage
-.key field.EquandaUser.TablesPreferences/equanda-table
-.label.en TablesPreferences
-.key field.EquandaUser.UserName/equanda-table
-.label.en UserName
-.key field.UniqueFields.UniqueAutoInt/equanda-table
-.label.en UniqueAutoInt
-.key field.UniqueFields.UniqueImmutableInt/equanda-table
-.label.en UniqueImmutableInt
-.key field.UniqueFields.UniqueInt/equanda-table
-.label.en UniqueInt
-.key field.ValueInclude.Car/equanda-table
-.label.en Car
-.key field.ValueInclude.ExcludedMultiple/equanda-table
-.label.en ExcludedMultiple
-.key field.ValueInclude.ExcludedString/equanda-table
-.label.en ExcludedString
-.key field.ValueInclude.ManyCars/equanda-table
-.label.en ManyCars
-.key field.Vehicle.ColourCode/equanda-table
-.label.en ColourCode
-.key field.Vehicle.Name/equanda-table
-.label.en Name
-.key field.Vehicle.Radius/equanda-table
-.label.en Radius
-.key field.Vehicle.SpanWidth/equanda-table
-.label.en SpanWidth
-.key field.Vehicle.Speed/equanda-table
-.label.en Speed
-.key field.Vehicle.WheelCount/equanda-table
-.label.en WheelCount
-.key field.VeryDocumented.Group1TestDate/equanda-table
-.label.en Group1TestDate
-.key field.VeryDocumented.Group1TestInt/equanda-table
-.label.en Group1TestInt
-.key field.VeryDocumented.Group1TestStr/equanda-table
-.label.en Group1TestStr
-.key field.VeryDocumented.Group2TestDate/equanda-table
-.label.en Group2TestDate
-.key field.VeryDocumented.IndependentField/equanda-table
-.label.en IndependentField
-.key field.VeryDocumented.MulLnk/equanda-table
-.label.en MulLnk
-.key field.VeryDocumented.MulStr/equanda-table
-.label.en MulStr
-.key field.VeryDocumented.SingleLink/equanda-table
-.label.en SingleLink
-.key group.HideIf.GroupHide/equanda-table
-.label.en GroupHide
-.key group.HideIf.GroupHideIf/equanda-table
-.label.en GroupHideIf
-.key group.HideIf.GroupShow/equanda-table
-.label.en GroupShow
-.key group.VeryDocumented.Group1/equanda-table
-.label.en Group1
-.key group.VeryDocumented.Group2/equanda-table
-.label.en Group2
-.key jasper3.label1/MessagesReport
-.label.en First
-.label.nl Eerste
-.key jasper3.label2/MessagesReport
-.label.en Second
-.label.nl Tweede
-.key jasper3.name.prefix/MessagesReport
-.label.en Name:
-.label.nl Naam:
-.key jasper3.name.suffix/MessagesReport
-.label.en :
-.label.nl :
-.key menu.alerts/equanda-skin
-.label.en Alerts
-.label.ro Alerte
-.key menu.gui/equanda-skin
-.label.en GUI
-.label.ro GUI
-.key menu.import/equanda-skin
-.label.en Import
-.label.ro Import
-.key menu.reports/equanda-skin
-.label.en Reports
-.label.ro Rapoarte
-.key menu.testApplet/equanda-skin
-.label.en Test applet
-.label.ro Test applet
-.key menu.testFilters/equanda-skin
-.label.en Test filters
-.key menu.useradmin/equanda-skin
-.label.en User admin
-.label.ro Administrator
-.key page.Action.default/equanda-table
-.label.en default
-.key page.AutoFields.default/equanda-table
-.label.en default
-.key page.BuilderSet.default/equanda-table
-.label.en default
-.key page.CalculatedFields.default/equanda-table
-.label.en default
-.key page.Car.default/equanda-table
-.label.en default
-.key page.Choices.default/equanda-table
-.label.en default
-.key page.Cloneable.default/equanda-table
-.label.en default
-.key page.CocoonMan.default/equanda-table
-.label.en default
-.key page.Compare.default/equanda-table
-.label.en default
-.key page.Default.default/equanda-table
-.label.en default
-.key page.Delegate.default/equanda-table
-.label.en default
-.key page.ExtractionOfValue.default/equanda-table
-.label.en default
-.key page.FootballPlayer.default/equanda-table
-.label.en default
-.key page.GetSetUsingValue.default/equanda-table
-.label.en default
-.key page.HideIf.PageHide/equanda-table
-.label.en PageHide
-.key page.HideIf.PageHideIf/equanda-table
-.label.en PageHideIf
-.key page.HideIf.PageShow/equanda-table
-.label.en PageShow
-.key page.ImmutableIfGlobal.default/equanda-table
-.label.en default
-.key page.InternalFields.default/equanda-table
-.label.en default
-.key page.LazyInst.default/equanda-table
-.label.en default
-.key page.Linkable.default/equanda-table
-.label.en default
-.key page.Owner.default/equanda-table
-.label.en default
-.key page.Passport.default/equanda-table
-.label.en default
-.key page.Priority.default/equanda-table
-.label.en default
-.key page.PriorityFields.default/equanda-table
-.label.en default
-.key page.ProgrConstraints.default/equanda-table
-.label.en default
-.key page.Remove.default/equanda-table
-.label.en default
-.key page.Remove2.default/equanda-table
-.label.en default
-.key page.RequiredFields.default/equanda-table
-.label.en default
-.key page.Secur.default/equanda-table
-.label.en default
-.key page.SelectorUpdate.default/equanda-table
-.label.en default
-.key page.StringMaxLen.default/equanda-table
-.label.en default
-.key page.SubSelect.default/equanda-table
-.label.en default
-.key page.EquandaAlert.default/equanda-table
-.label.en default
-.key page.EquandaAttachment.default/equanda-table
-.label.en default
-.key page.EquandaNavigation.default/equanda-table
-.label.en default
-.key page.EquandaRight.default/equanda-table
-.label.en default
-.key page.EquandaRole.default/equanda-table
-.label.en default
-.key page.EquandaUser.ALL/equanda-table
-.label.en ALL
-.key page.EquandaUser.default/equanda-table
-.label.en default
-.key page.UniqueFields.default/equanda-table
-.label.en default
-.key page.ValueInclude.default/equanda-table
-.label.en default
-.key page.Vehicle.default/equanda-table
-.label.en default
-.key page.VeryDocumented.default/equanda-table
-.label.en default
-.key param.Action.addAction.param0/equanda-table
-.label.en param0
-.key param.Action.failingAction.param0/equanda-table
-.label.en param0
-.key param.Action.failingAction.param1/equanda-table
-.label.en param1
-.key param.Action.hashCode.Phrase/equanda-table
-.label.en Phrase
-.key param.Action.suggestFieldAction.Date of birth/equanda-table
-.label.en Date of birth
-.key param.Action.suggestFieldAction.Name/equanda-table
-.label.en Name
-.key param.Action.suggestFieldAction.Sometime/equanda-table
-.label.en Sometime
-.key param.Action.suggestFieldAction.Status/equanda-table
-.label.en Status
-.key param.Action.suggestFieldAction.age/equanda-table
-.label.en age
-.key param.Action.suggestFieldAction.height/equanda-table
-.label.en height
-.key param.Action.suggestPathAction.Name/equanda-table
-.label.en Name
-.key param.Action.suggestTableAction.Name/equanda-table
-.label.en Name
-.key param.Action.suggestValueAction.Date of birth/equanda-table
-.label.en Date of birth
-.key param.Action.suggestValueAction.Name/equanda-table
-.label.en Name
-.key param.Action.suggestValueAction.Sometime/equanda-table
-.label.en Sometime
-.key param.Action.suggestValueAction.Status/equanda-table
-.label.en Status
-.key param.Action.suggestValueAction.age/equanda-table
-.label.en age
-.key param.Action.suggestValueAction.height/equanda-table
-.label.en height
-.key param.Action.suggestValueListAction.Date of birth/equanda-table
-.label.en Date of birth
-.key param.Action.suggestValueListAction.Name/equanda-table
-.label.en Name
-.key param.Action.suggestValueListAction.Sometime/equanda-table
-.label.en Sometime
-.key param.Action.suggestValueListAction.Status/equanda-table
-.label.en Status
-.key param.Action.suggestValueListAction.age/equanda-table
-.label.en age
-.key param.Action.suggestValueListAction.height/equanda-table
-.label.en height
-.key param.Action.voidAction.param0/equanda-table
-.label.en param0
-.key param.Action.voidAction.param1/equanda-table
-.label.en param1
-.key param.Secur.testProc1.param0/equanda-table
-.label.en param0
-.key param.Secur.testProc2.param0/equanda-table
-.label.en param0
-.key param.EquandaRole.mergeRestrictions.mergeName/equanda-table
-.label.en mergeName
-.key param.EquandaRole.mergeRestrictions.resultName/equanda-table
-.label.en resultName
-.key param.EquandaRole.mergeRights.mergeName/equanda-table
-.label.en mergeName
-.key param.EquandaRole.mergeRights.resultName/equanda-table
-.label.en resultName
-.key param.VeryDocumented.hashCode.param0/equanda-table
-.label.en param0
-.key param.VeryDocumented.hashCode2.param0/equanda-table
-.label.en param0
-.key param.VeryDocumented.hashCode2.param1/equanda-table
-.label.en param1
-.key parameter.Action.ByDate.TheDate/equanda-table
-.label.en TheDate
-.key parameter.Action.SingleInt.TheInt/equanda-table
-.label.en TheInt
-.key parameter.AutoFields.AutoInt.AutoInt/equanda-table
-.label.en AutoInt
-.key parameter.CalculatedFields.Extra.Extra/equanda-table
-.label.en Extra
-.key parameter.Car.Brand.Brand/equanda-table
-.label.en Brand
-.key parameter.Car.CarBothExtra.Extra/equanda-table
-.label.en Extra
-.key parameter.Car.CarBothExtra.ExtraUnique/equanda-table
-.label.en ExtraUnique
-.key parameter.Car.Extra.Extra/equanda-table
-.label.en Extra
-.key parameter.Car.EquandaBrandStart.Brand/equanda-table
-.label.en Brand
-.key parameter.Car.EquandaExtraUniquePart.ExtraUnique/equanda-table
-.label.en ExtraUnique
-.key parameter.Car.EquandaExtraUniqueStart.ExtraUnique/equanda-table
-.label.en ExtraUnique
-.key parameter.Car.EquandaFindBrand.Brand/equanda-table
-.label.en Brand
-.key parameter.CocoonMan.PersonByBirthdate.DateOfBirth/equanda-table
-.label.en DateOfBirth
-.key parameter.CocoonMan.PersonByHeight.Height/equanda-table
-.label.en Height
-.key parameter.CocoonMan.PersonByLastName.LastName/equanda-table
-.label.en LastName
-.key parameter.CocoonMan.PersonByName.FirstName/equanda-table
-.label.en FirstName
-.key parameter.CocoonMan.PersonByName.LastName/equanda-table
-.label.en LastName
-.key parameter.CocoonMan.PersonByStatus.Employed/equanda-table
-.label.en Employed
-.key parameter.CocoonMan.PersonByTimestamp.Sometime/equanda-table
-.label.en Sometime
-.key parameter.CocoonMan.SelectWithLimit.Employed/equanda-table
-.label.en Employed
-.key parameter.CocoonMan.SelectionsWithSuggests.DateOfBirth/equanda-table
-.label.en DateOfBirth
-.key parameter.CocoonMan.SelectionsWithSuggests.Employed/equanda-table
-.label.en Employed
-.key parameter.CocoonMan.SelectionsWithSuggests.FirstName/equanda-table
-.label.en FirstName
-.key parameter.CocoonMan.SelectionsWithSuggests.Height/equanda-table
-.label.en Height
-.key parameter.CocoonMan.SelectionsWithSuggests.LastName/equanda-table
-.label.en LastName
-.key parameter.CocoonMan.SelectionsWithSuggests.NoOfChildren/equanda-table
-.label.en NoOfChildren
-.key parameter.CocoonMan.SelectionsWithSuggests.Sometime/equanda-table
-.label.en Sometime
-.key parameter.CocoonMan.SelectionsWithValueListSuggests.DateOfBirth/equanda-table
-.label.en DateOfBirth
-.key parameter.CocoonMan.SelectionsWithValueListSuggests.Employed/equanda-table
-.label.en Employed
-.key parameter.CocoonMan.SelectionsWithValueListSuggests.FirstName/equanda-table
-.label.en FirstName
-.key parameter.CocoonMan.SelectionsWithValueListSuggests.Height/equanda-table
-.label.en Height
-.key parameter.CocoonMan.SelectionsWithValueListSuggests.LastName/equanda-table
-.label.en LastName
-.key parameter.CocoonMan.SelectionsWithValueListSuggests.NoOfChildren/equanda-table
-.label.en NoOfChildren
-.key parameter.CocoonMan.SelectionsWithValueListSuggests.Sometime/equanda-table
-.label.en Sometime
-.key parameter.Delegate.EquandaNamePart.Name/equanda-table
-.label.en Name
-.key parameter.Delegate.EquandaNameStart.Name/equanda-table
-.label.en Name
-.key parameter.FootballPlayer.EquandaNamePart.Name/equanda-table
-.label.en Name
-.key parameter.FootballPlayer.EquandaNameStart.Name/equanda-table
-.label.en Name
-.key parameter.ImmutableIfGlobal.EquandaNamePart.Name/equanda-table
-.label.en Name
-.key parameter.ImmutableIfGlobal.EquandaNameStart.Name/equanda-table
-.label.en Name
-.key parameter.InternalFields.Extra.Extra/equanda-table
-.label.en Extra
-.key parameter.LazyInst.TestInt.TestInt/equanda-table
-.label.en TestInt
-.key parameter.Linkable.Name.Name/equanda-table
-.label.en Name
-.key parameter.Linkable.EquandaNamePart.Name/equanda-table
-.label.en Name
-.key parameter.Linkable.EquandaNameStart.Name/equanda-table
-.label.en Name
-.key parameter.Owner.MorePreferedCar.Brand/equanda-table
-.label.en Brand
-.key parameter.Owner.MorePreferedCar.Name/equanda-table
-.label.en Name
-.key parameter.Owner.Name.Name/equanda-table
-.label.en Name
-.key parameter.Owner.SinglePreferedCar.Brand/equanda-table
-.label.en Brand
-.key parameter.Owner.EquandaNamePart.Name/equanda-table
-.label.en Name
-.key parameter.Owner.EquandaNameStart.Name/equanda-table
-.label.en Name
-.key parameter.Passport.Identifier.Identifier/equanda-table
-.label.en Identifier
-.key parameter.Remove.TestInt.TestInt/equanda-table
-.label.en TestInt
-.key parameter.Remove2.ByString.TheString/equanda-table
-.label.en TheString
-.key parameter.Secur.TestIntAdmin.TestIntAdmin/equanda-table
-.label.en TestIntAdmin
-.key parameter.Secur.TestIntLocalUser.TestIntLocalUser/equanda-table
-.label.en TestIntLocalUser
-.key parameter.Secur.TestStringUnchecked.TestStringUnchecked/equanda-table
-.label.en TestStringUnchecked
-.key parameter.StringMaxLen.StrMax10CharsImmutable.StrMax10CharsImmutable/equanda-table
-.label.en StrMax10CharsImmutable
-.key parameter.SubSelect.MultipleSelectAdd.AnimalType/equanda-table
-.label.en AnimalType
-.key parameter.SubSelect.MultipleSelectAdd.Article/equanda-table
-.label.en Article
-.key parameter.SubSelect.MultipleSelectAdd.ArticleGroup/equanda-table
-.label.en ArticleGroup
-.key parameter.SubSelect.MultipleSelectAdd.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.MultipleSelectTry.AnimalType/equanda-table
-.label.en AnimalType
-.key parameter.SubSelect.MultipleSelectTry.Article/equanda-table
-.label.en Article
-.key parameter.SubSelect.MultipleSelectTry.ArticleGroup/equanda-table
-.label.en ArticleGroup
-.key parameter.SubSelect.MultipleSelectTry.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.SelectAddWithLimitAndOrder.Data/equanda-table
-.label.en Data
-.key parameter.SubSelect.SelectAddWithLimitAndOrder.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.SelectTestNotNullAnd.AnimalType/equanda-table
-.label.en AnimalType
-.key parameter.SubSelect.SelectTestNotNullAnd.Article/equanda-table
-.label.en Article
-.key parameter.SubSelect.SelectTestNotNullAnd.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.SelectTestNotNullTry.Article/equanda-table
-.label.en Article
-.key parameter.SubSelect.SelectTestNotNullTry.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.SelectTestNullAnd.AnimalType/equanda-table
-.label.en AnimalType
-.key parameter.SubSelect.SelectTestNullAnd.Article/equanda-table
-.label.en Article
-.key parameter.SubSelect.SelectTestNullAnd.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.SelectTestNullTry.Article/equanda-table
-.label.en Article
-.key parameter.SubSelect.SelectTestNullTry.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.SingleSelectTry.AnimalType/equanda-table
-.label.en AnimalType
-.key parameter.SubSelect.SingleSelectTry.Article/equanda-table
-.label.en Article
-.key parameter.SubSelect.SingleSelectTry.ArticleGroup/equanda-table
-.label.en ArticleGroup
-.key parameter.SubSelect.SingleSelectTry.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.EquandaFindReference.Reference/equanda-table
-.label.en Reference
-.key parameter.SubSelect.EquandaReferenceStart.Reference/equanda-table
-.label.en Reference
-.key parameter.EquandaAlert.AlertType.AlertType/equanda-table
-.label.en AlertType
-.key parameter.EquandaAlert.Cause.Cause/equanda-table
-.label.en Cause
-.key parameter.EquandaAlert.Time.After/equanda-table
-.label.en After
-.key parameter.EquandaAlert.Time.Before/equanda-table
-.label.en Before
-.key parameter.EquandaAttachment.EquandaNamePart.Name/equanda-table
-.label.en Name
-.key parameter.EquandaAttachment.EquandaNameStart.Name/equanda-table
-.label.en Name
-.key parameter.EquandaRight.Identifier.Identifier/equanda-table
-.label.en Identifier
-.key parameter.EquandaRole.Role.RoleName/equanda-table
-.label.en RoleName
-.key parameter.EquandaRole.EquandaDescriptionPart.Description/equanda-table
-.label.en Description
-.key parameter.EquandaRole.EquandaDescriptionStart.Description/equanda-table
-.label.en Description
-.key parameter.EquandaUser.FullName.FirstName/equanda-table
-.label.en FirstName
-.key parameter.EquandaUser.FullName.LastName/equanda-table
-.label.en LastName
-.key parameter.EquandaUser.UserName.UserName/equanda-table
-.label.en UserName
-.key parameter.EquandaUser.UserPassword.Password/equanda-table
-.label.en Password
-.key parameter.EquandaUser.UserPassword.UserName/equanda-table
-.label.en UserName
-.key parameter.UniqueFields.Immutable.UniqueImmutableInt/equanda-table
-.label.en UniqueImmutableInt
-.key parameter.Vehicle.ColourCode.ColourCode/equanda-table
-.label.en ColourCode
-.key parameter.Vehicle.ColourSingle.ColourCode/equanda-table
-.label.en ColourCode
-.key parameter.Vehicle.Colour_AscendingName.ColourCode/equanda-table
-.label.en ColourCode
-.key parameter.Vehicle.Colour_DescendingName.ColourCode/equanda-table
-.label.en ColourCode
-.key parameter.Vehicle.MultiOrder.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.MultiOrderDesc.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.Name.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.NameStartingWith.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.Noname.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.Speed.Speed/equanda-table
-.label.en Speed
-.key parameter.Vehicle.TestNotParameter.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.TestNotParameterSingle.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.EquandaNamePart.Name/equanda-table
-.label.en Name
-.key parameter.Vehicle.EquandaNameStart.Name/equanda-table
-.label.en Name
-.key parameter.VeryDocumented.ByGroup1TestInt.Group1TestInt/equanda-table
-.label.en Group1TestInt
-.key parameter.VeryDocumented.ByIndependentField.IndependentField/equanda-table
-.label.en IndependentField
-.key report1.i18n.label.for.the.parameter1/ReportList
-.label.en NR OF CHILDREN
-.label.nl NR OF CHILDREN
-.key report1.i18n.label.for.the.parameter2/ReportList
-.label.en MINIMUM HEIGHT
-.label.nl MINIMUM HEIGHT
-.key report10.i18n.label.for.the.parameter1/ReportList
-.label.en HEIGHT
-.label.nl HEIGHT
-.key report2.i18n.label.for.the.parameter1/ReportList
-.label.en MAXIMUM INT
-.label.nl MAXIMUM INT
-.key report4.i18n.label.for.the.parameter1/ReportList
-.label.en NR OF CHILDREN
-.label.nl NR OF CHILDREN
-.key report4.i18n.label.for.the.parameter2/ReportList
-.label.en MINIMUM HEIGHT
-.label.nl MINIMUM HEIGHT
-.key report4.i18n.label.for.the.parameter3/ReportList
-.label.en IS EMPLOYED
-.label.nl IS EMPLOYED
-.key report4.i18n.label.for.the.parameter4/ReportList
-.label.en FIRST NAME
-.label.nl FIRST NAME
-.key report4.i18n.label.for.the.parameter5/ReportList
-.label.en DATE OF BIRTH
-.label.nl DATE OF BIRTH
-.key report4.i18n.label.for.the.parameter6/ReportList
-.label.en SOME TIME
-.label.nl SOME TIME
-.key select.Action.ByDate/equanda-table
-.label.en ByDate
-.key select.Action.Everything/equanda-table
-.label.en Everything
-.key select.Action.SingleInt/equanda-table
-.label.en SingleInt
-.key select.Action.EquandaAll/equanda-table
-.label.en equandaAll
-.key select.AutoFields.AutoInt/equanda-table
-.label.en AutoInt
-.key select.AutoFields.EquandaAll/equanda-table
-.label.en equandaAll
-.key select.BuilderSet.EquandaAll/equanda-tab...
[truncated message content] |
|
From: <tri...@us...> - 2007-08-28 10:53:40
|
Revision: 53
http://equanda.svn.sourceforge.net/equanda/?rev=53&view=rev
Author: triathlon98
Date: 2007-08-28 03:53:36 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build (partial)
Modified Paths:
--------------
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-t4-ear/pom.xml
trunk/equanda-test/test-t4-gui/pom.xml
trunk/equanda-tool/translationsEditor.ini
trunk/src/site/wiki/ImportServlet.wiki
Added Paths:
-----------
trunk/equanda-test/src/main/om/om.ini
trunk/equanda-test/src/main/om/om.xml
trunk/equanda-test/test-core/src/main/java/org/
trunk/equanda-test/test-core/src/main/java/org/equanda/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ActionMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/AutoFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/DefaultMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/EquandaRoleMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/LinkableMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/PriorityFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ProgrConstraintsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/SecurMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/VehicleWithWingsMediator.java
trunk/equanda-test/test-gui-t4-test/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-test/test-test/src/test/java/org/
Removed Paths:
-------------
trunk/equanda-test/src/main/om/test.xml
trunk/equanda-test/test-test/src/test/java/be/
Added: trunk/equanda-test/src/main/om/om.ini
===================================================================
--- trunk/equanda-test/src/main/om/om.ini (rev 0)
+++ trunk/equanda-test/src/main/om/om.ini 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,39 @@
+[config]
+definition=om.xml
+generateAll=false
+
+[ejb3]
+package=org.equanda.test.om
+
+[ddltool]
+package=org.equanda.test.ddltool
+
+[import]
+package=org.equanda.test.ymport
+
+[login]
+package=org.equanda.test.login
+
+[extra]
+datasource=java:/equandaDS
+datasource-mapping=Firebird
+security-role=LocalUser,LocalAdmin
+security-role-embedded=LocalUser,LocalAdmin
+security-role-merge-model=LocalUser,LocalAdmin
+security-role-remove=LocalUser,LocalAdmin
+infrastructure=true
+lazylist-cache-capacity=100
+lazylist-cache-expiration=3000
+fetch-batch-size=100
+link-fetch-batch-size=100
+multiple-fetch-batch-size=100
+entity-manager-name=equanda-em
+skip-jalopy=true
+skip-xml-check=true
+security-domain=equanda
+ejb-package=org.equanda.test.om
+default-role=LocalUser
+
+[database,test]
+type=firebird
+convert=org.equanda.persistence.xml.Max31Convert
Copied: trunk/equanda-test/src/main/om/om.xml (from rev 50, trunk/equanda-test/src/main/om/test.xml)
===================================================================
--- trunk/equanda-test/src/main/om/om.xml (rev 0)
+++ trunk/equanda-test/src/main/om/om.xml 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE equanda SYSTEM "equanda.dtd">
+
+<equanda>
+ <database name="test">
+ <table dir="."/>
+ <!--
+ <table file="ImmutableIfGlobal.table"/>
+ <table file="ImmutableIfGlobalInherited.table"/>
+ <table file="Vehicle.table"/>
+ <table file="VehicleWithWings.table"/>
+ <table file="VehicleWithWheels.table"/>
+ <table file="Airplane.table"/>
+
+ <table file="Delegate.table"/>
+ <table file="Linkable.table"/>
+ <table file="StringMaxLen.table"/>
+ <table file="Compare.table"/>
+ <table file="Action.table"/>
+ <table file="ExtractionOfValue.table"/>
+ <table file="Default.table"/>
+ <table file="Cloneable.table"/>
+ <table file="GetSetUsingValue.table"/>
+ <table file="SelectorUpdate.table"/>
+ <table file="SLSBGetSet.table"/>
+ <table file="BuilderSet.table"/>
+ <table file="ProgrConstraints.table"/>
+ <table file="ProgrConstraintsInherited.table"/>
+ <table file="RequiredFields.table"/>
+ <table file="Choices.table"/>
+ <table file="Remove.table"/>
+ <table file="UniqueFields.table"/>
+ <table file="Secur.table"/>
+ <table file="Owner.table"/>
+ <table file="Car.table"/>
+ <table file="Passport.table"/>
+ <table file="LazyInst.table"/>
+ <table file="SubSelect.table"/>
+ <table file="CocoonMan.table"/>
+ <table file="CalculatedFields.table"/>
+ <table file="AutoFields.table"/>
+ <table file="VeryDocumented.table/>
+ -->
+ </database>
+
+ <user-interface>
+ <menu>
+ <menu-item>
+ <label name="menu.gui.label"> GUI </label>
+ <icon>/resources/images/gui.jpg</icon>
+ <menu-action window="/gui/"/>
+ </menu-item>
+
+ <menu-item>
+ <label name="menu.reports.label"> reports </label>
+ <icon>/resources/images/report.jpg</icon>
+ <menu-action window="/report/"/>
+ </menu-item>
+
+ <menu-item>
+ <label name="menu.import.label"> import </label>
+ <icon>/resources/images/import.jpg</icon>
+ <menu-action window="/import.html"/>
+ </menu-item>
+ </menu>
+ </user-interface>
+</equanda>
\ No newline at end of file
Deleted: trunk/equanda-test/src/main/om/test.xml
===================================================================
--- trunk/equanda-test/src/main/om/test.xml 2007-08-28 09:55:03 UTC (rev 52)
+++ trunk/equanda-test/src/main/om/test.xml 2007-08-28 10:53:36 UTC (rev 53)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE equanda SYSTEM "equanda.dtd">
-
-<equanda>
- <database name="test">
- <table dir="."/>
- <!--
- <table file="ImmutableIfGlobal.table"/>
- <table file="ImmutableIfGlobalInherited.table"/>
- <table file="Vehicle.table"/>
- <table file="VehicleWithWings.table"/>
- <table file="VehicleWithWheels.table"/>
- <table file="Airplane.table"/>
-
- <table file="Delegate.table"/>
- <table file="Linkable.table"/>
- <table file="StringMaxLen.table"/>
- <table file="Compare.table"/>
- <table file="Action.table"/>
- <table file="ExtractionOfValue.table"/>
- <table file="Default.table"/>
- <table file="Cloneable.table"/>
- <table file="GetSetUsingValue.table"/>
- <table file="SelectorUpdate.table"/>
- <table file="SLSBGetSet.table"/>
- <table file="BuilderSet.table"/>
- <table file="ProgrConstraints.table"/>
- <table file="ProgrConstraintsInherited.table"/>
- <table file="RequiredFields.table"/>
- <table file="Choices.table"/>
- <table file="Remove.table"/>
- <table file="UniqueFields.table"/>
- <table file="Secur.table"/>
- <table file="Owner.table"/>
- <table file="Car.table"/>
- <table file="Passport.table"/>
- <table file="LazyInst.table"/>
- <table file="SubSelect.table"/>
- <table file="CocoonMan.table"/>
- <table file="CalculatedFields.table"/>
- <table file="AutoFields.table"/>
- <table file="VeryDocumented.table/>
- -->
- </database>
-
- <user-interface>
- <menu>
- <menu-item>
- <label name="menu.gui.label"> GUI </label>
- <icon>/resources/images/gui.jpg</icon>
- <menu-action window="/gui/"/>
- </menu-item>
-
- <menu-item>
- <label name="menu.reports.label"> reports </label>
- <icon>/resources/images/report.jpg</icon>
- <menu-action window="/report/"/>
- </menu-item>
-
- <menu-item>
- <label name="menu.import.label"> import </label>
- <icon>/resources/images/import.jpg</icon>
- <menu-action window="/import.html"/>
- </menu-item>
- </menu>
- </user-interface>
-</equanda>
\ No newline at end of file
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ActionMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ActionMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ActionMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,77 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaPersistenceException;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+
+/**
+ * simple acton for test case
+ * mediator object to allow specific functionality depending on object equandaType
+ * this class is intended to be modified manually (not overwritten when created)
+ * only protected methods should be overwritten, class private methods should not be touched!
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class ActionMediator
+ extends ActionMediatorBase
+{
+
+ public int hashCode( String param )
+ throws EquandaPersistenceException
+ {
+ return param.hashCode();
+ }
+
+ public void addAction( int amount )
+ throws EquandaPersistenceException
+ {
+ setTheInt( getTheInt() + amount );
+ }
+
+ public void voidAction( String param1, int param2 )
+ throws EquandaPersistenceException
+ {
+ super.setTheString( param1 );
+ }
+
+ public void suggestValueAction( String param1, int param2, double param3, Date param4, Timestamp param5,
+ boolean param6 )
+ throws EquandaPersistenceException
+ {
+ try
+ {
+ for ( int i = 0 ; i < 10 ; i++ )
+ {
+ Thread.sleep( 1000 );
+ System.out.println( i );
+ }
+ }
+ catch ( Exception e )
+ {}
+ }
+}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/AutoFieldsMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/AutoFieldsMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/AutoFieldsMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,76 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaPersistenceException;
+import org.equanda.test.om.server.pm.DMPassportBean;
+import org.equanda.test.om.server.pm.DMAutoFields_MultipleAutoBean;
+import org.equanda.test.om.client.PassportConstants;
+import org.equanda.test.translation.TestExceptionCodes;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * mediator object to overwrite functions for auto fields
+ *
+ * @author NetRom team
+ */
+public class AutoFieldsMediator
+ extends AutoFieldsMediatorBase
+ implements TestExceptionCodes
+{
+ protected int autoAutoInt()
+ throws EquandaPersistenceException
+ {
+ return 0;
+ }
+
+ protected Collection autoMultipleAuto()
+ throws EquandaPersistenceException
+ {
+ ArrayList array = new ArrayList();
+
+ DMAutoFields_MultipleAutoBean obj = new DMAutoFields_MultipleAutoBean();
+ try
+ {
+ obj.setMultipleAuto( "test" );
+ }
+ catch ( Exception e )
+ {
+ throw new EquandaPersistenceException( EPE_PROBLEM_IN_AUTOMULTIPLEAUTO, e);
+ }
+ array.add( obj );
+ return array;
+ }
+
+ protected Collection autoMultiplePassport()
+ throws EquandaPersistenceException
+ {
+ ArrayList array = new ArrayList();
+ array.add( new DMPassportBean( PassportConstants.TYPE_Passport ) );
+ return array;
+ }
+}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/DefaultMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/DefaultMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/DefaultMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,48 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaPersistenceException;
+
+/**
+ * Overwritten function autoTestIntDefaultAuto, to return -1
+ * This is assumed in the testcase DefaultTest.
+ * The purpose is to test the functionality of default type=auto for fields
+ *
+ * mediator object to allow specific functionality depending on object equandaType
+ * this class is intended to be modified manually (not overwritten when created)
+ * only protected methods should be overwritten, class private methods should not be touched!
+ *
+ * @author NetRom team
+ */
+public class DefaultMediator
+ extends DefaultMediatorBase
+{
+ protected int autoTestIntDefaultAuto()
+ throws EquandaPersistenceException
+ {
+ return -1;
+ }
+}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/EquandaRoleMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/EquandaRoleMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/EquandaRoleMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,273 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaPersistenceException;
+import org.equanda.test.om.client.*;
+import org.equanda.test.translation.TestExceptionCodes;
+import org.equanda.validation.EditableRights;
+import org.equanda.validation.RunnableRights;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.ArrayList;
+
+
+/**
+ * Mediator for EquandaRole. Implementation for functions mergeRights & mergeRestrictions
+ *
+ * @author NetRom team
+ */
+public class EquandaRoleMediator
+ extends EquandaRoleMediatorBase
+ implements TestExceptionCodes
+{
+ private org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( getClass() );
+
+ public void mergeRestrictions( String mergeName, String resultName )
+ throws EquandaPersistenceException
+ {
+ mergeRoles( mergeName, resultName, true );
+ }
+
+ public void mergeRights( String mergeName, String resultName )
+ throws EquandaPersistenceException
+ {
+ mergeRoles( mergeName, resultName, false );
+ }
+
+ private void mixRights( Collection<EquandaRightProxy> col1, Collection<EquandaRightProxy> col2, Collection result, boolean restrict )
+ throws EquandaPersistenceException
+ {
+ Iterator it1 = col1.iterator();
+ while ( it1.hasNext() )
+ {
+ <EquandaRightProxy> right1 = (<EquandaRightProxy>) it1.next();
+ Iterator it2 = col2.iterator();
+ boolean found = false;
+ while ( it2.hasNext() )
+ {
+ equandaRig<EquandaRightProxy>htProxy right2 = (<EquandaRightProxy>) it2.next();
+
+ // for rights existing in both roles, mix them, depending on the value of restrict
+
+ if ( right1.getIdentifier().equals( right2.getIdentifier() ) )
+ {
+ if ( !right1.getEquandaType().equals( right2.getEquandaType() ) )
+ {
+ throw new EquandaPersistenceException( EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS );
+ }
+ if ( right1.getEquandaType().equals( "EDIT" ) )
+ {
+ if ( right1.getEditAccess().equals( right2.getEditAccess() ) )
+ {
+ result.add( copy( right1 ) );
+ break;
+ }
+ }
+ if ( right1.getEquandaType().equals( "RUNN" ) )
+ {
+ if ( right1.getRunAccess().equals( right2.getRunAccess() ) )
+ {
+ result.add( copy( right1 ) );
+ break;
+ }
+ }
+ if ( restrict )
+ {
+ if ( right1.getEquandaType().equals( "EDIT" ) )
+ {
+ if ( right1.getEditAccess().equals( EditableRights.NONE ) ||
+ right2.getEditAccess().equals( EditableRights.NONE ) )
+ {
+ result.add(
+ right1.getEditAccess().equals( EditableRights.NONE )
+ ? copy( right1 )
+ : copy( right2 ) );
+ found = true;
+ break;
+ }
+ if ( right1.getEditAccess().equals( EditableRights.VIEW ) ||
+ right2.getEditAccess().equals( EditableRights.VIEW ) )
+ {
+ result.add(
+ right1.getEditAccess().equals( EditableRights.VIEW )
+ ? copy( right1 )
+ : copy( right2 ) );
+ found = true;
+ break;
+ }
+ // EDITABLE_ACCESS_EDIT is not saved
+ found = true;
+ break;
+ }
+ if ( right1.getEquandaType().equals( "RUNN" ) )
+ {
+ if ( right1.getRunAccess().equals( RunnableRights.NONE ) ||
+ right2.getRunAccess().equals( RunnableRights.NONE ) )
+ {
+ result.add(
+ right1.getRunAccess().equals( RunnableRights.NONE ) ? copy( right1 ) : copy(
+ right2 ) );
+ found = true;
+ break;
+ }
+
+ // RunnableRights.RUN is not saved
+ found = true;
+ break;
+ }
+ }
+ else
+ {
+ if ( right1.getEquandaType().equals( "EDIT" ) )
+ {
+ if ( right1.getEditAccess().equals( EditableRights.EDIT ) ||
+ right2.getEditAccess().equals( EditableRights.EDIT ) )
+ {
+ found = true;
+ break;
+ }
+ if ( right1.getEditAccess().equals( EditableRights.VIEW ) ||
+ right1.getEditAccess().equals( EditableRights.VIEW ) )
+ {
+ result.add(
+ right1.getEditAccess().equals( EditableRights.VIEW )
+ ? copy( right1 )
+ : copy( right2 ) );
+ found = true;
+ break;
+ }
+ result.add( copy( right1 ) );
+ found = true;
+ break;
+ }
+ if ( right1.getEquandaType().equals( "RUNN" ) )
+ {
+ if ( right1.getRunAccess().equals( RunnableRights.RUN ) ||
+ right2.getRunAccess().equals( RunnableRights.RUN ) )
+ {
+ found = true;
+ break;
+ }
+
+ result.add( copy( right1 ) );
+ found = true;
+ break;
+ }
+ }
+ }
+ }
+ // if restrict, copy all restrictions which are in col1 and not in col2
+ if ( restrict )
+ {
+ if ( !found )
+ {
+ result.add( copy( right1 ) );
+ }
+ }
+ }
+
+ // if restrict, copy all restrictions which are in col2 and not in col1
+
+ if ( restrict )
+ {
+ it1 = col2.iterator();
+ while ( it1.hasNext() )
+ {
+ <EquandaRightProxy> right1 = (<EquandaRightProxy>) it1.next();
+ Iterator it2 = col1.iterator();
+ boolean found = false;
+ while ( it2.hasNext() )
+ {
+ <EquandaRightProxy> right2 = (<EquandaRightProxy>) it2.next();
+ if ( right1.getIdentifier().equals( right2.getIdentifier() ) )
+ {
+ if ( !right1.getEquandaType().equals( right2.getEquandaType() ) )
+ {
+ throw new EquandaPersistenceException( EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS );
+ }
+ found = true;
+ break;
+ }
+ }
+ if ( !found )
+ {
+ result.add( copy( right1 ) );
+ }
+ }
+ } // if restrict
+ }
+
+ private <EquandaRightProxy> copy( <EquandaRightProxy> src )
+ {
+ <EquandaRightProxy> ret = new <EquandaRightProxy>();
+ ret.setEquandaType( src.getEquandaType() );
+ ret.setIdentifier( src.getIdentifier() );
+ ret.setRunAccess( src.getRunAccess() );
+ ret.setEditAccess( src.getEditAccess() );
+ return ret;
+ }
+
+ private void mergeRoles( String mergeName, String resultName, boolean restrict )
+ throws EquandaPersistenceException
+ {
+ if ( resultName == null )
+ {
+ log.error( "Cannot merge roles, resultName must be a name for a new role, not null" );
+ throw new EquandaPersistenceException( EPE_RESULTNAME_CANNOT_BE_NULL );
+ }
+ if ( mergeName == null )
+ {
+ log.error( "mergeName must be the name of an existing role, not null" );
+ throw new EquandaPersistenceException( EPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL );
+ }
+ try
+ {
+ EquandaRoleSelectorEJB sel = EquandaRoleSelectorEJBUtil.get();
+ EquandaRoleProxy mergeVal = sel.findRoleProxy( mergeName );
+ if ( mergeVal == null )
+ {
+ log.error( "role " + mergeName + " not found" );
+ throw new EquandaPersistenceException( EPE_ROLE_NOT_FOUND, mergeName );
+ }
+ Collection mergeRights = mergeVal.getRights();
+ Collection ourRights = object.getEquandaProxy().getRights();
+
+ ArrayList<EquandaRightProxy> result = new ArrayList<EquandaRightProxy>();
+ mixRights( ourRights, mergeRights, result, restrict );
+ EquandaRoleProxy resultProxy = new EquandaRoleProxy();
+ resultProxy.setRoleName( resultName );
+ resultProxy.setRights( result );
+ sel.build( " ", resultProxy );
+ sel.remove();
+ }
+ catch ( Exception e )
+ {
+ log.error( "error merging roles", e );
+ throw new EquandaPersistenceException( e );
+ }
+ }
+}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/LinkableMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/LinkableMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/LinkableMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,87 @@
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.UOID;
+import org.equanda.persistence.om.EquandaConstraintViolation;
+import org.equanda.persistence.om.EquandaPersistenceException;
+import org.equanda.test.om.server.pm.DMRemove2Bean;
+import org.equanda.test.om.server.pm.DMRemove2Finder;
+import static org.equanda.test.translation.TestExceptionCodes.ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD;
+
+/**
+ * Description!!!
+ *
+ * @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
+ */
+
+public class LinkableMediator
+ extends LinkableMediatorBase
+{
+ public static final String REMOVE2_NOT_ALOWED_STRING_TO_ADD = "REMOVE2_NOT_ALOWED_STRING_TO_ADD";
+ public static final String REMOVE2_NOT_ALOWED_STRING_TO_REMOVE = "REMOVE2_NOT_ALOWED_STRING_TO_REMOVE";
+
+ public void setEquandaLinkSingleBidirectional( UOID value )
+ throws EquandaPersistenceException
+ {
+ checkAdd( value );
+ super.setEquandaLinkSingleBidirectional( value );
+ }
+
+ public void setEquandaLinkOtherSideCallFacade( UOID value )
+ throws EquandaPersistenceException
+ {
+ checkAdd( value );
+ super.setEquandaLinkOtherSideCallFacade( value );
+ }
+
+
+ public void addEquandaLinkOtherSideCallFacadeMultiple( UOID value )
+ throws EquandaPersistenceException
+ {
+ checkAdd( value );
+ super.addEquandaLinkOtherSideCallFacadeMultiple( value );
+ }
+
+ public void removeEquandaLinkOtherSideCallFacadeMultiple( UOID value )
+ throws EquandaPersistenceException
+ {
+ checkRemove( value );
+ super.removeEquandaLinkOtherSideCallFacadeMultiple( value );
+ }
+
+
+ private void checkAdd( UOID value )
+ throws EquandaConstraintViolation
+ {
+ if ( value != null )
+ {
+ DMRemove2Bean obj = DMRemove2Finder.findUOID( em, value );
+ if ( REMOVE2_NOT_ALOWED_STRING_TO_ADD.equals( obj.getTheString() ) )
+ {
+ throw new EquandaConstraintViolation( ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
+ REMOVE2_NOT_ALOWED_STRING_TO_ADD );
+ }
+ }
+ }
+
+ private void checkRemove( UOID value )
+ throws EquandaConstraintViolation
+ {
+ if ( value != null )
+ {
+ DMRemove2Bean obj = DMRemove2Finder.findUOID( em, value );
+ if ( REMOVE2_NOT_ALOWED_STRING_TO_REMOVE.equals( obj.getTheString() ) )
+ {
+ throw new EquandaConstraintViolation( ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
+ REMOVE2_NOT_ALOWED_STRING_TO_ADD );
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/PriorityFieldsMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/PriorityFieldsMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/PriorityFieldsMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,113 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaPersistenceException;
+
+/**
+ * Provisions for testing the order of setting fields in setEquandaProxy calls
+ *
+ * @author NetRom team
+ */
+public class PriorityFieldsMediator
+ extends PriorityFieldsMediatorBase
+{
+ private void add( char number )
+ {
+ String start = entity.getTest();
+ if ( start == null ) start = "";
+ entity.setTest( start + number );
+ }
+
+ public void setField0( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '0' );
+ super.setField0( field0 );
+ }
+
+ public void setField1( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '1' );
+ super.setField0( field0 );
+ }
+
+ public void setField2( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '2' );
+ super.setField0( field0 );
+ }
+
+ public void setField3( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '3' );
+ super.setField0( field0 );
+ }
+
+ public void setField4( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '4' );
+ super.setField0( field0 );
+ }
+
+ public void setField5( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '5' );
+ super.setField0( field0 );
+ }
+
+ public void setField6( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '6' );
+ super.setField0( field0 );
+ }
+
+ public void setField7( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '7' );
+ super.setField0( field0 );
+ }
+
+ public void setField8( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '8' );
+ super.setField0( field0 );
+ }
+
+ public void setField9( boolean field0 )
+ throws EquandaPersistenceException
+ {
+ add( '9' );
+ super.setField0( field0 );
+ }
+}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ProgrConstraintsMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ProgrConstraintsMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/ProgrConstraintsMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,57 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaConstraintViolation;
+import org.equanda.persistence.om.EquandaPersistenceException;
+import org.equanda.test.translation.TestExceptionCodes;
+
+/**
+ * test for working of programmatic constraints
+ *
+ * @author NetRom team
+ */
+public class ProgrConstraintsMediator
+ extends ProgrConstraintsMediatorBase
+ implements TestExceptionCodes
+{
+
+ public void setMultipleOf100( int multipleOf100 )
+ throws EquandaPersistenceException
+ {
+ if ( multipleOf100 % 100 != 0 )
+ {
+ throw new EquandaConstraintViolation( ECV_NUMBER_NOT_MULTIPLE_OF_100, Integer.toString( multipleOf100 ) );
+ }
+ super.setMultipleOf100( multipleOf100 );
+ }
+
+ public void equandaCheckRules()
+ throws EquandaPersistenceException
+ {
+ if ( entity.getMultipleOf100() == 3800 ) throw new EquandaConstraintViolation( 3800, "not allowed" );
+ }
+
+}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/SecurMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/SecurMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/SecurMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,52 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaPersistenceException;
+
+/**
+ * Two actions needed for testcase SecurityTest
+ *
+ * mediator object to allow specific functionality depending on object equandaType
+ * this class is intended to be modified manually (not overwritten when created)
+ * only protected methods should be overwritten, class private methods should not be touched!
+ *
+ * @author NetRom team
+ */
+public class SecurMediator
+ extends SecurMediatorBase
+{
+ public int testProc1( String param1 )
+ throws EquandaPersistenceException
+ {
+ return 0;
+ }
+
+ public int testProc2( String param1 )
+ throws EquandaPersistenceException
+ {
+ return 0;
+ }
+}
Added: trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/VehicleWithWingsMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/VehicleWithWingsMediator.java (rev 0)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/VehicleWithWingsMediator.java 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,56 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.om.server;
+
+import org.equanda.persistence.om.EquandaConstraintViolation;
+import org.equanda.persistence.om.EquandaDowngradeException;
+import org.equanda.test.translation.TestExceptionCodes;
+
+/**
+ * Mediator for VehicleWithWings objects
+ *
+ * @author NetRom team
+ */
+public class VehicleWithWingsMediator
+ extends VehicleWithWingsMediatorBase
+ implements TestExceptionCodes
+{
+ public void setSpeed( int speed )
+ throws EquandaConstraintViolation
+ {
+ if ( speed < 100 )
+ {
+ throw new EquandaDowngradeException( EDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS, new Integer( speed ).toString() );
+ }
+ try
+ {
+ super.setSpeed( speed );
+ }
+ catch (Exception e)
+ {
+ throw new EquandaConstraintViolation(e);
+ }
+ }
+}
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2007-08-28 09:55:03 UTC (rev 52)
+++ trunk/equanda-test/test-ddltool/pom.xml 2007-08-28 10:53:36 UTC (rev 53)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.equanda.test</groupId>
+ <groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<version>0.8-SNAPSHOT</version>
</parent>
Added: trunk/equanda-test/test-gui-t4-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t4-test/pom.xml (rev 0)
+++ trunk/equanda-test/test-gui-t4-test/pom.xml 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-test</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-gui-t4-test</artifactId>
+ <packaging>jar</packaging>
+ <version>0.8-SNAPSHOT</version>
+ <name>test-gui-t4-test</name>
+ <description>test test</description>
+ <url>http://equanda.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-ear</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/equanda-test/test-t4-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t4-ear/pom.xml 2007-08-28 09:55:03 UTC (rev 52)
+++ trunk/equanda-test/test-t4-ear/pom.xml 2007-08-28 10:53:36 UTC (rev 53)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.equanda.test</groupId>
+ <groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<version>0.8-SNAPSHOT</version>
</parent>
@@ -10,7 +10,7 @@
<artifactId>test-t4-ear</artifactId>
<packaging>ear</packaging>
<version>0.8-SNAPSHOT</version>
- <name>test-ear</name>
+ <name>test-t4-ear</name>
<description>test ear</description>
<url>http://equanda.org</url>
<build>
Modified: trunk/equanda-test/test-t4-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t4-gui/pom.xml 2007-08-28 09:55:03 UTC (rev 52)
+++ trunk/equanda-test/test-t4-gui/pom.xml 2007-08-28 10:53:36 UTC (rev 53)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.equanda.test</groupId>
+ <groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<version>0.8-SNAPSHOT</version>
</parent>
Added: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml (rev 0)
+++ trunk/equanda-test/test-test/pom.xml 2007-08-28 10:53:36 UTC (rev 53)
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-test</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-test</artifactId>
+ <packaging>jar</packaging>
+ <version>0.8-SNAPSHOT</version>
+ <name>test-test</name>
+ <description>test test</description>
+ <url>http://equanda.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-ear</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Copied: trunk/equanda-test/test-test/src/test/java/org (from rev 52, trunk/equanda-test/test-test/src/test/java/be)
Modified: trunk/equanda-tool/translationsEditor.ini
===================================================================
--- trunk/equanda-tool/translationsEditor.ini 2007-08-28 09:55:03 UTC (rev 52)
+++ trunk/equanda-tool/translationsEditor.ini 2007-08-28 10:53:36 UTC (rev 53)
@@ -13,7 +13,7 @@
# settings for the import of keys from xml descriptions of the database
[equanda]
appdir=/java/equanda/test/src/equanda/xejb
-definition=test.xml
+definition=om.xml
import-db-keys-only=false
infrastructure=true
context=equanda-table
Modified: trunk/src/site/wiki/ImportServlet.wiki
===================================================================
--- trunk/src/site/wiki/ImportServlet.wiki 2007-08-28 09:55:03 UTC (rev 52)
+++ trunk/src/site/wiki/ImportServlet.wiki 2007-08-28 10:53:36 UTC (rev 53)
@@ -25,7 +25,7 @@
in.close();
{code}
-If the data file starts with "data=\x94 then this is removed from the data (this is done to allow the data to come from a form).
+If the data file starts with "data=� then this is removed from the data (this is done to allow the data to come from a form).
The servlet send a short replies with "OK" if the file was processed properly.
If there was a problem during the import, the reply is "FAILED " followed by a human readable reason of failure.
@@ -38,7 +38,7 @@
{code}
<equanda
appdir="${rootdir}/build/om"
- definition="test.xml"
+ definition="om.xml"
outputdir="${build.generate.dir}"
package="test.ymport"
template="import"
@@ -49,7 +49,7 @@
</equanda>
{code}
-Note that "import\x94 is a reserved word in Java and thus cannot be used as package name.
+Note that "import� is a reserved word in Java and thus cannot be used as package name.
To use the servlet, a definition like the example which follows has to be added to your web.xml file in your web archive.
@@ -64,7 +64,7 @@
</servlet>
{code}
-Obviously, this servlet also has to be mapped to a URL, but that\x92s all there is to it.
+Obviously, this servlet also has to be mapped to a URL, but that�s all there is to it.
!Charset issues
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-28 09:55:13
|
Revision: 52
http://equanda.svn.sourceforge.net/equanda/?rev=52&view=rev
Author: triathlon98
Date: 2007-08-28 02:55:03 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build (partial)
Added Paths:
-----------
trunk/equanda-test/test-test/src/
trunk/equanda-test/test-test/src/test/
trunk/equanda-test/test-test/src/test/java/
trunk/equanda-test/test-test/src/test/java/be/
trunk/equanda-test/test-test/src/test/java/be/equanda/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/DescriptionFactory.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TestApplet.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TranslateUtil.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/UnidView.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/export/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/export/ExportTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/pages/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/pages/testFilters/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/pages/testFilters/TestFilters.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/translation/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/translation/TestExceptionCodes.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/DefaultSample.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemDisplayer.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemHiddener.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/OtherChoices.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ParameterSample.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ActionTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/BuilderSetTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ChoicesTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/CloneableTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/CompareTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/DefaultTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/DelegateTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/DowngradeTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/EmbeddedTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/EntityTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ExtractionOfValueTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/FieldTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/GetSetUsingValueTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ImmutableIfGlobalInheritedTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ImmutableIfGlobalTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/InheritanceTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/LazyInstTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/LinkTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ModifiedProxyTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/MultipleFieldTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/PriorityTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ProgrConstraintsTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/ProxyTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/RemoveLinksTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/RemoveTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/RequiredFieldsTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/SecurityTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/SelectionTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/SelectorUpdateTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/SelectorsFiltersTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/SelectorsSortingTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/SetUnidRollbackTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/StringLengthTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/SubselectTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/TypeTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/UnidQueryTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/xejb/UniqueFieldsTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/ymport/
trunk/equanda-test/test-test/src/test/java/be/equanda/test/ymport/ImportInvalidTest.java
trunk/equanda-test/test-test/src/test/java/be/equanda/test/ymport/ImportTest.java
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/DescriptionFactory.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/DescriptionFactory.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/DescriptionFactory.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,69 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+package org.equanda.test.applet;
+
+import org.equanda.tapestry.model.GMTable;
+import org.equanda.tapestry.model.GMField;
+import org.equanda.tapestry.model.GMSelect;
+import org.equanda.tapestry.model.GMAction;
+import org.equanda.tapestry.parser.descriptions.Parser;
+
+/**
+ * A simpler xml description reader (no cache, like the one used in Tapestry GUI).
+ *
+ * @author Florin
+ */
+public class DescriptionFactory
+{
+
+ public static synchronized GMTable getTableDescription( String tableName )
+ throws Exception
+ {
+ String fullTableName = tableName + ".xml";
+ GMTable table;
+ Parser parser = new Parser( fullTableName );
+ table = parser.getTable();
+ return (GMTable) table.clone();
+ }
+
+ public static synchronized GMField getFieldDescription( String tableName, String fieldName )
+ throws Exception
+ {
+ return getTableDescription( tableName ).getField( fieldName );
+ }
+
+ public static synchronized GMSelect getSelectDescription( String tableName, String selectName )
+ throws Exception
+ {
+ GMTable table = getTableDescription( tableName );
+ return table.getSelect( selectName );
+ }
+
+ public static synchronized GMAction getActionDescription( String tableName, String actionName )
+ throws Exception
+ {
+ GMTable table = getTableDescription( tableName );
+ return table.getAction( actionName );
+ }
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TestApplet.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TestApplet.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TestApplet.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,194 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+package org.equanda.test.applet;
+
+import org.equanda.test.om.client.CocoonManProxy;
+import org.equanda.test.om.client.CocoonManSelectorEJB;
+import org.equanda.test.om.client.CocoonManSelectorEJBUtil;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.util.Properties;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+/**
+ * Example applet. Does a search by first name in CocoonMan. Allows viewing one result (and clicking/viewing links)
+ *
+ * @author Florin
+ */
+public class TestApplet
+ extends JApplet
+{
+
+ JPanel content = new JPanel();
+
+ JLabel labelError = new JLabel();
+ JLabel labelLastName = new JLabel( "Last Name" );
+ JTextField editLastName = new JTextField( 25 );
+ JButton buttonSearch = new JButton( "Search" );
+ JLabel labelNoResults = new JLabel( "NoResults" );
+ JPanel resultPanel;
+
+ String login = "local", password = "local";
+
+ java.util.List<JPanel> stack = new java.util.ArrayList<JPanel>();
+
+ @Override
+ public void init()
+ {
+ try
+ {
+ javax.swing.SwingUtilities.invokeAndWait( new Runnable()
+ {
+ public void run()
+ {
+ createGUI();
+ }
+ } );
+
+ System.getProperties()
+ .setProperty( "java.naming.factory.initial", getParameter( "java.naming.factory.initial" ) );
+ System.getProperties()
+ .setProperty( "java.naming.factory.url.pkgs", getParameter( "java.naming.factory.url.pkgs" ) );
+ System.getProperties()
+ .setProperty( "java.naming.provider.url", getParameter( "java.naming.provider.url" ) );
+
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ }
+ }
+
+ private void createGUI()
+ {
+ content.setLayout( new BoxLayout( content, BoxLayout.PAGE_AXIS ) );
+ add( content );
+ labelError.setForeground( Color.red );
+ labelError.setAlignmentX( CENTER_ALIGNMENT );
+ content.add( labelError );
+
+ JPanel queryPanel = new JPanel();
+ queryPanel.add( labelLastName );
+ queryPanel.add( editLastName );
+ Dimension dim = queryPanel.getMaximumSize();
+ dim.height = 40;
+ queryPanel.setMaximumSize( dim );
+ content.add( queryPanel );
+
+ buttonSearch.setAlignmentX( CENTER_ALIGNMENT );
+ content.add( buttonSearch );
+ buttonSearch.addActionListener( new ActionListener()
+ {
+
+ public void actionPerformed( ActionEvent e )
+ {
+ search();
+ }
+ }
+ );
+
+ content.add( labelNoResults );
+ labelNoResults.setAlignmentX( CENTER_ALIGNMENT );
+ labelNoResults.setVisible( false );
+ }
+
+ private void login()
+ {
+ SecurityAssociation.setPrincipal( new SimplePrincipal( login ) );
+ SecurityAssociation.setCredential( password.toCharArray() );
+ }
+
+ private void search()
+ {
+ try
+ {
+ login();
+ labelNoResults.setVisible( false );
+ if ( resultPanel != null ) content.remove( resultPanel );
+ labelError.setText( "" );
+ String lastName = editLastName.getText();
+ CocoonManSelectorEJB sel = CocoonManSelectorEJBUtil.get();
+ java.util.List<CocoonManProxy> results = sel.findPersonByLastNameProxy( lastName );
+ sel.remove();
+ if ( results.size() == 0 )
+ {
+ labelNoResults.setVisible( true );
+ }
+ else
+ {
+ equandaView view =
+ new equandaView( results.get( 0 ), DescriptionFactory.getTableDescription( "CocoonMan" ), this );
+
+ resultPanel = view.getPanel();
+ content.add( resultPanel );
+ }
+ this.repaint();
+ }
+ catch ( Throwable e )
+ {
+ labelError.setText( e.toString() );
+ e.printStackTrace();
+ }
+ }
+
+ public void paint( Graphics g )
+ {
+ super.paint( g );
+ validate();
+ }
+
+ public void navigate( JPanel panel )
+ {
+ stack.add( content );
+ remove( content );
+ content = new JPanel();
+ add( content );
+ content.add( panel );
+ JButton buttonBack = new JButton( "Back" );
+ buttonBack.setAlignmentX( CENTER_ALIGNMENT );
+ buttonBack.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+ remove( content );
+ content = stack.get( stack.size() - 1 );
+ add( content );
+ stack.remove( stack.size() - 1 );
+ repaint();
+ }
+ } );
+ panel.add( buttonBack );
+ }
+
+ public boolean hasBack()
+ {
+ return stack.size() > 0;
+ }
+
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TranslateUtil.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TranslateUtil.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/TranslateUtil.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,52 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+package org.equanda.test.applet;
+
+import org.equanda.translations.TranslatorEJBUtil;
+import org.equanda.translations.TranslatorEJB;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Utility to use translations in the applet
+ *
+ *
+ * @author Florin
+ * */
+public class TranslateUtil
+{
+ static TranslatorEJB translator= TranslatorEJBUtil.get();
+ static List contexts=new ArrayList();
+ static
+ {
+ contexts.add("equanda-table");
+ contexts.add("equanda-fixed");
+ };
+
+ public static String translate(String key)
+ {
+ return translator.translate( "en", key, contexts );
+ }
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/UnidView.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/UnidView.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/applet/UnidView.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,122 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+package org.equanda.test.applet;
+
+import org.equanda.persistence.om.EquandaProxy;
+import org.equanda.tapestry.model.GMTable;
+import org.equanda.tapestry.model.GMField;
+import org.equanda.tapestry.util.FieldType;
+import org.equanda.tapestry.util.EquandaProxyAccessor;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+/**
+ * A panel rendering a record (Similar to the View/Edit component for Tapestry).
+ *
+ * @author Florin
+ */
+public class equandaView
+{
+ EquandaProxy proxy;
+ GMTable description;
+ TestApplet applet;
+
+ public equandaView( EquandaProxy proxy, GMTable description, TestApplet applet )
+ {
+ this.proxy = proxy;
+ this.description = description;
+ this.applet = applet;
+ }
+
+ public JPanel getPanel()
+ throws Exception
+ {
+ JPanel panel = new JPanel();
+ panel.setLayout( new BoxLayout( panel, BoxLayout.PAGE_AXIS ) );
+
+ for ( GMField field : description.getFields() )
+ {
+ if ( ( field.getFieldType() == FieldType.TYPE_STRING || field.getFieldType() == FieldType.TYPE_LINK ) &&
+ !field.isMultiple() &&
+ field.getRenderer().isTypeDefault() )
+ {
+ addField( panel, field );
+ }
+ }
+ return panel;
+ }
+
+ private void addField( JPanel panel, final GMField field )
+ throws Exception
+ {
+ JPanel fieldPanel = new JPanel();
+ fieldPanel.setLayout( new GridLayout( 1, 2 ) );
+ JLabel label = new JLabel( field.getName() );
+ fieldPanel.add( label );
+ if ( field.getFieldType() == FieldType.TYPE_STRING )
+ {
+ JTextField edit = new JTextField( field.getLength() );
+ edit.setText( (String) EquandaProxyAccessor.getField( proxy, field.getName() ) );
+ fieldPanel.add( edit );
+ }
+ else
+ {
+ final EquandaProxy link = (EquandaProxy) EquandaProxyAccessor.getField( proxy, field.getName() );
+ if ( link == null )
+ {
+ fieldPanel.add( new JLabel( "null" ) );
+ }
+ else
+ {
+ JButton viewButton = new JButton( "View" );
+ viewButton.addActionListener( new ActionListener()
+ {
+ public void actionPerformed( ActionEvent e )
+ {
+
+ try
+ {
+ equandaView linkView = new equandaView( link, DescriptionFactory.getTableDescription(
+ field.getLinkTableName() ), equandaView.this.applet );
+ equandaView.this.applet.navigate( linkView.getPanel() );
+ equandaView.this.applet.repaint();
+ }
+ catch ( Exception ex )
+ {
+ ex.printStackTrace();
+ }
+ }
+ } );
+ fieldPanel.add( viewButton );
+ }
+ }
+ Dimension dim = fieldPanel.getMaximumSize();
+ dim.height = 30;
+ fieldPanel.setMaximumSize( dim );
+ panel.add( fieldPanel );
+ }
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/export/ExportTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/export/ExportTest.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/export/ExportTest.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,536 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.export;
+
+import org.equanda.export.Export;
+import org.equanda.export.ExportInfo;
+import org.equanda.persistence.om.UOID;
+import org.equanda.persistence.om.EquandaPersistenceException;
+import org.equanda.test.om.client.*;
+import org.equanda.util.INIFile;
+import org.equanda.util.ymport.ImportUtil;
+import junit.framework.TestCase;
+import org.joda.time.chrono.ISOChronology;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.sql.Timestamp;
+import java.util.*;
+
+/**
+ * general test case for export
+ *
+ * @author NetRom team
+ */
+public class ExportTest
+ extends TestCase
+{
+ public static final String URL = "http://localhost:8080/import/";
+
+ public static final String CAR_1_BRAND = "TestBrand1";
+ public static final String CAR_2_BRAND = "TestBrand2";
+ public static final String CAR_3_BRAND = "TestBrand3";
+ public static final String VEHICLE_NAME = "TestVehicle";
+ public static final String COCOONMAN_LASTNAME = "TestLastName1";
+ public static final String COCOONMAN_JOBS_1 = "some \"\" and one (\")";
+ public static final String COCOONMAN_JOBS_2 = "test new line \n after";
+ public static final String COCOONMAN_JOBS_3 = "test tab \t after";
+ public static final String COCOONMAN_JOBS_4 = "test \\ after";
+ public static final String COCOONMAN_JOBS_5 = "test return \r after";
+ public static final String OWNER_NAME_1 = "testOwner1";
+ public static final String OWNER_NAME_2 = "testOwner2";
+ public static final String PASSPORT_ID_1 = "testExportID1";
+ public static final String PASSPORT_ID_2 = "testExportID2";
+ public static final String EXPORT_OUTPUT_FILENAME_COCOONMAN = "exportTestCocoonMan.txt";
+ public static final String EXPORT_OUTPUT_FILENAME_CAR = "exportTestCar.txt";
+ public static final String EXPORT_OUTPUT_FILENAME_CAR_WITH_OWNER = "exportTestCarWithOwner.txt";
+ public static final String EXPORT_OUTPUT_FILENAME_VEHICLE = "exportTestVehicle.txt";
+
+ CarSelectorEJB selCar;
+ CocoonManSelectorEJB selCocoon;
+ VehicleSelectorEJB selVehicle;
+ OwnerSelectorEJB selOwner;
+ PassportSelectorEJB selPassport;
+
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ AllTest.login();
+ if ( selCocoon == null )
+ {
+ selCocoon = CocoonManSelectorEJBUtil.get();
+ }
+
+ if ( selCar == null )
+ {
+ selCar = CarSelectorEJBUtil.get();
+ }
+
+ if ( selVehicle == null )
+ {
+ selVehicle = VehicleSelectorEJBUtil.get();
+ }
+
+ if ( selOwner == null )
+ {
+ selOwner = OwnerSelectorEJBUtil.get();
+ }
+
+ if ( selPassport == null )
+ {
+ selPassport = PassportSelectorEJBUtil.get();
+ }
+ }
+
+ /**
+ * exports a cocoonMan value and then imports the file created by export
+ * checks the results
+ *
+ * @throws Exception
+ */
+ public void testExportAll()
+ throws Exception
+ {
+ // delete the last last export file (should not exist)
+ File exportFile = new File( EXPORT_OUTPUT_FILENAME_COCOONMAN );
+ if ( exportFile.exists() )
+ {
+ exportFile.delete();
+ }
+
+ CarEJB car1EJB = createCar( CAR_1_BRAND, null );
+ CarEJB car2EJB = createCar( CAR_2_BRAND, null );
+ CarEJB car3EJB = createCar( CAR_3_BRAND, null );
+
+ // build the array of uoids for multiple link records (ManyCars)
+ ArrayList<UOID> cars = new ArrayList<UOID>();
+ cars.add( car2EJB.getUOID() );
+ cars.add( car3EJB.getUOID() );
+
+ CocoonManEJB cocoonManEJB = createCocoonMan( car1EJB.getUOID(), cars );
+
+ // setup export
+ Export exp = new Export();
+
+ // construct the hashmap for the liked field car
+ HashMap map = new HashMap();
+ HashMap<String, ExportInfo> fieldCar = new HashMap<String, ExportInfo>();
+ fieldCar.put( "Car", new ExportInfo( "equanda/CarSelector", "org.equanda.test.om.client.CarSelector", "Brand" ) );
+ fieldCar.put( "ManyCars",
+ new ExportInfo( "equanda/CarSelector", "org.equanda.test.om.client.CarSelector", "Brand" ) );
+ map.put( "CocoonMan", fieldCar );
+
+ // export cocoonManProxy
+ CocoonManProxy cmv = cocoonManEJB.getEquandaProxy();
+ INIFile cmIni = createCocoonManINI();
+ exp.export( cmv, cmv, cmIni, map, true, null );
+
+ // first save the proxies for tests
+ CocoonManProxy cocoonManProxy = cocoonManEJB.getEquandaProxy();
+ // make sure all data for proxy is loaded ( links and multiple fields )
+ cocoonManProxy.getPreviousJobs();
+ cocoonManProxy.getDatesToRemember();
+ cocoonManProxy.getManyCars();
+ cocoonManProxy.getCar();
+
+ exportFile = new File( EXPORT_OUTPUT_FILENAME_COCOONMAN );
+ assertTrue( " export file not created ", exportFile.exists() );
+ // mark the export file to be deleted in the end
+ exportFile.deleteOnExit();
+
+ // delete the cocoonMan and car entity bean
+ remove( cocoonManEJB );
+ remove( car1EJB );
+ remove( car2EJB );
+ remove( car3EJB );
+
+ String s = ImportUtil.importFile( EXPORT_OUTPUT_FILENAME_COCOONMAN, URL, AllTest.importCredentials );
+ assertNull( "import failed " + s, s );
+
+ // verify import
+ // verify cocoonMan
+ Collection col = selCocoon.findPersonByLastName( COCOONMAN_LASTNAME );
+ cocoonManEJB = (CocoonManEJB) col.iterator().next();
+ assertTrue( cocoonManEJB.getEquandaModificationDate().after( cocoonManProxy.getEquandaModificationDate() ) );
+ assertEquals( cocoonManEJB.getFirstName(), cocoonManProxy.getFirstName() );
+ assertEquals( cocoonManEJB.getLastName(), cocoonManProxy.getLastName() );
+ assertEquals( cocoonManEJB.getPreviousJobs(), cocoonManProxy.getPreviousJobs() );
+ assertEquals( cocoonManEJB.getDateOfBirth(), cocoonManProxy.getDateOfBirth() );
+ assertEquals( cocoonManEJB.getDatesToRemember(), cocoonManProxy.getDatesToRemember() );
+ assertEquals( cocoonManEJB.getHeight(), cocoonManProxy.getHeight(), 0.0 );
+ assertEquals( cocoonManEJB.getEmployed(), cocoonManProxy.getEmployed() );
+ assertEquals( cocoonManEJB.getNoOfChildren(), cocoonManProxy.getNoOfChildren() );
+ assertEquals( cocoonManEJB.getSometime(), cocoonManProxy.getSometime() );
+ assertTrue( Arrays.equals( cocoonManEJB.getBlob(), cocoonManProxy.getBlob() ) );
+ // verify Car
+ assertEquals( cocoonManEJB.getCar().getBrand(), CAR_1_BRAND );
+ Iterator it = cocoonManEJB.getManyCars().iterator();
+ String brand, brand2;
+ brand = ( (CarEJB) it.next() ).getBrand();
+ brand2 = ( (CarEJB) it.next() ).getBrand();
+ assertTrue( brand.equals( CAR_2_BRAND ) || brand.equals( CAR_3_BRAND ) );
+ assertTrue( brand2.equals( CAR_2_BRAND ) || brand2.equals( CAR_3_BRAND ) );
+ assertFalse( brand.equals( brand2 ) );
+
+ // clean
+ Iterator rem = cocoonManEJB.getManyCars().iterator();
+ while ( rem.hasNext() ) remove( rem.next() );
+ remove( cocoonManEJB.getCar() );
+ remove( cocoonManEJB );
+ }
+
+ /**
+ * exports the UOID of a car
+ * checks the results
+ *
+ * @throws Exception
+ */
+ public void testExportUOID()
+ throws Exception
+ {
+
+ CarEJB car = createCar( CAR_1_BRAND, null );
+ UOID carUOID = car.getUOID();
+
+ Export exp = new Export();
+
+ // build ini
+ INIFile ini = new INIFile();
+ ini.addSection( "Car" );
+ ini.addValue( "Car", "file", EXPORT_OUTPUT_FILENAME_CAR );
+ ini.addValue( "Car", "1", "UOID" );
+
+ // export car
+ exp.export( car.getEquandaProxy(), car.getEquandaProxy(), ini, null, true, null );
+
+ // delete the car entity
+ remove( car );
+
+ // check that the export file has been created
+ File exportFile = new File( EXPORT_OUTPUT_FILENAME_CAR );
+ assertTrue( " export file not created ", exportFile.exists() );
+ // mark the export file to be deleted in the end
+ exportFile.deleteOnExit();
+
+ //verify
+ BufferedReader in = new BufferedReader( new FileReader( exportFile ) );
+ // skip the declaration line
+ in.readLine();
+ String s = in.readLine();
+ System.out.println( "result line (" + s + ')' );
+ assertEquals( carUOID, new UOID( s.trim().substring( 2, s.length() - 2 ) ) );
+ }
+
+ /**
+ * exports the equandaType of a car
+ * checks the results
+ *
+ * @throws Exception
+ */
+ public void testExportequandaType()
+ throws Exception
+ {
+ VehicleEJB veh = createVehicle( VEHICLE_NAME );
+
+ Export exp = new Export();
+
+ // build ini
+ INIFile ini = new INIFile();
+ ini.addSection( "Vehicle" );
+ ini.addValue( "Vehicle", "file", EXPORT_OUTPUT_FILENAME_VEHICLE );
+ ini.addValue( "Vehicle", "1", "equandaType" );
+
+ // export car
+ exp.export( veh.getEquandaProxy(), veh.getEquandaProxy(), ini, null, true, null );
+
+ // delete the car entity
+ remove( veh );
+
+ // check that the export file has been created
+ File exportFile = new File( EXPORT_OUTPUT_FILENAME_VEHICLE );
+ assertTrue( " export file not created ", exportFile.exists() );
+ // mark the export file to be deleted in the end
+ exportFile.deleteOnExit();
+
+ //verify
+ BufferedReader in = new BufferedReader( new FileReader( exportFile ) );
+ // skip the declaration line
+ in.readLine();
+ String s = in.readLine();
+ assertEquals( VehicleConstants.TYPE_Airplane, s.trim().substring( 1, s.length() - 1 ) );
+ }
+
+ /**
+ * exports the Car with Owner with Passport with Id
+ * checks the results
+ *
+ * @throws Exception
+ */
+ public void testRecursiveExport()
+ throws Exception
+ {
+ PassportEJB id1 = createPassport( PASSPORT_ID_1 );
+ PassportEJB id2 = createPassport( PASSPORT_ID_2 );
+
+ OwnerEJB owner1 = createOwner( OWNER_NAME_1, id1 );
+ OwnerEJB owner2 = createOwner( OWNER_NAME_2, id2 );
+
+ ArrayList<OwnerProxy> owners = new ArrayList<OwnerProxy>();
+ owners.add( owner1.getEquandaProxy() );
+ owners.add( owner2.getEquandaProxy() );
+
+ CarEJB car = createCar( CAR_1_BRAND, owners );
+
+ Export exp = new Export();
+
+ // build ini
+ INIFile ini = new INIFile();
+ ini.addSection( "Car" );
+ ini.addValue( "Car", "file", EXPORT_OUTPUT_FILENAME_CAR_WITH_OWNER );
+ ini.addValue( "Car", "1", "Brand" );
+ ini.addValue( "Car", "2", "Owners" );
+
+ //build hashMap
+ HashMap map = new HashMap();
+ HashMap<String, ExportInfo> fieldId = new HashMap<String, ExportInfo>();
+ HashMap<String, ExportInfo> fieldOwner = new HashMap<String, ExportInfo>();
+ fieldOwner.put( "Owners",
+ new ExportInfo( "equanda/OwnerSelector", "org.equanda.test.om.client.OwnerSelector", "Passport" ) );
+ fieldId.put( "Passport",
+ new ExportInfo( "equanda/PassportSelector", "org.equanda.test.om.client.PassportSelector",
+ "Identifier" ) );
+ map.put( "Car", fieldOwner );
+ map.put( "Owner", fieldId );
+
+ // export car
+ CarProxy carProxy = car.getEquandaProxy();
+ exp.export( carProxy, carProxy, ini, map, true, null );
+
+ // delete the car entity
+ remove( car );
+ remove( id1 );
+ remove( id2 );
+
+ // check that the export file has been created
+ File exportFile = new File( EXPORT_OUTPUT_FILENAME_CAR_WITH_OWNER );
+ assertTrue( " export file not created ", exportFile.exists() );
+ // mark the export file to be deleted in the end
+ exportFile.deleteOnExit();
+
+ // import
+ String s = ImportUtil.importFile( EXPORT_OUTPUT_FILENAME_CAR_WITH_OWNER, URL, AllTest.importCredentials );
+ assertNull( "import failed " + s, s );
+
+ //veryfi
+ car = selCar.findBrand( CAR_1_BRAND );
+ Iterator it = car.getOwners().iterator();
+ id1 = ( (OwnerEJB) it.next() ).getPassport();
+ id2 = ( (OwnerEJB) it.next() ).getPassport();
+ assertTrue( id1.getIdentifier().equals( PASSPORT_ID_1 ) || id1.getIdentifier().equals( PASSPORT_ID_2 ) );
+ assertTrue( id2.getIdentifier().equals( PASSPORT_ID_1 ) || id2.getIdentifier().equals( PASSPORT_ID_2 ) );
+ assertFalse( id1.getIdentifier().equals( id2.getIdentifier() ) );
+
+ // clean
+ remove( car );
+ remove( id1 );
+ remove( id2 );
+ }
+
+ private VehicleEJB createVehicle( String name )
+ throws EquandaPersistenceException
+ {
+ List<VehicleEJB> list = selVehicle.findName( name );
+ if ( list.isEmpty() )
+ {
+ VehicleProxy v = VehicleProxy.equandaCreate();
+ v.setName( name );
+ v.setEquandaType( VehicleConstants.TYPE_Airplane );
+ v.equandaUpdate();
+ return selVehicle.findName( name ).iterator().next();
+ }
+ return list.get( 0 );
+ }
+
+ private CarEJB createCar( String brand, ArrayList owners )
+ throws EquandaPersistenceException
+ {
+ CarEJB car = selCar.findBrand( brand );
+ if ( car == null )
+ {
+ CarProxy tmp = CarProxy.equandaCreate();
+ if ( owners != null ) tmp.setOwners( owners );
+ tmp.setBrand( brand );
+ tmp.setEquandaType( CarConstants.TYPE_Car );
+ tmp.equandaUpdate();
+ return selCar.findBrand( brand );
+ }
+
+ CarProxy tmp = car.getEquandaProxy();
+ tmp.setOwners( owners );
+ tmp.equandaUpdate();
+ return selCar.findBrand( brand );
+ }
+
+ private OwnerEJB createOwner( String name, PassportEJB id )
+ throws EquandaPersistenceException
+ {
+ OwnerProxy owner = selOwner.findNameProxy( name );
+ if ( owner == null )
+ {
+ OwnerProxy tmp = OwnerProxy.equandaCreate();
+ tmp.setName( name );
+ tmp.setPassport( id.getEquandaProxy() );
+ tmp.setEquandaType( OwnerConstants.TYPE_Owner );
+ tmp.equandaUpdate();
+ return selOwner.findName( name );
+ }
+ owner.setPassport( id.getEquandaProxy() );
+ owner.equandaUpdate();
+ return selOwner.findName( name );
+ }
+
+ private PassportEJB createPassport( String id )
+ throws EquandaPersistenceException
+ {
+ PassportEJB passport = selPassport.findIdentifier( id );
+ if ( passport == null )
+ {
+ PassportProxy val = PassportProxy.equandaCreate();
+ val.setIdentifier( id );
+ val.setEquandaType( PassportConstants.TYPE_Passport );
+ val.equandaUpdate();
+ return selPassport.findIdentifier( id );
+ }
+ return passport;
+ }
+
+ private CocoonManEJB createCocoonMan( UOID carUOID, ArrayList manyCarsUOIDs )
+ throws EquandaPersistenceException
+ {
+ // build the cocoonMan
+ // build the array of values for datesToRemember
+ java.sql.Date date1 = new java.sql.Date( ISOChronology.getInstance().getDateTimeMillis( 2004, 10, 25, 0 ) );
+ java.sql.Date date2 = new java.sql.Date( ISOChronology.getInstance().getDateTimeMillis( 2004, 10, 26, 0 ) );
+ ArrayList dates = new ArrayList( 2 );
+ dates.add( date1 );
+ dates.add( date2 );
+
+ // build the array of values for PreviousJobs
+ ArrayList<String> jobs = new ArrayList<String>( 3 );
+ jobs.add( COCOONMAN_JOBS_1 );
+ jobs.add( COCOONMAN_JOBS_2 );
+ jobs.add( COCOONMAN_JOBS_3 );
+ jobs.add( COCOONMAN_JOBS_4 );
+ jobs.add( COCOONMAN_JOBS_5 );
+
+ //clean
+ Iterator it = selCocoon.findPersonByLastName( COCOONMAN_LASTNAME ).iterator();
+ while ( it.hasNext() ) remove( it.next() );
+
+ Collection<CarProxy> manyCars = new ArrayList<CarProxy>();
+ for ( Object id : manyCarsUOIDs )
+ {
+ manyCars.add( selCar.findUOIDProxy( (UOID) id ) );
+ }
+
+ CocoonManProxy cocoonProxy = new CocoonManProxy();
+ cocoonProxy.setFirstName( "TestFirstName" );
+ cocoonProxy.setLastName( COCOONMAN_LASTNAME );
+ cocoonProxy.setPreviousJobs( jobs );
+ cocoonProxy.setCar( selCar.findUOIDProxy( carUOID ) );
+ cocoonProxy.setManyCars( manyCars );
+ cocoonProxy.setDateOfBirth( date1 );
+ cocoonProxy.setDatesToRemember( dates );
+ cocoonProxy.setHeight( 1234.0 );
+ cocoonProxy.setEmployed( true );
+ cocoonProxy.setSometime( new Timestamp( date2.getTime() ) );
+ cocoonProxy.setNoOfChildren( 10 );
+
+ byte b[] = new byte[]{ 1, 2, 3 };
+ cocoonProxy.setBlob( b );
+
+ cocoonProxy.setEquandaType( CocoonManConstants.TYPE_CocoonMan );
+ cocoonProxy.equandaUpdate();
+
+ // get the ejb
+ Collection col = selCocoon.findPersonByLastName( COCOONMAN_LASTNAME );
+
+ return (CocoonManEJB) col.iterator().next();
+ }
+
+ /**
+ * create the ini file used for export
+ *
+ * @return ini file
+ */
+ private INIFile createCocoonManINI()
+ {
+ INIFile ini = new INIFile();
+ ini.addSection( "CocoonMan" );
+ ini.addValue( "CocoonMan", "file", EXPORT_OUTPUT_FILENAME_COCOONMAN );
+ ini.addValue( "CocoonMan", "1", "FirstName" );
+ ini.addValue( "CocoonMan", "2", "LastName" );
+ ini.addValue( "CocoonMan", "3", "PreviousJobs" );
+ ini.addValue( "CocoonMan", "4", "DateOfBirth" );
+ ini.addValue( "CocoonMan", "5", "DatesToRemember" );
+ ini.addValue( "CocoonMan", "6", "Height" );
+ ini.addValue( "CocoonMan", "7", "Employed" );
+ ini.addValue( "CocoonMan", "8", "NoOfChildren" );
+ ini.addValue( "CocoonMan", "9", "Sometime" );
+ ini.addValue( "CocoonMan", "10", "Car" );
+ ini.addValue( "CocoonMan", "11", "ManyCars" );
+ ini.addValue( "CocoonMan", "12", "Blob" );
+
+ return ini;
+ }
+
+ /**
+ * remove the EJB entity bean
+ *
+ * @param objectEJB
+ */
+ private void remove( Object objectEJB )
+ throws EquandaPersistenceException
+ {
+ if ( objectEJB instanceof CarEJB )
+ {
+ ( (CarEJB) objectEJB ).removeEntityBean();
+ }
+ else if ( objectEJB instanceof VehicleEJB )
+ {
+ ( (VehicleEJB) objectEJB ).removeEntityBean();
+ }
+ else if ( objectEJB instanceof CocoonManEJB )
+ {
+ ( (CocoonManEJB) objectEJB ).removeEntityBean();
+ }
+ else if ( objectEJB instanceof PassportEJB )
+ {
+ ( (PassportEJB) objectEJB ).removeEntityBean();
+ }
+ }
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/pages/testFilters/TestFilters.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/pages/testFilters/TestFilters.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/pages/testFilters/TestFilters.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,115 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+package org.equanda.test.pages.testFilters;
+
+import org.equanda.tapestry.navigation.NavigationablePageImpl;
+import org.equanda.tapestry.util.equandaFormValidator;
+import org.equanda.tapestry.util.Global;
+import org.equanda.persistence.om.SelectorsState;
+import org.apache.tapestry.annotations.Bean;
+import org.apache.tapestry.valid.ValidationDelegate;
+
+import java.util.Map;
+
+/**
+ * Page class for page TestFilters
+ *
+ * @author Florin
+ */
+public abstract class TestFilters
+ extends NavigationablePageImpl
+{
+ @Bean( equandaFormValidator.class )
+ public abstract ValidationDelegate getValidationDelegate();
+
+ public void setDataFilter()
+ {
+ Global global = (Global) getGlobal();
+ global.setFilter( "FootballPlayer", "GoalkeepersFilter", "o.goalkeeper=1" );
+ SelectorsState.setFilter( "FootballPlayer", "GoalkeepersFilter", "o.goalkeeper=1" );
+
+ }
+
+ public void unsetDataFilter()
+ {
+ Global global = (Global) getGlobal();
+ global.setFilter( "FootballPlayer", "GoalkeepersFilter", "" );
+ SelectorsState.setFilter( "FootballPlayer", "GoalkeepersFilter", "" );
+ }
+
+ public String getDataFilterProxy()
+ {
+ Map<String, String> filters = SelectorsState.getFilters( "FootballPlayer" );
+ if ( filters == null ) return "Current value: ";
+ return "Current value: " + filters.get( "GoalkeepersFilter" );
+ }
+
+ public void setViewFilter()
+ {
+ Global global = (Global) getGlobal();
+ global.setFilter( "FootballPlayer", "GoalkeepersHideFilter", "o.goalkeeper=1" );
+ SelectorsState.setFilter( "FootballPlayer", "GoalkeepersHideFilter", "o.goalkeeper=1" );
+
+ }
+
+ public void unsetViewFilter()
+ {
+ Global global = (Global) getGlobal();
+ global.setFilter( "FootballPlayer", "GoalkeepersHideFilter", "" );
+ SelectorsState.setFilter( "FootballPlayer", "GoalkeepersHideFilter", "" );
+ }
+
+ public String getViewFilterProxy()
+ {
+ Map<String, String> filters = SelectorsState.getFilters( "FootballPlayer" );
+ if ( filters == null ) return "Current value: ";
+ return "Current value: " + filters.get( "GoalkeepersHideFilter" );
+ }
+
+ public void setOrder()
+ {
+ Global global = (Global) getGlobal();
+ global.setSorting( "FootballPlayer", "name" );
+ SelectorsState.setSorting( "FootballPlayer", "name" );
+
+ }
+
+ public void unsetOrder()
+ {
+ Global global = (Global) getGlobal();
+ global.setSorting( "FootballPlayer", "" );
+ SelectorsState.setSorting( "FootballPlayer", "" );
+ }
+
+ public String getOrderProxy()
+ {
+ String order = SelectorsState.getSorting( "FootballPlayer" );
+ return "Current value: " + order;
+ }
+
+ public String getTitle()
+ {
+ return "Test filters";
+ }
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/translation/TestExceptionCodes.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/translation/TestExceptionCodes.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/translation/TestExceptionCodes.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,47 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.translation;
+
+/**
+ * Codes for exceptions in the custom mediators, used for internationalization
+ *
+ * @author NetRom team
+ */
+public interface TestExceptionCodes
+{
+ public static int EPE_PROBLEM_IN_AUTOPASSPORT = 100001;
+ public static int EPE_PROBLEM_IN_AUTOMULTIPLEAUTO = 100002;
+ public static int EPE_PROBLEM_IN_AUTOMULTIPLEPASSPORT = 100003;
+ public static int EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS = 100004;
+ public static int EPE_RESULTNAME_CANNOT_BE_NULL = 100005;
+ public static int EPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL = 100006;
+ public static int EPE_ROLE_NOT_FOUND = 100007;
+
+ public static int ECV_NUMBER_NOT_MULTIPLE_OF_100 = 110001;
+ public static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD = 110002;
+ public static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_REMOVE = 110003;
+
+ public static int EDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS = 140001;
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/DefaultSample.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/DefaultSample.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/DefaultSample.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,70 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.test.validator;
+
+import org.equanda.validation.DefaultAdapter;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+
+/**
+ * This is used by the DefaultTest test-case
+ *
+ * @author NetRom team
+ */
+public class DefaultSample
+ extends DefaultAdapter
+{
+
+ public String getDefaultString()
+ {
+ return null;
+ }
+
+ public boolean getDefaultBoolean()
+ {
+ return false;
+ }
+
+ public Date getDefaultDate()
+ {
+ return null;
+ }
+
+ public Timestamp getDefaultTimestamp()
+ {
+ return null;
+ }
+
+ public int getDefaultInt()
+ {
+ return 1111;
+ }
+
+ public double getDefaultDouble()
+ {
+ return 0;
+ }
+}
\ No newline at end of file
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemDisplayer.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemDisplayer.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemDisplayer.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,42 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+
+package org.equanda.test.validator;
+
+import org.equanda.validation.HideIfAdapter;
+
+/**
+ * Implementation of HideIf, to always show items.
+ *
+ * @author Florin
+ */
+public class ItemDisplayer extends HideIfAdapter
+{
+ @Override
+ public boolean isHidden()
+ {
+ return false;
+ }
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemHiddener.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemHiddener.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/ItemHiddener.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,43 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+
+package org.equanda.test.validator;
+
+import org.equanda.validation.HideIfAdapter;
+
+/**
+ * Implementation of HideIf, to always hide items.
+ *
+ * @author Florin
+ */
+
+public class ItemHiddener extends HideIfAdapter
+{
+ @Override
+ public boolean isHidden()
+ {
+ return true;
+ }
+}
Added: trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/OtherChoices.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/OtherChoices.java (rev 0)
+++ trunk/equanda-test/test-test/src/test/java/be/equanda/test/validator/OtherChoices.java 2007-08-28 09:55:03 UTC (rev 52)
@@ -0,0 +1,91 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace...
[truncated message content] |
|
From: <tri...@us...> - 2007-08-28 09:46:03
|
Revision: 51
http://equanda.svn.sourceforge.net/equanda/?rev=51&view=rev
Author: triathlon98
Date: 2007-08-28 02:45:42 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build (partial)
Modified Paths:
--------------
trunk/pom.xml
Added Paths:
-----------
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-core/src/
trunk/equanda-test/test-core/src/main/
trunk/equanda-test/test-core/src/main/java/
trunk/equanda-test/test-ddltool/
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-gui-t4-test/
trunk/equanda-test/test-t4-ear/
trunk/equanda-test/test-t4-ear/pom.xml
trunk/equanda-test/test-t4-gui/
trunk/equanda-test/test-t4-gui/pom.xml
trunk/equanda-test/test-test/
Removed Paths:
-------------
trunk/equanda-test/src/equanda/equanda/
trunk/equanda-test/src/equanda/gui/
Added: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml (rev 0)
+++ trunk/equanda-test/pom.xml 2007-08-28 09:45:42 UTC (rev 51)
@@ -0,0 +1,220 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-test</artifactId>
+ <packaging>pom</packaging>
+
+ <version>0.8-SNAPSHOT</version>
+
+ <name>equanda-test</name>
+ <description>tests for equanda</description>
+ <modules>
+ <module>test-core</module>
+ <module>test-t4-gui</module>
+ <module>test-t4-ear</module>
+ <module>test-test</module>
+ <module>test-gui-t4-test</module>
+ </modules>
+ <url>http://equanda.org</url>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-gui</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-ear</artifactId>
+ <version>${project.version}</version>
+ <type>ear</type>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-tapestry4</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-t4-template</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.javolution</groupId>
+ <artifactId>javolution</artifactId>
+ <version>3.7.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-jdbc-wrapper</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <version>4.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>tapestry</groupId>
+ <artifactId>tapestry-prop</artifactId>
+ <version>0.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <profiles>
+ <!-- each profile contains properties used to start jboss and run selenium testcases
+ in order to activate the profile you must add to the maven command line the following :
+ -Dmachine=linux - to activate your profile
+ -Dselenium-tests - to run selenium tests cases
+ -Dstart-jboss - to start jboss from maven(it also automatically deploys the ear file)
+
+ note : if you run selenium test you'll need to change the RMI port of the jboss server (4444) because
+ the jetty used by the selenium server also uses it ... and I dont know of any way to change that one
+ so , in the '\conf\jboss-service.xml' file
+ replace this: <attribute name="RMIObjectPort">4444</attribute>
+ with this: <attribute name="RMIObjectPort">14444</attribute>
+ -->
+ <profile>
+ <id>config-win</id>
+ <activation>
+ <property>
+ <name>machine</name>
+ <value>win</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- jboss properties-->
+ <jboss.appserver.home>C:\java\synjboss</jboss.appserver.home>
+ <jboss.configuration>equanda</jboss.configuration>
+ <jboss.host>localhost</jboss.host>
+ <jboss.port>8080</jboss.port>
+ <jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </jboss.jvmargs>
+ <jboss.logging>medium</jboss.logging>
+ <!-- selenium properties-->
+ <firefox.path>C:\Program Files\Mozilla Firefox\firefox.exe</firefox.path>
+ <selenium.test.path>C:/equanda/src/test/resources/selenium</selenium.test.path>
+ </properties>
+ </profile>
+ <profile>
+ <id>config-linux</id>
+ <activation>
+ <property>
+ <name>machine</name>
+ <value>linux</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- jboss properties-->
+ <jboss.appserver.home>~/java/synjboss</jboss.appserver.home>
+ <jboss.configuration>equanda</jboss.configuration>
+ <jboss.host>localhost</jboss.host>
+ <jboss.port>8080</jboss.port>
+ <jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </jboss.jvmargs>
+ <jboss.logging>medium</jboss.logging>
+ <!-- selenium properties-->
+ <firefox.path>firefox</firefox.path>
+ <selenium.test.path>/home/tom/apps/java/equanda/equanda-test/test-t4-gui/src/test/resources/selenium</selenium.test.path>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
Added: trunk/equanda-test/test-core/pom.xml
===================================================================
--- trunk/equanda-test/test-core/pom.xml (rev 0)
+++ trunk/equanda-test/test-core/pom.xml 2007-08-28 09:45:42 UTC (rev 51)
@@ -0,0 +1,109 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-test</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-core</artifactId>
+ <packaging>jar</packaging>
+ <version>0.8-SNAPSHOT</version>
+ <name>test-core</name>
+ <description>test core</description>
+ <url>http://equanda.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <configuration>
+ <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <template>ejb3,import,login</template>
+ <verifyLanguages>en;nl</verifyLanguages>
+ <translateTarget>${basedir}/src/main/resources/translations.txt</translateTarget>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbosssx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.0.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml (rev 0)
+++ trunk/equanda-test/test-ddltool/pom.xml 2007-08-28 09:45:42 UTC (rev 51)
@@ -0,0 +1,106 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>equanda-test</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-ddltool</artifactId>
+ <packaging>jar</packaging>
+ <version>0.8-SNAPSHOT</version>
+ <name>test-ddltool</name>
+ <description>test ddltool</description>
+ <url>http://equanda.org</url>
+
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>!skip-ddltool</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-tool</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/classes
+ </outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/classes
+ </outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <configuration>
+ <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <template>ddltool</template>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-tool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/equanda-test/test-t4-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t4-ear/pom.xml (rev 0)
+++ trunk/equanda-test/test-t4-ear/pom.xml 2007-08-28 09:45:42 UTC (rev 51)
@@ -0,0 +1,118 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>equanda-test</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-ear</artifactId>
+ <packaging>ear</packaging>
+ <version>0.8-SNAPSHOT</version>
+ <name>test-ear</name>
+ <description>test ear</description>
+ <url>http://equanda.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayname>synergetics</displayname>
+ <description>
+ Synergetics Competency Analyser
+ </description>
+ <version>1.4</version>
+ <defaultJavaBundleDir>/lib</defaultJavaBundleDir>
+ <modules>
+ <javaModule>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-server</artifactId>
+ <bundleFileName>equanda-server.jar</bundleFileName>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ <bundleDir>/</bundleDir>
+ </javaModule>
+ <javaModule>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-core</artifactId>
+ <bundleFileName>test-core.jar</bundleFileName>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ <bundleDir>/</bundleDir>
+ </javaModule>
+ <webModule>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-gui</artifactId>
+ <bundleFileName>test-t4-gui.war</bundleFileName>
+ <contextRoot>/equanda</contextRoot>
+ </webModule>
+ <!-- exclude files which are either unneeded or part of jboss distro -->
+ <javaModule>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ <javaModule>
+ <groupId>eclipse</groupId>
+ <artifactId>jdtcore</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ <javaModule>
+ <groupId>net.sf.fscript</groupId>
+ <artifactId>fscript</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ <javaModule>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ <javaModule>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ <javaModule>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ </modules>
+ <jboss>
+ <version>4</version>
+ <security-domain>java:/jaas/equanda</security-domain>
+ <unauthenticated-principal>guest</unauthenticated-principal>
+ <loader-repository>equanda:app=ejb3</loader-repository>
+ </jboss>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-gui</artifactId>
+ <type>war</type>
+ </dependency>
+ <!-- need to include some dependencies explicitly (especially war dependencies) -->
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-tapestry4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>tapestry</groupId>
+ <artifactId>tapestry-prop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: trunk/equanda-test/test-t4-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t4-gui/pom.xml (rev 0)
+++ trunk/equanda-test/test-t4-gui/pom.xml 2007-08-28 09:45:42 UTC (rev 51)
@@ -0,0 +1,124 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>equanda-test</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-t4-gui</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>test-t4-gui</name>
+ <description>test gui</description>
+ <url>http://equanda.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <configuration>
+ <resources>true</resources>
+ <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <template>gui-descriptors</template>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <dependentWarExcludes>WEB-INF/web.xml,index.*</dependentWarExcludes>
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+ <!--<warSourceExcludes>WEB-INF/lib/a*,WEB-INF/lib/c*,WEB-INF/lib/f*,
+ WEB-INF/lib/i*,WEB-INF/lib/j*,WEB-INF/lib/o*,WEB-INF/lib/Uni*</warSourceExcludes>-->
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.equanda.test</groupId>
+ <artifactId>test-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-tapestry4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>tapestry</groupId>
+ <artifactId>tapestry-prop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-t4-template</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-maven-plugin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbosssx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.0.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-28 08:00:59 UTC (rev 50)
+++ trunk/pom.xml 2007-08-28 09:45:42 UTC (rev 51)
@@ -17,7 +17,7 @@
</description>
<inceptionYear>2007</inceptionYear>
- <url>http://equanda.be</url>
+ <url>http://equanda.org</url>
<licenses>
<license>
<name>MPL</name>
@@ -159,7 +159,7 @@
<artifactId>cobertura-maven-plugin</artifactId>
<!--<version>2.0</version>-->
<configuration>
- <instrumentation></instrumentation>
+ <instrumentation> </instrumentation>
</configuration>
</plugin>
</plugins>
@@ -394,68 +394,22 @@
</distributionManagement>
<profiles>
- <!-- each profile contains properties used to start jboss and run selenium testcases
- in order to activate the profile you must add to the maven command line the following :
- -Dmachine=linux - to activate your profile
- -Dselenium-tests - to run selenium tests cases
- -Dstart-jboss - to start jboss from maven(it also automatically deploys the ear file)
-
- note : if you run selenium test you'll need to change the RMI port of the jboss server (4444) because
- the jetty used by the selenium server also uses it ... and I dont know of any way to change that one
- so , in the '\conf\jboss-service.xml' file
- replace this: <attribute name="RMIObjectPort">4444</attribute>
- with this: <attribute name="RMIObjectPort">14444</attribute>
- -->
<profile>
- <id>config-win</id>
+ <!--
+ The test profile (activated by using "-Dtest") enables the build of the test application
+ and the running of the integration tests.
+ Including this will add "some" time to the build :-(
+ -->
+ <id>test</id>
<activation>
<property>
- <name>machine</name>
- <value>win</value>
+ <name>test</name>
</property>
</activation>
- <properties>
- <!-- jboss properties-->
- <jboss.appserver.home>C:\java\synjboss</jboss.appserver.home>
- <jboss.configuration>synergetics</jboss.configuration>
- <jboss.host>localhost</jboss.host>
- <jboss.port>8080</jboss.port>
- <jboss.jvmargs>
- -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
- -Dsun.rmi.dgc.client.gcInterval=3600000
- -Dsun.rmi.dgc.server.gcInterval=3600000
- </jboss.jvmargs>
- <jboss.logging>medium</jboss.logging>
- <!-- selenium properties-->
- <firefox.path>C:\Program Files\Mozilla Firefox\firefox.exe</firefox.path>
- <selenium.test.path>C:/synergetics/src/test/resources/selenium</selenium.test.path>
- </properties>
+ <modules>
+ <module>equanda-test</module>
+ </modules>
</profile>
- <profile>
- <id>config-linux</id>
- <activation>
- <property>
- <name>machine</name>
- <value>linux</value>
- </property>
- </activation>
- <properties>
- <!-- jboss properties-->
- <jboss.appserver.home>~/java/synjboss</jboss.appserver.home>
- <jboss.configuration>synergetics</jboss.configuration>
- <jboss.host>localhost</jboss.host>
- <jboss.port>8080</jboss.port>
- <jboss.jvmargs>
- -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
- -Dsun.rmi.dgc.client.gcInterval=3600000
- -Dsun.rmi.dgc.server.gcInterval=3600000
- </jboss.jvmargs>
- <jboss.logging>medium</jboss.logging>
- <!-- selenium properties-->
- <firefox.path>firefox</firefox.path>
- <selenium.test.path>/home/tom/apps/java/synergetics/synergetics-test/src/test/resources/selenium</selenium.test.path>
- </properties>
- </profile>
</profiles>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-28 08:01:06
|
Revision: 50
http://equanda.svn.sourceforge.net/equanda/?rev=50&view=rev
Author: triathlon98
Date: 2007-08-28 01:00:59 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
1783109 restructure tests to be part of maven build
Added Paths:
-----------
trunk/equanda-test/src/main/equanda/
trunk/equanda-test/src/main/java/
trunk/equanda-test/src/main/om/
trunk/equanda-test/src/main/om/Action.table
trunk/equanda-test/src/main/om/Airplane.table
trunk/equanda-test/src/main/om/AutoFields.table
trunk/equanda-test/src/main/om/BuilderSet.table
trunk/equanda-test/src/main/om/CalculatedFields.table
trunk/equanda-test/src/main/om/Car.table
trunk/equanda-test/src/main/om/Choices.table
trunk/equanda-test/src/main/om/Cloneable.table
trunk/equanda-test/src/main/om/CocoonMan.table
trunk/equanda-test/src/main/om/Compare.table
trunk/equanda-test/src/main/om/Default.table
trunk/equanda-test/src/main/om/Delegate.table
trunk/equanda-test/src/main/om/ExtractionOfValue.table
trunk/equanda-test/src/main/om/FootballPlayer.table
trunk/equanda-test/src/main/om/GetSetUsingValue.table
trunk/equanda-test/src/main/om/HideIf.table
trunk/equanda-test/src/main/om/HideIf2.table
trunk/equanda-test/src/main/om/ImmutableIfGlobal.table
trunk/equanda-test/src/main/om/ImmutableIfGlobalInherited.table
trunk/equanda-test/src/main/om/InternalFields.table
trunk/equanda-test/src/main/om/LazyInst.table
trunk/equanda-test/src/main/om/Linkable.table
trunk/equanda-test/src/main/om/Owner.table
trunk/equanda-test/src/main/om/Passport.table
trunk/equanda-test/src/main/om/Priority.table
trunk/equanda-test/src/main/om/PriorityFields.table
trunk/equanda-test/src/main/om/ProgrConstraints.table
trunk/equanda-test/src/main/om/ProgrConstraintsInherited.table
trunk/equanda-test/src/main/om/Remove.table
trunk/equanda-test/src/main/om/Remove2.table
trunk/equanda-test/src/main/om/RequiredFields.table
trunk/equanda-test/src/main/om/Secur.table
trunk/equanda-test/src/main/om/SelectorUpdate.table
trunk/equanda-test/src/main/om/StringMaxLen.table
trunk/equanda-test/src/main/om/SubSelect.table
trunk/equanda-test/src/main/om/UniqueFields.table
trunk/equanda-test/src/main/om/Vehicle.table
trunk/equanda-test/src/main/om/VehicleWithWheels.table
trunk/equanda-test/src/main/om/VehicleWithWings.table
trunk/equanda-test/src/main/om/VeryDocumented.table
trunk/equanda-test/src/main/om/include/
trunk/equanda-test/src/main/om/include/equanda/
trunk/equanda-test/src/main/om/include/equanda/alertFieldCause.xml
trunk/equanda-test/src/main/om/include/equanda/userLanguage.xml
trunk/equanda-test/src/main/om/test.xml
trunk/equanda-test/src/test/
trunk/equanda-test/src/test/java/
Removed Paths:
-------------
trunk/equanda-test/src/main/be/
trunk/equanda-test/src/main/equanda/equanda/
trunk/equanda-test/src/main/equanda/gui/
trunk/equanda-test/src/main/equanda/xejb/
Copied: trunk/equanda-test/src/main/equanda (from rev 49, trunk/equanda-test/src/equanda)
Added: trunk/equanda-test/src/main/om/Action.table
===================================================================
--- trunk/equanda-test/src/main/om/Action.table (rev 0)
+++ trunk/equanda-test/src/main/om/Action.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Action">
+ <page>
+ <field name="TheString" type="string">
+ <display/>
+ </field>
+ <field name="TheDate" type="date"/>
+ <field name="TheTime" type="timestamp"/>
+ <field name="TheBool" type="boolean"/>
+ <field name="TheInt" type="int"/>
+ <field name="TheDouble" type="double"/>
+ <field name="Passport" type="Passport"/>
+ <field name="MulStr">
+ <multiple/>
+ </field>
+ </page>
+ <select name="ByDate">
+ <selection field="TheDate"/>
+ </select>
+ <select name="SingleInt" type="single">
+ <selection field="TheInt"/>
+ </select>
+ <select name="Everything"/>
+
+ <action name="hashCode" return="int">
+ <parameter name="Phrase" type="String">
+ <description>aaaaaa</description>
+ <suggest value="55"/>
+ </parameter>
+ </action>
+
+ <action name="voidAction" return="void">
+ <parameter type="String"/>
+ <parameter type="int"/>
+ </action>
+
+ <action name="failingAction" return="void">
+ <description>this should fail</description>
+ <parameter type="String"/>
+ <parameter type="int"/>
+ </action>
+
+ <action name="addAction" return="void">
+ <description>Add a value in the TheInt field.</description>
+ <parameter type="int"/>
+ </action>
+
+ <action name="suggestValueAction" return="void">
+ <parameter type="String" name="Name">
+ <suggest value="xxx"/>
+ </parameter>
+
+ <parameter type="int" name="age">
+ <suggest value="11"/>
+ </parameter>
+
+ <parameter type="double" name='height'>
+ <suggest value="1.81"/>
+ </parameter>
+
+ <parameter type="java.sql.Date" name="Date of birth">
+ <suggest value="2002-01-01 0:0:0"/>
+ </parameter>
+
+ <parameter type="java.sql.Timestamp" name="Sometime">
+ <suggest value="2001-01-01 0:0:0"/>
+ </parameter>
+
+ <parameter type="boolean" name="Status">
+ <suggest value="false"/>
+ </parameter>
+ </action>
+
+ <action name="suggestValueListAction" return="void">
+ <parameter type="String" name="Name">
+ <suggest value-list="x,y,z"/>
+ </parameter>
+
+ <parameter type="int" name="age">
+ <suggest value-list="11,12,13"/>
+ </parameter>
+
+ <parameter type="double" name='height'>
+ <suggest value-list="1.81,1.82"/>
+ </parameter>
+
+ <parameter type="java.sql.Date" name="Date of birth">
+ <suggest value-list="2002-01-01 0:0:0,2002-01-01 0:0:0"/>
+ </parameter>
+
+ <parameter type="java.sql.Timestamp" name="Sometime">
+ <suggest value-list="2001-01-01 0:0:0,2001-02-01 0:0:0"/>
+ </parameter>
+
+ <parameter type="boolean" name="Status">
+ <suggest value-list="false,true"/>
+ </parameter>
+ </action>
+
+ <action name="suggestFieldAction" return="void">
+ <parameter type="String" name="Name">
+ <suggest field="TheString"/>
+ </parameter>
+
+ <parameter type="int" name="age">
+ <suggest field="TheInt"/>
+ </parameter>
+
+ <parameter type="double" name='height'>
+ <suggest field="TheDouble"/>
+ </parameter>
+
+ <parameter type="java.sql.Date" name="Date of birth">
+ <suggest field="TheDate"/>
+ </parameter>
+
+ <parameter type="java.sql.Timestamp" name="Sometime">
+ <suggest field="TheTime"/>
+ </parameter>
+
+ <parameter type="boolean" name="Status">
+ <suggest field="TheBool"/>
+ </parameter>
+ </action>
+
+ <action name="suggestPathAction" return="void">
+ <parameter type="String" name="Name">
+ <suggest path="Passport" field="Identifier"/>
+ </parameter>
+ </action>
+
+ <action name="suggestTableAction" return="void">
+ <parameter type="String" name="Name">
+ <suggest table="Passport" field="Identifier"/>
+ </parameter>
+ </action>
+
+</table>
Added: trunk/equanda-test/src/main/om/Airplane.table
===================================================================
--- trunk/equanda-test/src/main/om/Airplane.table (rev 0)
+++ trunk/equanda-test/src/main/om/Airplane.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Airplane" type="AIRP">
+
+ <template parent="VehicleWithWings"/>
+ <template parent="VehicleWithWheels"/>
+
+ <page>
+
+ <field name="Radius" type="int"/>
+
+ </page>
+
+</table>
Added: trunk/equanda-test/src/main/om/AutoFields.table
===================================================================
--- trunk/equanda-test/src/main/om/AutoFields.table (rev 0)
+++ trunk/equanda-test/src/main/om/AutoFields.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="AutoFields">
+ <page>
+ <field name="AutoInt" type="int">
+ <auto/>
+ <display/>
+ </field>
+
+ <field name="Extra" type="string" length="30">
+ <display/>
+ </field>
+
+ <field name="Passport" type="Passport">
+ <auto/>
+ </field>
+
+ <field name="MultipleAuto">
+ <multiple/>
+ <auto/>
+ </field>
+
+ <field name="MultiplePassport" type="Passport">
+ <multiple/>
+ <auto/>
+ </field>
+
+
+ </page>
+
+ <select name="AutoInt">
+ <selection field="AutoInt"/>
+ </select>
+</table>
Added: trunk/equanda-test/src/main/om/BuilderSet.table
===================================================================
--- trunk/equanda-test/src/main/om/BuilderSet.table (rev 0)
+++ trunk/equanda-test/src/main/om/BuilderSet.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="BuilderSet">
+ <page>
+ <field name="TestInt" type="int">
+ <display/>
+ </field>
+ </page>
+ <build name="TestBuild">
+ <set field="TestInt">1</set>
+ </build>
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/CalculatedFields.table
===================================================================
--- trunk/equanda-test/src/main/om/CalculatedFields.table (rev 0)
+++ trunk/equanda-test/src/main/om/CalculatedFields.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="CalculatedFields">
+ <page>
+ <field name="CalculatedInt" type="int">
+ <calculated/>
+ <display/>
+ </field>
+ <field name="Extra" type="string" length="30">
+ <display/>
+ </field>
+ </page>
+
+ <select name="Extra">
+ <selection field="Extra"/>
+ </select>
+</table>
Added: trunk/equanda-test/src/main/om/Car.table
===================================================================
--- trunk/equanda-test/src/main/om/Car.table (rev 0)
+++ trunk/equanda-test/src/main/om/Car.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Car">
+ <security-role-remove>LocalUser</security-role-remove>
+ <page>
+ <field name="Owners" type="Owner">
+ <link-name>PeopleWithCars</link-name>
+ <multiple/>
+ <display/>
+ </field>
+
+ <field name="Fans" type="Owner">
+ <link-name>FanCar</link-name>
+ <multiple/>
+ <display/>
+ </field>
+
+ <field name="Brand" type="string" length="30">
+ <constraints>
+ <immutable/>
+ <unique/>
+ <required/>
+ </constraints>
+ <is-reference/>
+ <display/>
+ </field>
+
+ <field name="ExtraUnique" type="string" length="30">
+ <constraints>
+ <unique/>
+ </constraints>
+ <is-description/>
+ <display/>
+ </field>
+
+ <field name="Extra" type="string" length="20">
+ <display/>
+ </field>
+ </page>
+
+ <cloneable/>
+
+ <select name="Brand" type="single">
+ <selection field="Brand"/>
+ </select>
+
+ <select name="Extra">
+ <selection field="Extra"/>
+ </select>
+
+ <select name="CarBothExtra">
+ <selection field="ExtraUnique"/>
+ <selection field="Extra"/>
+ </select>
+
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/Choices.table
===================================================================
--- trunk/equanda-test/src/main/om/Choices.table (rev 0)
+++ trunk/equanda-test/src/main/om/Choices.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Choices">
+
+ <page>
+
+ <field name="Season" type="string" length="20">
+ <choice name="SEASON_WINTER" value="Winter">
+ <description>Winter</description>
+ </choice>
+ <choice name="SEASON_SPRING" value="Spring">
+ <description>Spring</description>
+ </choice>
+ <choice name="SEASON_SUMMER" value="Summer">
+ <description>Summer</description>
+ </choice>
+ <choice name="SEASON_AUTOMN" value="Automn">
+ <description>Autumn</description>
+ </choice>
+ <choice class="org.equanda.test.validator.OtherChoices">
+ <description>Class with choices</description>
+ </choice>
+ <display/>
+ </field>
+ <field name="MonitorSize" type="int">
+ <choice name="MONITOR_SIZE_SMALL" value="15"/>
+ <choice name="MONITOR_SIZE_MEDIUM" value="17"/>
+ <choice name="MONITOR_SIZE_BIG" value="21"/>
+ <choice class="org.equanda.test.validator.OtherChoices"/>
+ <display/>
+ </field>
+ <field name="ImmutableWeight" type="int">
+ <choice name="WEIGHT_SMALL" value="50"/>
+ <choice name="WEIGHT_BIG" value="100"/>
+ <constraints>
+ <immutable/>
+ </constraints>
+ </field>
+ <field name="ImmutableName" type="string">
+ <choice class="org.equanda.test.validator.OtherChoices"/>
+ <constraints>
+ <immutable/>
+ </constraints>
+ </field>
+ <field name="Countries" singular="Country" type="string">
+ <choice name="COUNTRY_USA" value="usa"></choice>
+ <choice name="COUNTRY_NZ" value="new zealand"></choice>
+ <choice name="COUNTRY_AUS" value="australia"></choice>
+ <multiple></multiple>
+ </field>
+
+ <field name="Country2Letter" type="string" length="2">
+ <description>
+ Simple field with 2 letter ISO country code.
+ </description>
+ <choice class="org.equanda.validation.ISOCountry2Letter"/>
+ </field>
+ <field name="Country3Letter" type="string" length="3">
+ <description>
+ Simple field with 3 letter ISO country code.
+ </description>
+ <choice class="org.equanda.validation.ISOCountry3Letter"/>
+ </field>
+ <field name="Country3LetterShortField" type="string" length="2">
+ <description>
+ Simple field with 3 letter ISO country code, but for which the string field is too short
+ which should make it impossible to store a valid value.
+ </description>
+ <choice class="org.equanda.validation.ISOCountry3Letter"/>
+ </field>
+ <field name="CountryCodeString" type="string" length="3">
+ <description>
+ Simple field with a numeric ISO country code, stored as string.
+ </description>
+ <choice class="org.equanda.validation.ISOCountryCode"/>
+ </field>
+ <field name="CountryCodeValue" type="int">
+ <description>
+ Simple field with a numeric ISO country code, stored as an integer.
+ </description>
+ <choice class="org.equanda.validation.ISOCountryCode"/>
+ </field>
+
+
+ </page>
+
+</table>
Added: trunk/equanda-test/src/main/om/Cloneable.table
===================================================================
--- trunk/equanda-test/src/main/om/Cloneable.table (rev 0)
+++ trunk/equanda-test/src/main/om/Cloneable.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Cloneable">
+ <page>
+ <field name="TestStringCloneable" type="string" length="10">
+ <display/>
+ </field>
+ <field name="TestStringNotCloneable" type="string" length="10">
+ <not-cloneable/>
+ </field>
+ <field name="TestMultipleString" type="string" length="10">
+ <multiple/>
+ </field>
+ <field name="TestCarLink" type="Car" />
+ <field name="TestCarLinkValueInclude" type="Car">
+ </field>
+ <field name="TestCarMultipleLink" type="Car">
+ <multiple/>
+ </field>
+ <field name="TestValueIncludeCarMultipleLink" type="Car">
+ <multiple/>
+ </field>
+ </page>
+ <cloneable/>
+ <select name="Everything"/>
+</table>
Added: trunk/equanda-test/src/main/om/CocoonMan.table
===================================================================
--- trunk/equanda-test/src/main/om/CocoonMan.table (rev 0)
+++ trunk/equanda-test/src/main/om/CocoonMan.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="CocoonMan" category="CocoonMan">
+ <security-role-remove>LocalUser</security-role-remove>
+ <page>
+ <field name="FirstName" type="string" length="20">
+ <display/>
+ <case value="upper"/>
+ </field>
+ <field name="LastName" type="string" length="15">
+ <display/>
+ </field>
+ <field name="DateOfBirth" type="date"/>
+ <field name="Sometime" type="timestamp" renderer="time,display=hms"/>
+ <field name="Employed" type="boolean"/>
+ <field name="Height" type="double" length="10" display-length="5"/>
+ <field name="NoOfChildren" type="int" display-length="3"/>
+ <field name="PreviousJobs" type="string" length="30">
+ <multiple/>
+ </field>
+ <field name="DatesToRemember" type="date">
+ <multiple/>
+ </field>
+ <field name="Car" type="Car">
+ <description>
+ an ajax select link
+ </description>
+ </field>
+ <field name="HiddenInt" type="int">
+ <hide/>
+ </field>
+ <field name="HiddenCar" type="Car">
+ <hide/>
+ </field>
+ <field name="ManyCars" type="Car">
+ <multiple/>
+ </field>
+ <field name="Blob" type="blob">
+ </field>
+ <field name="Clob" type="clob" renderer="text,lines=8,cols=50">
+ </field>
+ <field name="BlobMultiple" type="blob">
+ <multiple/>
+ </field>
+
+ <field name="ClobMultiple" type="clob" renderer="text,lines=8,cols=50">
+ <multiple/>
+ </field>
+
+ <field name="WikiString" type="string" renderer="wiki,lines=8,cols=10"/>
+ <field name="WikiClob" type="clob" renderer="wiki,lines=8,cols=50"/>
+ <field name="WikiMultipleClob" type="clob" renderer="wiki,lines=8,cols=50">
+ <multiple/>
+ </field>
+
+ <field name="Passport" type="Passport">
+ <description>
+ a button select link
+ </description>
+ </field>
+ <field name="Ats" type="equandaAttachment">
+ <embedded/>
+ </field>
+
+ <field name="Atm" type="equandaAttachment">
+ <embedded/>
+ <multiple/>
+ </field>
+
+ <field name="LazyInst" type="LazyInst">
+ <description>
+ a combobox link
+ </description>
+ </field>
+ </page>
+ <select name="PersonByName">
+ <selection field="FirstName"/>
+ <selection field="LastName"/>
+ </select>
+ <select name="PersonByLastName">
+ <selection field="LastName"/>
+ </select>
+ <select name="PersonByBirthdate">
+ <selection field="DateOfBirth"/>
+ </select>
+ <select name="PersonByStatus">
+ <selection field="Employed"/>
+ </select>
+ <select name="PersonByHeight">
+ <selection field="Height"/>
+ </select>
+ <select name="PersonByTimestamp">
+ <selection field="Sometime"/>
+ </select>
+
+ <select name="SelectWithLimit" limit="yes">
+ <selection field="Employed"/>
+ </select>
+
+ <select name="SelectionsWithSuggests">
+ <selection field="FirstName">
+ <suggest value="x"/>
+ </selection>
+ <selection field="LastName">
+ <suggest value="x"/>
+ </selection>
+ <selection field="Employed">
+ <suggest value="true"/>
+ </selection>
+ <selection field="DateOfBirth">
+ <suggest value="2002-01-01 0:0:0"/>
+ </selection>
+ <selection field="Height">
+ <suggest value="1.80"/>
+ </selection>
+ <selection field="Sometime">
+ <suggest value="2002-01-01 0:0:0"/>
+ </selection>
+ <selection field="NoOfChildren">
+ <suggest value="0"/>
+ </selection>
+ </select>
+
+ <select name="SelectionsWithValueListSuggests">
+ <selection field="FirstName">
+ <suggest value-list="x,y,z"/>
+ </selection>
+ <selection field="LastName">
+ <suggest value-list="x,1,2"/>
+ </selection>
+ <selection field="Employed">
+ <suggest value-list="true, false"/>
+ </selection>
+ <selection field="DateOfBirth">
+ <suggest value-list="2002-01-01 00:00:00,2003-01-01 00:00:00"/>
+ </selection>
+ <selection field="Height">
+ <suggest value-list="1.80, 1.85,1.90"/>
+ </selection>
+ <selection field="Sometime">
+ <suggest value-list="2002-01-01 00:00:00,2002-02-01 00:00:00"/>
+ </selection>
+ <selection field="NoOfChildren">
+ <suggest value-list="0,1,2,3,4"/>
+ </selection>
+ </select>
+
+ <action name="TestAction" return="void">
+ </action>
+</table>
Added: trunk/equanda-test/src/main/om/Compare.table
===================================================================
--- trunk/equanda-test/src/main/om/Compare.table (rev 0)
+++ trunk/equanda-test/src/main/om/Compare.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Compare">
+ <page>
+ <field name="Bool1" type="boolean">
+ <constraints>
+ <compare test="=" value="false"/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="Int1" type="int">
+ <constraints>
+ <compare test="<=" value="100"/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="Double1" type="double">
+ <constraints>
+ <compare test="=" value="1.2"/>
+ </constraints>
+ </field>
+
+ <field name="Str1" type="string" length="10">
+ <constraints>
+ <compare test=">" value="aaa"/>
+ </constraints>
+ </field>
+
+ <field name="Dat1" type="date">
+ <constraints>
+ <compare test=">=" value="2001-01-01 0:0:0"/>
+ </constraints>
+ </field>
+
+ <field name="Time1" type="timestamp">
+ <constraints>
+ <compare test="<" value="2010-01-01 0:0:0"/>
+ </constraints>
+ </field>
+
+ <field name="Bool2" type="boolean"/>
+ <field name="Int2" type="int"/>
+ <field name="Double2" type="double"/>
+ <field name="Str2" type="string" length="11"/>
+ <field name="Dat2" type="date"/>
+ <field name="Time2" type="timestamp"/>
+
+ <field name="DateFuture" type="date">
+ <constraints>
+ <compare test=">=" value="TOMORROW"/>
+ </constraints>
+ </field>
+
+ <field name="TimePast" type="timestamp">
+ <constraints>
+ <compare test="<" value="NOW"/>
+ </constraints>
+ </field>
+
+ <field name="TestImmutableInt" type="int">
+ <constraints>
+ <immutable/>
+ <compare test="<" value="10"/>
+ </constraints>
+ </field>
+
+ <field name="TestImmutableDouble" type="double">
+ <constraints>
+ <immutable/>
+ <compare test="=" value="1"/>
+ </constraints>
+ </field>
+
+ </page>
+ <constraints>
+ <compare left="Bool2" test="=" right="Bool1"/>
+ <compare left="Int2" test="<" right="Int1"/>
+ <compare left="Double2" test=">=" right="Double1"/>
+ <compare left="Str2" test="<=" right="Str1"/>
+ <compare left="Dat2" test=">" right="Dat1"/>
+ <compare left="Time2" test="!=" right="Time1"/>
+ </constraints>
+
+
+</table>
Added: trunk/equanda-test/src/main/om/Default.table
===================================================================
--- trunk/equanda-test/src/main/om/Default.table (rev 0)
+++ trunk/equanda-test/src/main/om/Default.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Default">
+ <page>
+ <field name="TestStringDefault10" type="string">
+ <default>"10"</default>
+ <display/>
+ </field>
+ <field name="TestIntDefault100" type="int">
+ <default>100</default>
+ <display/>
+ </field>
+ <field name="TestInt" type="int"/>
+ <field name="TestDateDefaultNow" type="date">
+ <default>NOW</default>
+ <display/>
+ </field>
+ <field name="TestDate" type="date"/>
+ <field name="TestIntDefaultAuto" type="int">
+ <default type="auto"/>
+ <display/>
+ </field>
+ <field name="TestBlob" type="blob">
+ <default>"BlobDefault"</default>
+ </field>
+ <field name="TestClob" type="clob">
+ <default>"ClobDefault"</default>
+ </field>
+ <field name="TestIntDefaultClass" type="int">
+ <default type="class">org.equanda.test.validator.DefaultSample</default>
+ <display/>
+ </field>
+ </page>
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/Delegate.table
===================================================================
--- trunk/equanda-test/src/main/om/Delegate.table (rev 0)
+++ trunk/equanda-test/src/main/om/Delegate.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Delegate">
+ <page>
+ <field name="TestStr" type="string" length="10">
+ <constraints>
+ <value-when-null field="TestStrDelegate"/>
+ </constraints>
+ <display/>
+ </field>
+ <field name="TestStrDelegate" type="string" length="14"/>
+
+ <field name="TestDate" type="date">
+ <constraints>
+ <value-when-null field="TestDateDelegate"/>
+ </constraints>
+ <display/>
+ </field>
+ <field name="TestDateDelegate" type="date"/>
+
+ <field name="TestTimestamp" type="timestamp">
+ <constraints>
+ <value-when-null field="TestTimestampDelegate"/>
+ </constraints>
+ </field>
+ <field name="TestTimestampDelegate" type="timestamp"/>
+ <field name="Link1" type="Linkable"></field>
+ <field name="Link2" type="Linkable">
+ <constraints>
+ <value-when-null field="Link1"/>
+ </constraints>
+ </field>
+
+ <field name="Name">
+ <constraints>
+ <value-when-null field="Name" path="Link1"/>
+ </constraints>
+ </field>
+
+ <field name="Passport" type="Passport">
+ <constraints>
+ <value-when-null field="Passport" path="Link1"/>
+ </constraints>
+ </field>
+
+ </page>
+</table>
Added: trunk/equanda-test/src/main/om/ExtractionOfValue.table
===================================================================
--- trunk/equanda-test/src/main/om/ExtractionOfValue.table (rev 0)
+++ trunk/equanda-test/src/main/om/ExtractionOfValue.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="ExtractionOfValue">
+ <page>
+ <field name="TestInt" type="int">
+ <display/>
+ </field>
+ <field name="TestStr" type="string" length="10">
+ <display/>
+ </field>
+ <field name="TestDate" type="date">
+ <display/>
+ </field>
+ </page>
+</table>
Added: trunk/equanda-test/src/main/om/FootballPlayer.table
===================================================================
--- trunk/equanda-test/src/main/om/FootballPlayer.table (rev 0)
+++ trunk/equanda-test/src/main/om/FootballPlayer.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="FootballPlayer">
+ <security-role-remove>LocalUser,AdminUser</security-role-remove>
+ <data-filter>GoalkeepersFilter,DefendersFilter,MidfieldersFilter,StrikersFilter,GoalkeepersHideFilter,DefendersHideFilter,MidfieldersHideFilter,StrikersHideFilters</data-filter>
+ <page>
+ <field name="Name" type="string">
+ <display/>
+ </field>
+ <field name="Goalkeeper" type="boolean"/>
+ <field name="Defender" type="boolean"/>
+ <field name="Midfielder" type="boolean"/>
+ <field name="Striker" type="boolean"/>
+ </page>
+ <select name="All" order="EQUANDA_MODIFIED"/>
+ <select name="FieldPlayers">
+ <description>This will be hidden if GoalkeepersHideFilter is set</description>
+ <view-filter>GoalkeepersHideFilter</view-filter>
+ </select>
+ <select name="DefensePlayers">
+ <description>This will be hidden in GUI if MidfieldersHideFilter or StrikersHideFilters is set</description>
+ <view-filter>MidfieldersHideFilter,StrikersHideFilters</view-filter>
+ </select>
+</table>
Added: trunk/equanda-test/src/main/om/GetSetUsingValue.table
===================================================================
--- trunk/equanda-test/src/main/om/GetSetUsingValue.table (rev 0)
+++ trunk/equanda-test/src/main/om/GetSetUsingValue.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="GetSetUsingValue">
+ <page>
+ <field name="TestInt" type="int">
+ <display/>
+ </field>
+ <field name="TestStr" type="string" length="10">
+ <display/>
+ </field>
+ <field name="TestDate" type="date"/>
+ </page>
+</table>
Added: trunk/equanda-test/src/main/om/HideIf.table
===================================================================
--- trunk/equanda-test/src/main/om/HideIf.table (rev 0)
+++ trunk/equanda-test/src/main/om/HideIf.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="HideIf">
+ <description>
+ A table for the Selenium testcases for hide if
+ Should be visible, but some items of it should be hidden
+ </description>
+ <hide if-class="org.equanda.test.validator.ItemDisplayer"/>
+ <page name="PageShow">
+ <hide if-class="org.equanda.test.validator.ItemDisplayer"/>
+ <group name="GroupShow">
+ <hide if-class="org.equanda.test.validator.ItemDisplayer"/>
+ <field name="UselessField1">
+ <description>
+ Added a field to make sure the group is not hidden because it's empty
+ </description>
+ </field>
+ </group>
+ <group name="GroupHideIf">
+ <hide if-class="org.equanda.test.validator.ItemHiddener"/>
+ <field name="UselessField2">
+ <description>
+ Added a field to make sure the group is not hidden because it's empty
+ </description>
+ </field>
+ </group>
+ <group name="GroupHide">
+ <hide/>
+ <field name="UselessField3">
+ <description>
+ Added a field to make sure the group is not hidden because it's empty
+ </description>
+ </field>
+ </group>
+ <field name="FieldShow"><hide if-class="org.equanda.test.validator.ItemDisplayer"/></field>
+ <field name="FieldHideIf"><hide if-class="org.equanda.test.validator.ItemHiddener"/></field>
+ <field name="FieldHide"><hide/></field>
+ </page>
+ <page name="PageHideIf">
+ <hide if-class="org.equanda.test.validator.ItemHiddener"/>
+ </page>
+ <page name="PageHide">
+ <hide/>
+ </page>
+ <select name="SelectShow"><hide if-class="org.equanda.test.validator.ItemDisplayer"/></select>
+ <select name="SelectHideIf"><hide if-class="org.equanda.test.validator.ItemHiddener"/></select>
+ <select name="SelectHide"><hide/></select>
+ <action name="ActionShow" return="void"><hide if-class="org.equanda.test.validator.ItemDisplayer"/></action>
+ <action name="ActionHideIf" return="void"><hide if-class="org.equanda.test.validator.ItemHiddener"/></action>
+ <action name="ActionHide" return="void"><hide/></action>
+</table>
Added: trunk/equanda-test/src/main/om/HideIf2.table
===================================================================
--- trunk/equanda-test/src/main/om/HideIf2.table (rev 0)
+++ trunk/equanda-test/src/main/om/HideIf2.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="HideIf2">
+ <hide if-class="org.equanda.test.validator.ItemHiddener"/>
+ <description>
+ A table for the Selenium testcases for hide if (should be invisible)
+ </description>
+</table>
Added: trunk/equanda-test/src/main/om/ImmutableIfGlobal.table
===================================================================
--- trunk/equanda-test/src/main/om/ImmutableIfGlobal.table (rev 0)
+++ trunk/equanda-test/src/main/om/ImmutableIfGlobal.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="ImmutableIfGlobal">
+
+ <page>
+ <field name="Locked" type="boolean">
+ <not-cloneable/>
+ <constraints>
+ <mutable-even-if field="Locked2"/>
+ </constraints>
+ <display/>
+ </field>
+ <field name="Locked2" type="boolean">
+ <not-cloneable/>
+ <constraints>
+ <mutable-even-if field="Locked"/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="Name" type="string" length="40">
+ <display/>
+ </field>
+
+ <field name="Free" type="string" length="10">
+ <constraints>
+ <mutable-even-if field="Locked"/>
+ </constraints>
+ </field>
+
+ <field name="Release" type="boolean"/>
+ <field name="Released" length="10">
+ <constraints>
+ <mutable-even-if field="Locked" when="Release"/>
+ </constraints>
+ </field>
+
+ <field name="FreeChild" type="string" length="10">
+ <constraints>
+ <mutable-even-if field="Locked3" when="Release"/>
+ </constraints>
+ </field>
+
+ <field name="ChildLock" type="string" length="10">
+ <constraints>
+ <immutable-if field="Locked4"/>
+ </constraints>
+ </field>
+
+ </page>
+
+ <constraints>
+ <immutable-if field="Locked"/>
+ <immutable-if field="Locked2"/>
+ <immutable-if field="Locked3"/>
+ </constraints>
+
+</table>
Added: trunk/equanda-test/src/main/om/ImmutableIfGlobalInherited.table
===================================================================
--- trunk/equanda-test/src/main/om/ImmutableIfGlobalInherited.table (rev 0)
+++ trunk/equanda-test/src/main/om/ImmutableIfGlobalInherited.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="ImmutableIfGlobalInherited" type="IIGI">
+
+ <template parent="ImmutableIfGlobal"/>
+
+ <page>
+
+ <field name="Name2" type="string" length="40"/>
+
+ <field name="Free2" type="string" length="10" >
+ <constraints>
+ <mutable-even-if field="Locked"/>
+ </constraints>
+ </field>
+
+ <field name="Locked3" type="boolean"/>
+
+ <field name="Locked4" type="boolean"/>
+
+ </page>
+
+</table>
Added: trunk/equanda-test/src/main/om/InternalFields.table
===================================================================
--- trunk/equanda-test/src/main/om/InternalFields.table (rev 0)
+++ trunk/equanda-test/src/main/om/InternalFields.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="InternalFields">
+ <page>
+ <field name="InternalBool" type="boolean">
+ <internal/>
+ </field>
+
+ <field name="Extra" type="string" length="30">
+ <display/>
+ </field>
+ </page>
+
+ <select name="Extra">
+ <selection field="Extra"/>
+ </select>
+</table>
Added: trunk/equanda-test/src/main/om/LazyInst.table
===================================================================
--- trunk/equanda-test/src/main/om/LazyInst.table (rev 0)
+++ trunk/equanda-test/src/main/om/LazyInst.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="LazyInst" expected-amount="small">
+ <security-role-remove>LocalUser, LocalAdmin</security-role-remove>
+ <page>
+ <field name="TestInt" type="int">
+ <display/>
+ </field>
+
+ <field name="Owner" type="Owner">
+ <link-name>LinkEmbedded</link-name>
+ </field>
+
+ <field name="AnotherOwner" type="Owner">
+ <link-name>LinkEmbeddedMul</link-name>
+ </field>
+ </page>
+ <select name="TestInt">
+ <selection field="TestInt"/>
+ </select>
+ <select name="AllOrdered" order="TestInt"/>
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/Linkable.table
===================================================================
--- trunk/equanda-test/src/main/om/Linkable.table (rev 0)
+++ trunk/equanda-test/src/main/om/Linkable.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Linkable">
+ <security-role-remove>LocalUser</security-role-remove>
+ <page>
+ <field name="Name">
+ <display/>
+ </field>
+ <field name="MultipleRemove" type="Remove">
+ <link-name>test</link-name>
+ <multiple/>
+ </field>
+ <field name="Passport" type="Passport"/>
+ <field name="SingleRemove2" type="Remove">
+ <link-name>test2</link-name>
+ </field>
+ <field name="MultipleRemove3" type="Remove">
+ <link-name>test3</link-name>
+ <multiple/>
+ </field>
+ <field name="MultipleRemove4" type="Remove">
+ <link-name>test4</link-name>
+ <multiple/>
+ </field>
+ <field name="SingleBidirectional" type="Remove2">
+ <owner/>
+ <link-name>test5</link-name>
+ </field>
+ <field name="SingleKeep" type="Remove2"/>
+ <field name="SingleBiOverride" type="Remove2">
+ <allow-delete/>
+ <link-name>test6</link-name>
+ </field>
+ <field name="OtherSideCallFacade" type="Remove2">
+ <link-name>test7</link-name>
+ <other-side-multiple/>
+ <owner/>
+ </field>
+ <field name="OtherSideCallFacadeMultiple" type="Remove2">
+ <link-name>test8</link-name>
+ <other-side-multiple/>
+ <multiple/>
+ <owner/>
+ </field>
+ </page>
+
+ <select name="Everything"/>
+
+ <select name="Name">
+ <selection field="Name"/>
+ </select>
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/Owner.table
===================================================================
--- trunk/equanda-test/src/main/om/Owner.table (rev 0)
+++ trunk/equanda-test/src/main/om/Owner.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Owner">
+ <security-role-remove>LocalUser</security-role-remove>
+ <page>
+ <field name="DreamCar" type="string">
+ <suggest table="Car" field="Brand"/>
+ </field>
+
+ <field name="GarageCars" type="string">
+ <suggest table="Car" field="Brand"/>
+ <multiple/>
+ </field>
+
+ <field name="Cars" type="Car">
+ <link-name>PeopleWithCars</link-name>
+ <multiple/>
+ </field>
+
+ <field name="PreferedCar" type="Car">
+ <link-name>FanCar</link-name>
+ </field>
+
+ <field name="CarsWichHeLikes" type="Car">
+ <multiple/>
+ <other-side-multiple/>
+ </field>
+
+ <field name="Name" type="string" length="50">
+ <constraints>
+ <unique/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="Passport" type="Passport">
+ <link-name>PeopleWithPassports</link-name>
+ </field>
+
+ <field name="LazyInstEmbeddedBi" type="LazyInst">
+ <link-name>LinkEmbedded</link-name>
+ <owner/>
+ <embedded/>
+ </field>
+
+ <field name="LazyInstEmbedded" type="LazyInst">
+ <embedded/>
+ </field>
+
+ <field name="LazyInstEmbeddedMulBi" type="LazyInst">
+ <link-name>LinkEmbeddedMul</link-name>
+ <multiple/>
+ <embedded/>
+ </field>
+
+ <field name="LazyInstEmbeddedMul" type="LazyInst">
+ <multiple/>
+ <embedded/>
+ </field>
+
+ <field name="GarageCount" type="int"/>
+ <field name="GarageM2" type="double"/>
+ <field name="LicencePlate" type="string" length="12">
+ <multiple/>
+ </field>
+
+ </page>
+
+ <select name="Name" type="single">
+ <selection field="Name"/>
+ </select>
+ <select name="SinglePreferedCar" type="single">
+ <selection table="Car" field="Brand" path="preferedCar"/>
+ </select>
+
+ <select name="MorePreferedCar">
+ <selection table="Car" field="Brand" path="preferedCar"/>
+ <selection field="Name"/>
+ </select>
+</table>
Added: trunk/equanda-test/src/main/om/Passport.table
===================================================================
--- trunk/equanda-test/src/main/om/Passport.table (rev 0)
+++ trunk/equanda-test/src/main/om/Passport.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Passport">
+ <security-role-remove>LocalUser</security-role-remove>
+ <page>
+ <field name="Owner" type="Owner">
+ <link-name>PeopleWithPassports</link-name>
+ </field>
+ <field name="Identifier" type="string">
+ <constraints>
+ <unique/>
+ </constraints>
+ <display/>
+ </field>
+ </page>
+ <select name="Everything"/>
+ <select name="Identifier" type="single">
+ <selection field="Identifier"/>
+ </select>
+</table>
Added: trunk/equanda-test/src/main/om/Priority.table
===================================================================
--- trunk/equanda-test/src/main/om/Priority.table (rev 0)
+++ trunk/equanda-test/src/main/om/Priority.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<table name="Priority">
+
+ <security-role-remove>LocalUser</security-role-remove>
+
+ <page>
+
+ <field name="Identifier" type="int" priority="0">
+ <display/>
+ </field>
+
+ <field name="Field1" type="boolean" priority="8">
+ <display/>
+ </field>
+
+ <field name="Field2" type="boolean">
+ <constraints>
+ <immutable-if field="Field1"/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="Field3" type="boolean" priority="1">
+ <constraints>
+ <immutable-if field="Field1"/>
+ <immutable-if field="Field2"/>
+ <immutable-if field="Field4"/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="Field4" type="boolean" priority="3">
+ <constraints>
+ <immutable-if field="Field1"/>
+ <immutable-if field="Field2"/>
+ </constraints>
+ <display/>
+ </field>
+
+ </page>
+
+ <select name="All">
+ <description></description>
+ </select>
+
+</table>
Added: trunk/equanda-test/src/main/om/PriorityFields.table
===================================================================
--- trunk/equanda-test/src/main/om/PriorityFields.table (rev 0)
+++ trunk/equanda-test/src/main/om/PriorityFields.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<table name="PriorityFields">
+
+ <security-role-remove>LocalUser</security-role-remove>
+
+ <page>
+
+ <field name="Field0" type="boolean" priority="0">
+ <display/>
+ </field>
+ <field name="Field7" type="boolean" priority="7">
+ <display/>
+ </field>
+ <field name="Field9" type="boolean" priority="9">
+ <display/>
+ </field>
+ <field name="Field3" type="boolean" priority="3">
+ <display/>
+ </field>
+ <field name="Field6" type="boolean" priority="6">
+ <display/>
+ </field>
+ <field name="Field1" type="boolean" priority="1">
+ <display/>
+ </field>
+ <field name="Field2" type="boolean" priority="2">
+ <display/>
+ </field>
+ <field name="Field5" type="boolean" priority="5">
+ <display/>
+ </field>
+ <field name="Field8" type="boolean" priority="8">
+ <display/>
+ </field>
+ <field name="Field4" type="boolean" priority="4">
+ <display/>
+ </field>
+
+ <field name="Test" priority="5">
+
+ <display/>
+ </field>
+
+
+ </page>
+
+ <select name="All">
+ <description></description>
+ </select>
+
+</table>
Added: trunk/equanda-test/src/main/om/ProgrConstraints.table
===================================================================
--- trunk/equanda-test/src/main/om/ProgrConstraints.table (rev 0)
+++ trunk/equanda-test/src/main/om/ProgrConstraints.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="ProgrConstraints">
+ <page>
+ <field name="MultipleOf100" type="int">
+ <display/>
+ </field>
+ </page>
+</table>
Added: trunk/equanda-test/src/main/om/ProgrConstraintsInherited.table
===================================================================
--- trunk/equanda-test/src/main/om/ProgrConstraintsInherited.table (rev 0)
+++ trunk/equanda-test/src/main/om/ProgrConstraintsInherited.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="ProgrConstraintsInherited" type="PCIH">
+ <template parent="ProgrConstraints"/>
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/Remove.table
===================================================================
--- trunk/equanda-test/src/main/om/Remove.table (rev 0)
+++ trunk/equanda-test/src/main/om/Remove.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Remove">
+ <security-role-remove>LocalUser</security-role-remove>
+
+ <page>
+ <field name="TestInt" type="int">
+ <display/>
+ </field>
+
+ <field name="Field1LinkCascadeDelete" type="Linkable">
+ <cascade-delete/>
+ </field>
+
+ <field name="Field2BiLinkCascadeDelete" type="Linkable">
+ <cascade-delete/>
+ <link-name>test</link-name>
+ </field>
+
+ <field name="Field3BiLinkCascadeKeep" type="Linkable">
+ <cascade-keep/>
+ <link-name>test2</link-name>
+ </field>
+
+ <field name="Field4BiMultipleLinkCascadeKeep" type="Linkable">
+ <multiple/>
+ <cascade-keep/>
+ <link-name>test3</link-name>
+ </field>
+
+ <field name="Field5LinkCascadeKeep" type="Linkable">
+ <cascade-keep/>
+ </field>
+
+ <field name="Field6MultipleLinkCascadeKeep" type="Linkable">
+ <multiple/>
+ <cascade-keep/>
+ </field>
+
+ <field name="Field7MultipleLinkCascadeRemove" type="Linkable">
+ <multiple/>
+ <cascade-delete/>
+ </field>
+
+ <field name="Field8BiMultipleLinkCascadeRemove" type="Linkable">
+ <multiple/>
+ <cascade-delete/>
+ <link-name>test4</link-name>
+ </field>
+
+ </page>
+ <select name="TestInt">
+ <selection field="TestInt"/>
+ </select>
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/Remove2.table
===================================================================
--- trunk/equanda-test/src/main/om/Remove2.table (rev 0)
+++ trunk/equanda-test/src/main/om/Remove2.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Remove2">
+ <security-role-remove>LocalUser</security-role-remove>
+ <cascade-keep/>
+
+ <page>
+ <field name="TheString" type="string"/>
+ <field name="Field1Bidirectional" type="Linkable">
+ <link-name>test5</link-name>
+ </field>
+
+ <field name="Field2Override" type="Linkable">
+ <link-name>test6</link-name>
+ </field>
+
+ <field name="CallLinkableFacade" type="Linkable">
+ <link-name>test7</link-name>
+ <multiple/>
+ </field>
+ <field name="CallLinkableFacade2" type="Linkable">
+ <link-name>test8</link-name>
+ <multiple/>
+ </field>
+ </page>
+
+ <select name="Everything"/>
+ <select name="ByString">
+ <selection field="TheString"/>
+ </select>
+</table>
\ No newline at end of file
Added: trunk/equanda-test/src/main/om/RequiredFields.table
===================================================================
--- trunk/equanda-test/src/main/om/RequiredFields.table (rev 0)
+++ trunk/equanda-test/src/main/om/RequiredFields.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="RequiredFields">
+
+ <page>
+ <field name="RequiredString" type="string" length="10">
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="RequiredMulString" type="string" length="10">
+ <multiple/>
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="RequiredDate" type="date">
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+
+
+ <field name="RequiredMulDate" type="date">
+ <multiple/>
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="RequiredTime" type="timestamp">
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="RequiredMulTime" type="timestamp">
+ <multiple/>
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="RequiredLink" type="Linkable">
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+
+ <field name="RequiredMulLink" type="Linkable">
+ <multiple/>
+ <constraints>
+ <required/>
+ </constraints>
+ <display/>
+ </field>
+ </page>
+
+</table>
Added: trunk/equanda-test/src/main/om/Secur.table
===================================================================
--- trunk/equanda-test/src/main/om/Secur.table (rev 0)
+++ trunk/equanda-test/src/main/om/Secur.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="Secur">
+ <security-role>LocalUser,AdminUser,Florin</security-role>
+ <security-role-remove>AdminUser,Andariel</security-role-remove>
+ <page>
+ <field name="TestIntLocalUser" type="int">
+ <security-role>LocalUser</security-role>
+ </field>
+ <field name="TestIntImmutableLocalUser" type="int">
+ <constraints>
+ <immutable/>
+ </constraints>
+ <display/>
+ </field>
+ <field name="TestIntAdmin" type="int">
+ <security-role>AdminUser</security-role>
+ </field>
+ <field name="TestIntNobody" type="int">
+ </field>
+ <field name="TestStringUnchecked">
+ <security-role>NONE</security-role>
+ </field>
+ </page>
+
+ <select name="TestIntLocalUser">
+ <selection field="TestIntLocalUser"/>
+ <security-role>LocalUser</security-role>
+ </select>
+ <select name="TestIntAdmin">
+ <selection field="TestIntAdmin"/>
+ <security-role>AdminUser</security-role>
+ </select>
+ <select name="TestStringUnchecked" type="single">
+ <selection field="TestStringUnchecked"/>
+ <security-role>NONE</security-role>
+ </select>
+ <build name="TestBuildAdmin">
+ <security-role>AdminUser</security-role>
+ </build>
+ <build name="TestBuildLocalUser">
+ </build>
+ <action name="testProc1" return="int">
+ <parameter type="String"/>
+ <security-role>AdminUser, root, guest</security-role>
+ </action>
+ <action name="testProc2" return="int">
+ <parameter type="String"/>
+ </action>
+
+</table>
Added: trunk/equanda-test/src/main/om/SelectorUpdate.table
===================================================================
--- trunk/equanda-test/src/main/om/SelectorUpdate.table (rev 0)
+++ trunk/equanda-test/src/main/om/SelectorUpdate.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="SelectorUpdate">
+ <page>
+ <field name="SingleStr" type="string">
+ <display/>
+ </field>
+ <field name="MultipleStr" type="string">
+ <multiple/>
+ <display/>
+ </field>
+ <field name="SingleLink" type="Linkable">
+ <display/>
+ </field>
+ <field name="MultipleLinks" type="Linkable">
+ <multiple/>
+ <display/>
+ </field>
+ </page>
+
+</table>
Added: trunk/equanda-test/src/main/om/StringMaxLen.table
===================================================================
--- trunk/equanda-test/src/main/om/StringMaxLen.table (rev 0)
+++ trunk/equanda-test/src/main/om/StringMaxLen.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="StringMaxLen">
+ <page>
+ <field name="StrMax10Chars" type="string" length="10"/>
+ <field name="StrMax10CharsImmutable" type="string" length="13">
+ <constraints>
+ <immutable/>
+ </constraints>
+ <display/>
+ </field>
+ <field name="StrMax10CharsMultiple" type="string" length="10">
+ <multiple/>
+ <display/>
+ </field>
+ </page>
+ <select name="StrMax10CharsImmutable">
+ <selection field="StrMax10CharsImmutable"/>
+ </select>
+</table>
Added: trunk/equanda-test/src/main/om/SubSelect.table
===================================================================
--- trunk/equanda-test/src/main/om/SubSelect.table (rev 0)
+++ trunk/equanda-test/src/main/om/SubSelect.table 2007-08-28 08:00:59 UTC (rev 50)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE table SYSTEM "equanda.dtd">
+
+<table name="SubSelect">
+
+ <security-role-remove>LocalUser</security-role-remove>
+
+ <page>
+ <field name="Reference" type="string">
+ <display/>
+ </field>
+ <field name="AnimalType" type="string">
+ <display/>
+ </field>
+ <field name="ArticleGroup" type="string">
+ <display/>
+ </field>
+ <field name="Article" type="string">
+ <display/>
+ </field>
+ <field name="Data" type="string">
+ <display/>
+ </field>
+ </page>
+
+ <select name="SelectTestNullTry" operator="TRY" type="single">
+ <subselect>
+ <selection field="Reference"/>
+ </subselect>
+ <subselect>
+ <selection field="Reference" test="is null"/>
+ <selection field="Article"/>
+ </subselect>
+ </select>
+
+ <select name="SelectTestNotNullTry" operator="TRY" type="single">
+ <subselect>
+ <selection field="Reference" test="is not null"/>
+ </subselect>
+ <subselect>
+ <selection field="Reference" test="is null"/>
+ <selection field="Article" test="is not null"/>
+ </subselect>
+ </select>
+
+ <select name="SelectTestNullAnd" type="single">
+ <subselect>
+ <selection field="AnimalType"...
[truncated message content] |
|
From: <tri...@us...> - 2007-08-28 07:45:18
|
Revision: 49
http://equanda.svn.sourceforge.net/equanda/?rev=49&view=rev
Author: triathlon98
Date: 2007-08-28 00:45:10 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
1783109 assure tests can run in maven build
Modified Paths:
--------------
trunk/pom.xml
Added Paths:
-----------
trunk/equanda-test/
Removed Paths:
-------------
trunk/test/
Copied: trunk/equanda-test (from rev 46, trunk/test)
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-27 22:09:19 UTC (rev 48)
+++ trunk/pom.xml 2007-08-28 07:45:10 UTC (rev 49)
@@ -392,4 +392,70 @@
<url>dav:http://www.equanda.org</url>
</site>
</distributionManagement>
+
+ <profiles>
+ <!-- each profile contains properties used to start jboss and run selenium testcases
+ in order to activate the profile you must add to the maven command line the following :
+ -Dmachine=linux - to activate your profile
+ -Dselenium-tests - to run selenium tests cases
+ -Dstart-jboss - to start jboss from maven(it also automatically deploys the ear file)
+
+ note : if you run selenium test you'll need to change the RMI port of the jboss server (4444) because
+ the jetty used by the selenium server also uses it ... and I dont know of any way to change that one
+ so , in the '\conf\jboss-service.xml' file
+ replace this: <attribute name="RMIObjectPort">4444</attribute>
+ with this: <attribute name="RMIObjectPort">14444</attribute>
+ -->
+ <profile>
+ <id>config-win</id>
+ <activation>
+ <property>
+ <name>machine</name>
+ <value>win</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- jboss properties-->
+ <jboss.appserver.home>C:\java\synjboss</jboss.appserver.home>
+ <jboss.configuration>synergetics</jboss.configuration>
+ <jboss.host>localhost</jboss.host>
+ <jboss.port>8080</jboss.port>
+ <jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </jboss.jvmargs>
+ <jboss.logging>medium</jboss.logging>
+ <!-- selenium properties-->
+ <firefox.path>C:\Program Files\Mozilla Firefox\firefox.exe</firefox.path>
+ <selenium.test.path>C:/synergetics/src/test/resources/selenium</selenium.test.path>
+ </properties>
+ </profile>
+ <profile>
+ <id>config-linux</id>
+ <activation>
+ <property>
+ <name>machine</name>
+ <value>linux</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- jboss properties-->
+ <jboss.appserver.home>~/java/synjboss</jboss.appserver.home>
+ <jboss.configuration>synergetics</jboss.configuration>
+ <jboss.host>localhost</jboss.host>
+ <jboss.port>8080</jboss.port>
+ <jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </jboss.jvmargs>
+ <jboss.logging>medium</jboss.logging>
+ <!-- selenium properties-->
+ <firefox.path>firefox</firefox.path>
+ <selenium.test.path>/home/tom/apps/java/synergetics/synergetics-test/src/test/resources/selenium</selenium.test.path>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-27 22:09:26
|
Revision: 48
http://equanda.svn.sourceforge.net/equanda/?rev=48&view=rev
Author: triathlon98
Date: 2007-08-27 15:09:19 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
1780058 move more objecttype stuff to the base class by introducing a array string
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java
trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm
Added Paths:
-----------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildName.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildValue.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeParentValue.vm
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java 2007-08-23 12:01:41 UTC (rev 47)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java 2007-08-27 22:09:19 UTC (rev 48)
@@ -24,11 +24,10 @@
package org.equanda.persistence.om;
-import java.util.ArrayList;
import java.util.Collection;
/**
- * ...
+ * Base implementation of the ObjectType implementations
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
@@ -38,6 +37,7 @@
/**
* Check whether the given table type identifier is a valid (specialized) version
* of this table/class.
+ *
* @param type table type identifier
* @return true when it is a more specialized table
*/
@@ -47,37 +47,67 @@
}
/**
- * Returns a list of table type identifiers which are valid (specialized) versions
- * of this table/class.
- * @return collection with type identified string for table
+ * Check whether this type is "instanceof" the given type (type itself or a child thereof).
+ * <p/>
+ * <p/>
+ * For example, in a hierarchy Object-Vehicle-Car,
+ * Vehicle.isType(Vehicle) returns true
+ * Vehicle.isType(Car) returns false
+ * Vehicle.isType(Object) returns true
+ *
+ * @param type type identifier (four letters) for the type to test
+ * @return true when it is an "instanceof"
*/
- public Collection<String> getAllowedStringValues()
+ public boolean isType( String type )
{
- Collection<String> list = new ArrayList<String>();
- addAllowedStringValues( list );
- return list;
+ // sanity checks
+ if ( type == null ) return false;
+ if ( type.length() < 4 ) type = type + " ";
+ String[] types = getParentTypes();
+ for ( String t : types ) if ( type.startsWith( t ) ) return true;
+ return false;
}
/**
- * Returns a list of names of tables which are valid (specialized) versions
- * of this table/class.
- * @return collection with names of possible subtypes
+ * Check whether the given type "is a child of" (or the type itself).
+ * <p/>
+ *
+ * For example, in a hierarchy Object-Vehicle-Car,
+ * Vehicle.isParentType(Vehicle) returns true
+ * Vehicle.isParentType(Car) returns true
+ * Vehicle.isParentType(Object) returns false
+ *
+ * @param type type identifier (four letters) for the type to test
+ * @return true when it is an "instanceof"
*/
- public Collection<String> getAllowedStringNames()
- {
- Collection<String> list = new ArrayList<String>();
- addAllowedStringNames( list );
- return list;
+ public boolean isParentType(String type) {
+ // sanity checks
+ if ( type == null ) return false;
+ if ( type.length() < 4 ) type = type + " ";
+ String[] types = getChildTypes();
+ for ( String t : types ) if ( type.startsWith( t ) ) return true;
+ return false;
}
+
+
// provided to implement EnumerableChoice
- public boolean isAllowed( boolean b ) { return false; }
+ public boolean isAllowed( boolean b )
+ { return false; }
+
public boolean isAllowed( int i ) { return false; }
+
public boolean isAllowed( double v ) { return false; }
+
public Collection<Integer> getAllowedIntValues() { return null; }
- public Collection<String> getAllowedIntNames() { return null; }
+
+ public Collection<String> getAllowedIntNames() { return null; }
+
public Collection<Boolean> getAllowedBooleanValues() { return null; }
+
public Collection<String> getAllowedBooleanNames() { return null; }
+
public Collection<Double> getAllowedDoubleValues() { return null; }
+
public Collection<String> getAllowedDoubleNames() { return null; }
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java 2007-08-23 12:01:41 UTC (rev 47)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java 2007-08-27 22:09:19 UTC (rev 48)
@@ -80,6 +80,17 @@
*/
Collection<String> getAllowedStringValues();
- void addAllowedStringNames( Collection<String> set );
- void addAllowedStringValues( Collection<String> set );
+ /**
+ * Get the allowed child types
+ *
+ * @return arracy of child types
+ */
+ String[] getChildTypes();
+
+ /**
+ * Get the allowed parent types
+ *
+ * @return arracy of parent types
+ */
+ String[] getParentTypes();
}
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm 2007-08-23 12:01:41 UTC (rev 47)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm 2007-08-27 22:09:19 UTC (rev 48)
@@ -37,41 +37,34 @@
import org.equanda.persistence.om.EquandaObjectType;
-import java.util.Collection;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
-
public class ${table.Name}Type
extends EquandaObjectType
{
private static ${table.Name}Type me = new ${table.Name}Type();
+ private static String[] allowedChildNames = { "$table.Name"
+#parse( "ObjectTypeChildName.vm" )
+ };
+ private static String[] allowedChildValues = {"$table.Type"
+#parse( "ObjectTypeChildValue.vm" )
+ };
+ private static String[] allowedParentValues = {"$table.Type"
+#parse( "ObjectTypeParentValue.vm" )
+ };
- public static void addAllowedStringNamesStatic( Collection<String> set )
+ public Collection<String> getAllowedStringNames()
{
- me.addAllowedStringNames( set );
+ return Arrays.asList( allowedChildNames );
}
- public void addAllowedStringNames( Collection<String> set )
+ public Collection<String> getAllowedStringValues()
{
- if ( !set.contains( "${table.Name}" )) set.add( "${table.Name}" );
- #foreach( $child in $table.Children )
- ${child.Name}Type.addAllowedStringNamesStatic( set );
- #end
+ return Arrays.asList( allowedChildValues );
}
- public static void addAllowedStringValuesStatic( Collection<String> set )
- {
- me.addAllowedStringValues( set );
- }
-
- public void addAllowedStringValues( Collection<String> set )
- {
- if ( !set.contains( "${table.Type}" )) set.add( "${table.Type}" );
- #foreach( $child in $table.Children )
- ${child.Name}Type.addAllowedStringValuesStatic( set );
- #end
- }
-
/**
* Check whether this type is "instanceof" the given type (type itself or a child thereof).
* Check whether the given type "is a parent of" (or the type itself).
@@ -85,40 +78,12 @@
* @param type type identifier (four letters) for the type to test
* @return true when it is an "instanceof"
*/
- public static boolean isTypeStatic(String type) {
- // sanity checks
- if (type==null) return false;
- if (type.length()<4) type=type+" ";
-
- // check whether they want to test for "this" type
- if (type.startsWith("$table.Type")) return true;
-
- // check for templates
-#foreach( $parent in $table.ParentTables)
- if (${parent}Type.isTypeStatic(type)) return true;
-#end
-
- // no options left
- return false;
+ public static boolean isTypeStatic(String type)
+ {
+ return me.isType( type );
}
/**
- * Check whether this type is "instanceof" the given type (type itself or a child thereof).
- * <p/>
- *
- * For example, in a hierarchy Object-Vehicle-Car,
- * Vehicle.isType(Vehicle) returns true
- * Vehicle.isType(Car) returns false
- * Vehicle.isType(Object) returns true
- *
- * @param type type identifier (four letters) for the type to test
- * @return true when it is an "instanceof"
- */
- public boolean isType(String type) {
- return isTypeStatic(type);
- }
-
- /**
* Get the type identifier for this type
*/
public String getType() {
@@ -145,36 +110,26 @@
* @return true when it is an "instanceof"
*/
public static boolean isParentTypeStatic(String type) {
- // sanity checks
- if (type==null) return false;
- if (type.length()<4) type=type+" ";
-
- // check whether they want to test for "this" type
- if (type.startsWith("$table.Type")) return true;
-
- // check for templates
-#foreach( $child in $table.Children)
- if (${child.Name}Type.isParentTypeStatic(type)) return true;
-#end
-
- // no options left
- return false;
+ return me.isParentType( type );
}
/**
- * Check whether the given type "is a child of" (or the type itself).
- * <p/>
+ * Get the allowed child types
*
- * For example, in a hierarchy Object-Vehicle-Car,
- * Vehicle.isParentType(Vehicle) returns true
- * Vehicle.isParentType(Car) returns true
- * Vehicle.isParentType(Object) returns false
- *
- * @param type type identifier (four letters) for the type to test
- * @return true when it is an "instanceof"
+ * @return arracy of child types
*/
- public boolean isParentType(String type) {
- return isParentTypeStatic(type);
+ public String[] getChildTypes()
+ {
+ return allowedChildValues;
}
+ /**
+ * Get the allowed parent types
+ *
+ * @return arracy of parent types
+ */
+ public String[] getParentTypes()
+ {
+ return allowedParentValues;
+ }
}
\ No newline at end of file
Added: trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildName.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildName.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildName.vm 2007-08-27 22:09:19 UTC (rev 48)
@@ -0,0 +1,3 @@
+#foreach( $table in $table.Children )
+, "${table.Name}"
+#end
Added: trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildValue.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildValue.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChildValue.vm 2007-08-27 22:09:19 UTC (rev 48)
@@ -0,0 +1,3 @@
+#foreach( $table in $table.Children )
+, "${table.Type}"
+#end
Added: trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeParentValue.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeParentValue.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeParentValue.vm 2007-08-27 22:09:19 UTC (rev 48)
@@ -0,0 +1,3 @@
+#foreach( $table in $table.ParentTables )
+, "${table.Type}"
+#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-23 12:01:43
|
Revision: 47
http://equanda.svn.sourceforge.net/equanda/?rev=47&view=rev
Author: triathlon98
Date: 2007-08-23 05:01:41 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
1780058 move shared stuff to base classes, not using generics just yet. Already gained 4% compiled size for core (syn-ca)
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java
trunk/equanda-generate/src/main/velocity/ejb3/DMFieldBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectEJBLocal.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm
Added Paths:
-----------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEJB.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaMediatorRoot.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxyState.java
Added: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEJB.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEJB.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEJB.java 2007-08-23 12:01:41 UTC (rev 47)
@@ -0,0 +1,50 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence.om;
+
+/**
+ * Base interface for both local and remote EJB interfaces (for ObjectBase which is a shared interface for both).
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public interface EquandaEJB
+ extends HasUOID
+{
+ void init( UOID uoid )
+ throws EquandaPersistenceException;
+ void initEntity( org.equanda.persistence.om.EquandaEntity entity )
+ throws EquandaPersistenceException;
+
+ // equanda built-in methods
+
+ java.sql.Timestamp getEquandaModificationDate();
+ String getEquandaType();
+ boolean isEquandaType( String type );
+ String getEquandaName();
+ String getEquandaStatus();
+ void setEquandaStatus( String status );
+
+ void remove();
+}
Added: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntityBean.java 2007-08-23 12:01:41 UTC (rev 47)
@@ -0,0 +1,134 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence.om;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * Base implementation for a equanda entity bean (DMObjectBean)
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public abstract class EquandaEntityBean
+ implements EquandaEntity
+{
+ // fields
+ protected UOID uoid;
+ protected String equandaType, equandaStatus;
+ @Transient
+ transient protected boolean equandaStatusModified;
+ protected Timestamp equandaCreation, equandaModified;
+ protected long equandaVersion;
+
+ @EmbeddedId
+ public UOID getUOID()
+ { return uoid; }
+
+ protected void setUOID( UOID uoid )
+ {
+ this.uoid = uoid;
+ }
+
+ @Column( name = "EQUANDA_CREATION" )
+ public Timestamp getEquandaCreationDate()
+ { return equandaCreation; }
+
+ public void setEquandaCreationDate( Timestamp created )
+ {
+ equandaCreation = created;
+ }
+
+ @Column( name = "EQUANDA_MODIFIED" )
+ public Timestamp getEquandaModificationDate()
+ { return equandaModified; }
+
+ //todo some code depends on this method to be public; when fixed this should be set to protected
+ public void setEquandaModificationDate( Timestamp modified )
+ {
+ equandaModified = modified;
+ }
+
+ @PostLoad
+ protected void equandaPostLoad()
+ {
+ equandaStatusModified = false;
+ }
+
+ @PreUpdate
+ public void equandaPreUpdate()
+ {
+ if ( !equandaStatusModified ) setEquandaStatus( "M" );
+ equandaStatusModified = false;
+ setEquandaModificationDate( new Timestamp( System.currentTimeMillis() ) );
+ }
+
+ /**
+ * Indicate that the modification timestamp needs to be updated.
+ * Should be called when changing something in one of the collections.
+ */
+ public void modified()
+ {
+ setEquandaModificationDate( new Timestamp( System.currentTimeMillis() ) );
+ }
+
+ @Column( name = "EQUANDA_TYPE", columnDefinition = "CHAR(4)" )
+ public String getEquandaType()
+ {
+ if ( equandaType.length() > 4 )
+ {
+ return equandaType
+ .substring( 0, 4 ); // work around a firebird problem where char field can return more characters
+ }
+ return equandaType;
+ }
+
+ public void setEquandaType( String type ) { this.equandaType = type; }
+
+ @Version
+ @Column( name = "EQUANDA_VERSION", columnDefinition = "INTEGER default 0 not null" )
+ public long getEquandaVersion()
+ { return equandaVersion; }
+
+ protected void setEquandaVersion( long version ) { this.equandaVersion = version; }
+
+ @Column( name = "EQUANDA_STATUS", columnDefinition = "CHAR(1)" )
+ public String getEquandaStatus()
+ {
+ if ( equandaStatus != null && equandaStatus.length() > 1 )
+ {
+ return equandaStatus
+ .substring( 0, 1 ); // work around a firebird problem where char field can return more characters
+ }
+ return equandaStatus;
+ }
+
+ public void setEquandaStatus( String status )
+ {
+ equandaStatusModified = true;
+ equandaStatus = status;
+ }
+
+}
Added: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java 2007-08-23 12:01:41 UTC (rev 47)
@@ -0,0 +1,62 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence.om;
+
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Version;
+import java.sql.Timestamp;
+
+/**
+ * Base implementation for a equanda entity bean (DMFieldBean)
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class EquandaFieldBean
+{
+ // fields
+ protected UOID uoid;
+ protected Timestamp equandaCreation;
+
+ @EmbeddedId
+ public UOID getUOID()
+ { return uoid; }
+
+ public void setUOID( UOID uoid ) { this.uoid = uoid; }
+
+ @Version
+ @Column(
+ name = "EQUANDA_CREATION"
+ )
+ public Timestamp getEquandaCreationDate()
+ {
+ return equandaCreation;
+ }
+
+ public void setEquandaCreationDate( Timestamp created )
+ {
+ equandaCreation = created;
+ }
+}
Added: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaMediatorRoot.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaMediatorRoot.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaMediatorRoot.java 2007-08-23 12:01:41 UTC (rev 47)
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence.om;
+
+import javax.persistence.EntityManager;
+
+/**
+ * Abstract base for all mediator root classes
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public abstract class EquandaMediatorRoot
+ implements org.equanda.persistence.om.ExceptionCodes
+{
+ protected EntityManager em;
+
+ // fill in base (default) values when creating
+ public void create()
+ throws EquandaPersistenceException
+ {}
+
+ // allow retrieval of the base entity information
+ public abstract boolean isEquandaType( String type );
+
+ public abstract boolean isEquandaParentType( String type );
+
+ public abstract ObjectType getEquandaTypeObject();
+
+ protected void checkImmutableIf( String field, String exclude )
+ throws EquandaPersistenceException
+ {
+ // to be overwritten if needed
+ }
+
+ /**
+ * utility routine to test equality of objects without relying on one of them being not null.
+ *
+ * @param obj1 one of the objects to compare
+ * @param obj2 other object to compare
+ * @return true when bot objects are equal
+ */
+ protected boolean testEquals( Object obj1, Object obj2 )
+ {
+ return ( obj1 == null ) ? ( obj2 == null ) : ( obj1.equals( obj2 ) );
+ }
+
+ /**
+ * utility routine to allow checking the integrity of the record
+ *
+ * @throws EquandaPersistenceException when constraints are violated
+ */
+ public void equandaCheckRules()
+ throws EquandaPersistenceException
+ {
+ // to be overwritten if needed
+ }
+}
Added: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaObjectType.java 2007-08-23 12:01:41 UTC (rev 47)
@@ -0,0 +1,83 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence.om;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * ...
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public abstract class EquandaObjectType
+ implements ObjectType
+{
+ /**
+ * Check whether the given table type identifier is a valid (specialized) version
+ * of this table/class.
+ * @param type table type identifier
+ * @return true when it is a more specialized table
+ */
+ public boolean isAllowed( String type )
+ {
+ return isParentType( type );
+ }
+
+ /**
+ * Returns a list of table type identifiers which are valid (specialized) versions
+ * of this table/class.
+ * @return collection with type identified string for table
+ */
+ public Collection<String> getAllowedStringValues()
+ {
+ Collection<String> list = new ArrayList<String>();
+ addAllowedStringValues( list );
+ return list;
+ }
+
+ /**
+ * Returns a list of names of tables which are valid (specialized) versions
+ * of this table/class.
+ * @return collection with names of possible subtypes
+ */
+ public Collection<String> getAllowedStringNames()
+ {
+ Collection<String> list = new ArrayList<String>();
+ addAllowedStringNames( list );
+ return list;
+ }
+
+ // provided to implement EnumerableChoice
+ public boolean isAllowed( boolean b ) { return false; }
+ public boolean isAllowed( int i ) { return false; }
+ public boolean isAllowed( double v ) { return false; }
+ public Collection<Integer> getAllowedIntValues() { return null; }
+ public Collection<String> getAllowedIntNames() { return null; }
+ public Collection<Boolean> getAllowedBooleanValues() { return null; }
+ public Collection<String> getAllowedBooleanNames() { return null; }
+ public Collection<Double> getAllowedDoubleValues() { return null; }
+ public Collection<String> getAllowedDoubleNames() { return null; }
+}
Added: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxyState.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxyState.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxyState.java 2007-08-23 12:01:41 UTC (rev 47)
@@ -0,0 +1,54 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence.om;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * Base implementation for ProxyState classes
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public abstract class EquandaProxyState
+ implements Serializable
+{
+ public UOID uoid;
+ public ObjectType equandaType;
+ public Timestamp equandaModificationDate;
+ public long equandaVersion;
+
+ public String equandaStatus;
+ public boolean _modifiedequandaStatus;
+
+ public boolean updateInProgress;
+
+ public boolean isModified()
+ {
+ return isModified( false );
+ }
+
+ public abstract boolean isModified( boolean typeFieldsOnly );
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectType.java 2007-08-23 12:01:41 UTC (rev 47)
@@ -79,4 +79,7 @@
* @return allowed type identifiers
*/
Collection<String> getAllowedStringValues();
+
+ void addAllowedStringNames( Collection<String> set );
+ void addAllowedStringValues( Collection<String> set );
}
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/ejb3/DMFieldBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMFieldBean.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMFieldBean.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -34,6 +34,7 @@
import org.equanda.persistence.om.UOID;
import org.equanda.persistence.om.UOIDGenerator;
+import org.equanda.persistence.om.EquandaFieldBean;
import java.sql.Timestamp;
import javax.persistence.*;
@@ -55,11 +56,10 @@
@Table( name = "$dbtype.convertTable("m_${table.Name}_${field.Name}")" )
@Cache( usage=CacheConcurrencyStrategy.TRANSACTIONAL )
public class DM${table.Name}_${field.Name}Bean
+ extends EquandaFieldBean
implements java.io.Serializable
{
// fields
- private UOID uoid;
- private Timestamp equandaCreation;
private ${field.JavaFieldType} ${field.VarName};
public DM${table.Name}_${field.Name}Bean()
@@ -74,18 +74,7 @@
set${field.Name}(value);
}
- @EmbeddedId
- public UOID getUOID() { return uoid; }
- public void setUOID(UOID uoid) { this.uoid = uoid; }
-
- @Version
@Column(
- name = "EQUANDA_CREATION"
- )
- public Timestamp getEquandaCreationDate() { return equandaCreation; }
- public void setEquandaCreationDate(Timestamp created) { equandaCreation = created; }
-
- @Column(
name = "$dbtype.convertField("f_${field.Name}")"
#if( $field.isString() ), columnDefinition = "VARCHAR($field.FieldLength)"#end
#if( $field.isInt() ), columnDefinition = "INTEGER default 0 not null"#end
@@ -101,4 +90,4 @@
{
${field.VarName} = value;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -34,6 +34,8 @@
import org.equanda.persistence.om.UOID;
import org.equanda.persistence.om.UOIDGenerator;
+import org.equanda.persistence.om.EquandaEntity;
+import org.equanda.persistence.om.EquandaEntityBean;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -120,7 +122,8 @@
@Table( name = "$dbtype.convertTable("t_$table.Name")" )
@Cache( usage=CacheConcurrencyStrategy.TRANSACTIONAL )
public class DM${table.Name}Bean
- implements org.equanda.persistence.om.EquandaEntity, java.io.Serializable
+ extends EquandaEntityBean
+ implements EquandaEntity, java.io.Serializable
{
// constant values for all the "choice" fields
#set( $constants=[] )
@@ -137,11 +140,6 @@
#end## foreach field
// fields
- private UOID uoid;
- private String equandaType, equandaStatus;
- @Transient transient boolean equandaStatusModified;
- private Timestamp equandaCreation, equandaModified;
- private long equandaVersion;
#foreach ($field in $table.Fields)
#if( !$field.isCalculated() )
#set( $fieldtype=$field.JavaFieldType )
@@ -228,72 +226,6 @@
protected DM${table.Name}Bean() {}
- @EmbeddedId
- public UOID getUOID() { return uoid; }
- protected void setUOID(UOID uoid)
- {
- this.uoid = uoid;
- }
-
- @Column( name = "EQUANDA_CREATION" )
- public Timestamp getEquandaCreationDate() { return equandaCreation; }
- public void setEquandaCreationDate(Timestamp created)
- {
- equandaCreation = created;
- }
-
- @Column( name = "EQUANDA_MODIFIED" )
- public Timestamp getEquandaModificationDate() { return equandaModified; }
- public void setEquandaModificationDate(Timestamp modified) { equandaModified = modified; } //todo some code depends on this method to be public; when fixed this should be set to protected
-
- @PostLoad
- private void equandaPostLoad()
- {
- equandaStatusModified = false;
- }
-
- @PreUpdate
- public void equandaPreUpdate()
- {
- if ( !equandaStatusModified ) setEquandaStatus( "M" );
- equandaStatusModified = false;
- setEquandaModificationDate( new Timestamp( System.currentTimeMillis() ) );
- }
-
- /**
- * Indicate that the modification timestamp needs to be updated.
- * Should be called when changing something in one of the collections.
- */
- public void modified()
- {
- setEquandaModificationDate( new Timestamp( System.currentTimeMillis() ) );
- }
-
- @Column( name = "EQUANDA_TYPE", columnDefinition = "CHAR(4)" )
- public String getEquandaType()
- {
- if ( equandaType.length() > 4 ) return equandaType.substring( 0, 4 ); // work around a firebird problem where char field can return more characters
- return equandaType;
- }
- public void setEquandaType(String type) { this.equandaType = type; }
-
- @Version
- @Column( name = "EQUANDA_VERSION", columnDefinition = "INTEGER default 0 not null")
- public long getEquandaVersion() { return equandaVersion; }
- protected void setEquandaVersion(long version) { this.equandaVersion = version; }
-
- @Column( name = "EQUANDA_STATUS", columnDefinition = "CHAR(1)" )
- public String getEquandaStatus()
- {
- if ( equandaStatus != null && equandaStatus.length() > 1 ) return equandaStatus.substring( 0, 1 ); // work around a firebird problem where char field can return more characters
- return equandaStatus;
- }
- public void setEquandaStatus(String status)
- {
- equandaStatusModified = true;
- equandaStatus = status;
- }
-
#foreach( $ck in $table.CascadeKeep )
#if( !$ck.isBidirectional() )
@BatchSize( size=$linkBatch )
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -56,7 +56,7 @@
public String getEquandaName() { return "$table.Name"; }
// fill in base (default) values when creating
- protected void create()
+ public void create()
throws EquandaPersistenceException
{
super.create();
@@ -69,11 +69,11 @@
}
// Object Type handling
- boolean isEquandaType( String type ) { return ${package}.client.${table.Name}Type.isTypeStatic( type ); }
+ public boolean isEquandaType( String type ) { return ${package}.client.${table.Name}Type.isTypeStatic( type ); }
- boolean isEquandaParentType( String type ) { return ${package}.client.${table.Name}Type.isParentTypeStatic( type ); }
+ public boolean isEquandaParentType( String type ) { return ${package}.client.${table.Name}Type.isParentTypeStatic( type ); }
- ObjectType getEquandaTypeObject() { return new ${package}.client.${table.Name}Type(); }
+ public ObjectType getEquandaTypeObject() { return new ${package}.client.${table.Name}Type(); }
// create accessors for fields
#parse("MediatorBase-set.java.vm")
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -48,16 +48,15 @@
import java.util.Iterator;
import javax.persistence.*;
-public abstract class ${table.Name}MediatorRoot implements org.equanda.persistence.om.ExceptionCodes {
-
- protected EntityManager em;
-
+public abstract class ${table.Name}MediatorRoot
+ extends org.equanda.persistence.om.EquandaMediatorRoot
+{
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( ${table.Name}MediatorRoot.class );
- DM${table.Name}Bean entity; // entity which is to be manipulated
- ${table.Name}Bean object; // session bean which uses this mediator
+ protected DM${table.Name}Bean entity; // entity which is to be manipulated
+ protected ${table.Name}Bean object; // session bean which uses this mediator
// initialise mediator object
- protected void init(DM${table.Name}Bean entity, ${table.Name}Bean object, EntityManager em)
+ protected void init( DM${table.Name}Bean entity, ${table.Name}Bean object, EntityManager em )
{
this.entity=entity;
this.object=object;
@@ -73,17 +72,11 @@
}
protected DM${table.Name}Bean getEquandaEntity() { return entity; }
- // fill in base (default) values when creating
- protected void create() throws EquandaPersistenceException {}
-
// allow retrieval of the base entity information
UOID getUOID() { return entity.getUOID(); }
String getEquandaType() { String type=entity.getEquandaType(); if (type.length()>4) type=type.substring(0,4); return type; }
java.sql.Timestamp getEquandaModificationDate() { return entity.getEquandaModificationDate(); }
long getEquandaVersion() { return entity.getEquandaVersion(); }
- abstract boolean isEquandaType(String type);
- abstract boolean isEquandaParentType(String type);
- abstract ObjectType getEquandaTypeObject();
public String getEquandaName() { return "$table.Name"; }
public String getEquandaStatus()
{
@@ -360,8 +353,6 @@
#end
- protected void checkImmutableIf(String field, String exclude) throws EquandaPersistenceException {}
-
protected void removeEntityBean() throws EquandaPersistenceException {
#foreach( $ck in $table.CascadeKeep )
#if ( $ck.isBidirectional() )
@@ -498,24 +489,5 @@
#end
em.remove(entity);
}
-
- /**
- * utility routine to test equality of objects without relying on one of them being not null.
- *
- * @param obj1 one of the objects to compare
- * @param obj2 other object to compare
- * @return true when bot objects are equal
- */
- protected boolean testEquals( Object obj1, Object obj2 )
- {
- return ( obj1 == null ) ? ( obj2 == null ) : ( obj1.equals( obj2 ) );
- }
-
- /**
- * utility routine to allow checking the integrity of the record
- */
- public void equandaCheckRules()
- throws EquandaPersistenceException
- {}
}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectBase.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectBase.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -32,7 +32,7 @@
package ${package}.client;
-import org.equanda.persistence.om.HasUOID;
+import org.equanda.persistence.om.EquandaEJB;
import org.equanda.persistence.om.EquandaDowngradeException;
import org.equanda.persistence.om.EquandaPersistenceException;
import org.equanda.persistence.om.UOID;
@@ -47,13 +47,8 @@
* Interface for ${table.Name}.
*/
public interface ${table.Name}Base
- extends HasUOID
+ extends EquandaEJB
{
- void init( UOID uoid )
- throws EquandaPersistenceException;
- void initEntity( org.equanda.persistence.om.EquandaEntity entity )
- throws EquandaPersistenceException;
-
#if( $table.isCloneable() )
void init( String type, ${package}.client.${table.Name}EJB base )
throws EquandaPersistenceException;
@@ -67,14 +62,6 @@
// equanda built-in methods
- UOID getUOID();
- java.sql.Timestamp getEquandaModificationDate();
- String getEquandaType();
- boolean isEquandaType( String type );
- String getEquandaName();
- String getEquandaStatus();
- void setEquandaStatus( String status );
-
${table.Name}Proxy getEquandaProxy();
void updateEquandaProxy( ${table.Name}Proxy proxy )
@@ -138,8 +125,6 @@
throws EquandaPersistenceException;
#end
- void remove();
-
#if( $table.hasSecurityRoleRemove() )
void removeEntityBean()
throws EquandaPersistenceException;
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectEJBLocal.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectEJBLocal.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectEJBLocal.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -35,7 +35,7 @@
import javax.ejb.Local;
/**
- * Remote interface for ${table.Name}
+ * Local interface for ${table.Name}
*/
@Local
public interface ${table.Name}EJBLocal
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -43,20 +43,10 @@
public class ${table.Name}ProxyState
- implements Serializable
+ extends org.equanda.persistence.om.EquandaProxyState
{
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( ${table.Name}ProxyState.class );
- UOID uoid;
- ObjectType equandaType;
- Timestamp equandaModificationDate;
- long equandaVersion;
-
- String equandaStatus;
- boolean _modifiedequandaStatus;
-
- boolean updateInProgress;
-
#foreach ($field in $table.Fields)
#set( $fieldtype=$field.JavaFieldType )
#if ( $field.isLink() ) #set( $fieldtype="${field.JavaFieldType}Proxy" ) #end
@@ -105,13 +95,8 @@
}
}
- boolean isModified()
+ public boolean isModified( boolean typeFieldsOnly )
{
- return isModified( false );
- }
-
- boolean isModified( boolean typeFieldsOnly )
- {
if ( _modifiedequandaStatus ) return true;
#foreach ($field in $table.Fields)
#if ( !$field.isCalculated() && !$field.isInternal() )
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -35,60 +35,40 @@
package ${package}.client;
-import org.equanda.persistence.om.ObjectType;
+import org.equanda.persistence.om.EquandaObjectType;
import java.util.Collection;
import java.util.ArrayList;
-public class ${table.Name}Type implements ObjectType {
+public class ${table.Name}Type
+ extends EquandaObjectType
+{
+ private static ${table.Name}Type me = new ${table.Name}Type();
- /**
- * Check whether the given table type identifier is a valid (specialized) version
- * of this table/class.
- * @param type table type identifier
- * @return true when it is a more specialized table
- */
- public boolean isAllowed( String type )
+ public static void addAllowedStringNamesStatic( Collection<String> set )
{
- return isParentTypeStatic( type );
+ me.addAllowedStringNames( set );
}
- /**
- * Returns a list of table type identifiers which are valid (specialized) versions
- * of this table/class.
- */
- public Collection<String> getAllowedStringValues()
+ public void addAllowedStringNames( Collection<String> set )
{
- Collection<String> list = new ArrayList( );
- addAllowedStringValues( list );
- return list;
- }
-
- /**
- * Returns a list of names of tables which are valid (specialized) versions
- * of this table/class.
- */
- public Collection<String> getAllowedStringNames()
- {
- Collection<String> list = new ArrayList( );
- addAllowedStringNames( list );
- return list;
- }
-
- static void addAllowedStringNames( Collection<String> set )
- {
if ( !set.contains( "${table.Name}" )) set.add( "${table.Name}" );
#foreach( $child in $table.Children )
- ${child.Name}Type.addAllowedStringNames( set );
+ ${child.Name}Type.addAllowedStringNamesStatic( set );
#end
}
- static void addAllowedStringValues( Collection<String> set )
+ public static void addAllowedStringValuesStatic( Collection<String> set )
{
+ me.addAllowedStringValues( set );
+ }
+
+ public void addAllowedStringValues( Collection<String> set )
+ {
if ( !set.contains( "${table.Type}" )) set.add( "${table.Type}" );
#foreach( $child in $table.Children )
- ${child.Name}Type.addAllowedStringValues( set );
+ ${child.Name}Type.addAllowedStringValuesStatic( set );
#end
}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm 2007-08-23 09:00:17 UTC (rev 46)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm 2007-08-23 12:01:41 UTC (rev 47)
@@ -46,13 +46,5 @@
extends ${table.Name}Type
implements EnumerableChoice
{
- public boolean isAllowed( boolean b ) { return false; }
- public boolean isAllowed( int i ) { return false; }
- public boolean isAllowed( double v ) { return false; }
- public Collection<Integer> getAllowedIntValues() { return null; }
- public Collection<String> getAllowedIntNames() { return null; }
- public Collection<Boolean> getAllowedBooleanValues() { return null; }
- public Collection<String> getAllowedBooleanNames() { return null; }
- public Collection<Double> getAllowedDoubleValues() { return null; }
- public Collection<String> getAllowedDoubleNames() { return null; }
+ // all the methods already exists, need this to implement EnumerableChoice
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-23 09:00:19
|
Revision: 46
http://equanda.svn.sourceforge.net/equanda/?rev=46&view=rev
Author: triathlon98
Date: 2007-08-23 02:00:17 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
remove some unneeded code, move extra code to base class (out of template)
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java
trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java 2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaProxy.java 2007-08-23 09:00:17 UTC (rev 46)
@@ -119,8 +119,14 @@
*/
public abstract void setEquandaType( String type );
- public abstract boolean isModified();
+ public abstract boolean isModified( boolean typeFieldsOnly );
+ public boolean isModified()
+ {
+ return isModified( false );
+ }
+
+
/**
* utility routine to test equality of objects without relying on one of them being not null.
*
@@ -136,8 +142,15 @@
public abstract T cloneProxy( boolean cloneUoid );
- public abstract void equandaUpdate()
- throws EquandaPersistenceException;
+ /**
+ * Update the proxy state, client changes are persisted, and server changes retrieved.
+ * @throws EquandaPersistenceException update problems
+ */
+ public void equandaUpdate()
+ throws EquandaPersistenceException
+ {
+ equandaUpdate( false );
+ }
public abstract void equandaUpdate( boolean updateTypeFieldsOnly )
throws EquandaPersistenceException;
@@ -153,8 +166,6 @@
this.update = update;
}
- public abstract boolean isModified( boolean typeFieldsOnly );
-
public boolean equals( Object o )
{
if ( this == o ) return true;
Modified: trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm 2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm 2007-08-23 09:00:17 UTC (rev 46)
@@ -100,7 +100,7 @@
protected ${table.Name}Proxy refreshObject( ${table.Name}Proxy obj )
throws NamingException, EquandaPersistenceException
{
- obj.update();
+ obj.equandaUpdate();
return obj;
}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm 2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm 2007-08-23 09:00:17 UTC (rev 46)
@@ -304,11 +304,6 @@
return proxy.isModified( typeFieldsOnly );
}
- public boolean isModified()
- {
- return proxy.isModified( false );
- }
-
public String getEquandaStatus() { return proxy.equandaStatus; }
public void setEquandaStatus( String status )
{
@@ -552,37 +547,6 @@
}
#end
- /**
- * Synchronize state with the server
- * @deprecated
- * @see equandaUpdate()
- */
- public void update()
- throws EquandaPersistenceException
- {
- equandaUpdate();
- }
-
- /**
- * Synchronize state with the server
- * @deprecated
- * @see equandaUpdate()
- */
- public void updateProxy()
- throws EquandaPersistenceException
- {
- equandaUpdate();
- }
-
- /**
- * Update the proxy state, client changes are persisted, and server changes retrieved.
- */
- public void equandaUpdate()
- throws EquandaPersistenceException
- {
- equandaUpdate( false );
- }
-
public void equandaUpdate( boolean updateTypeFieldsOnly )
throws EquandaPersistenceException
{
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm 2007-08-22 15:19:13 UTC (rev 45)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm 2007-08-23 09:00:17 UTC (rev 46)
@@ -51,8 +51,6 @@
public interface ${table.Name}SelectorEJB
extends EquandaSelector
{
- String getEquandaName();
-
${table.Name}Proxy equandaCreateProxy( String type )
throws EquandaPersistenceException;
${table.Name}Proxy findUOIDProxy( UOID uoid )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 15:19:17
|
Revision: 45
http://equanda.svn.sourceforge.net/equanda/?rev=45&view=rev
Author: triathlon98
Date: 2007-08-22 08:19:13 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
doc improvements
Modified Paths:
--------------
trunk/src/site/wiki/index.wiki
trunk/src/site/wiki/vision.wiki
Modified: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki 2007-08-22 07:11:44 UTC (rev 44)
+++ trunk/src/site/wiki/index.wiki 2007-08-22 15:19:13 UTC (rev 45)
@@ -7,11 +7,11 @@
equanda is a tool which should help you to build enterprise grade (J2EE based) application with minimal effort, focussing not only on the initial version, but considering that most of the cost will be in maintaining and evolving the application.
-This is done by generating as much as possible directly from an XML description of the the data and interactions (the _object model_ "om").
+This is done by generating as much as possible directly from an XML description of the the data and interactions (the _[object model|om.html]_ "om"). Some more thoughts about the concept (generation) can be found [here|http://blog.progs.be/?p=29].
There are many ways to enhance/improve the generated application, but this is always done in such a way that most changes in the object model don't cause any problems. You just recompile (which re-generates al lthe files which needs modifying) and all the manual changes are preserved.
-The idea is that application development should be focussed on doing the important stuff (the unique features of the application), and that common aspects should only be done once (even more so because this improves consistency). The goal is to work towards a [vision|vision.html] of how application development should be (original thoughts in this [blog|http://blog.progs.be/?p=21]). Some more thoughts about the concept (generation) can be found [here|http://blog.progs.be/?p=29].
+The idea is that application development should be focussed on doing the important stuff (the unique features of the application), and that common aspects should only be done once (even more so because this improves consistency). The goal is to work towards a [vision|vision.html] of how application development should be (original thoughts in this [blog|http://blog.progs.be/?p=21]).
h2. Features
Modified: trunk/src/site/wiki/vision.wiki
===================================================================
--- trunk/src/site/wiki/vision.wiki 2007-08-22 07:11:44 UTC (rev 44)
+++ trunk/src/site/wiki/vision.wiki 2007-08-22 15:19:13 UTC (rev 45)
@@ -1 +1,5 @@
-h1. Vision for equanda
\ No newline at end of file
+h1. Vision
+
+Application development is a non-trivial task which usually happens in iterative fases. Even if this was not the original plan, the requirements often change while the application is being used (or even during development).
+To remedy the requirement creep during development, it is best to keep the development cycles as short as possible.
+To allow requirement changes while the application is being used, tools should be used which consider that software will evolve and which allow these changes to be applied with as little works as possible.
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-22 07:11:46
|
Revision: 44
http://equanda.svn.sourceforge.net/equanda/?rev=44&view=rev
Author: triathlon98
Date: 2007-08-22 00:11:44 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
fix error code prefixes
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-choices.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-mutable.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm
trunk/test/src/main/be/equanda/test/om/server/AutoFieldsMediator.java
trunk/test/src/main/be/equanda/test/om/server/EquandaRoleMediator.java
trunk/test/src/main/be/equanda/test/om/server/LinkableMediator.java
trunk/test/src/main/be/equanda/test/om/server/ProgrConstraintsMediator.java
trunk/test/src/main/be/equanda/test/om/server/VehicleWithWingsMediator.java
trunk/test/src/main/be/equanda/test/translation/TestExceptionCodes.java
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java 2007-08-22 07:11:44 UTC (rev 44)
@@ -45,23 +45,23 @@
int UPE_FAILED_PROXY_REMOVE = 90010;
int UPE_CANNOT_INIT_BEAN = 90011;
- int UCV_COULD_NOT_TEST_CHOICES_USING_CLASS = 91001;
- int UCV_VALUE_IS_NOT_ONE_OF_THE_CHOICES = 91002;
- int UCV_COMPARE_CONSTRAINT_NOT_SATISFIED = 91003;
- int UCV_IMMUTABLE_IF_OTHER_FIELD_IS_SET = 91004;
- int UCV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD = 91005;
- int UCV_FIELD_IS_REQUIRED = 91006;
- int UCV_FIELD_IS_UNIQUE = 91007;
- int UCV_INCLUDE_VALUE_HAS_WRONG_TYPE = 91008;
- int UCV_FAILED_TO_CREATE_INCLUDED_VALUE = 91009;
- int UCV_INTERNAL_ERROR_ON_CREATE_INCLUDED_VALUE = 91010;
- int UCV_CONSTRAINT_VIOLATION = 91011;
- int UCV_FAILED_TO_UPDATE_VALUE = 91012;
- int UCV_DOWNCAST_FAILED_CANNOT_DOWNCAST_ROOT = 91013;
- int UCV_DOWNCAST_FINDER_ERROR = 91014;
- int UCV_DOWNCAST_CREATE_ERROR = 91015;
- int UCV_INVALID_TABLE_TYPE = 91016;
- int UCV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET = 91017;
+ int ECV_COULD_NOT_TEST_CHOICES_USING_CLASS = 91001;
+ int ECV_VALUE_IS_NOT_ONE_OF_THE_CHOICES = 91002;
+ int ECV_COMPARE_CONSTRAINT_NOT_SATISFIED = 91003;
+ int ECV_IMMUTABLE_IF_OTHER_FIELD_IS_SET = 91004;
+ int ECV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD = 91005;
+ int ECV_FIELD_IS_REQUIRED = 91006;
+ int ECV_FIELD_IS_UNIQUE = 91007;
+ int ECV_INCLUDE_VALUE_HAS_WRONG_TYPE = 91008;
+ int ECV_FAILED_TO_CREATE_INCLUDED_VALUE = 91009;
+ int ECV_INTERNAL_ERROR_ON_CREATE_INCLUDED_VALUE = 91010;
+ int ECV_CONSTRAINT_VIOLATION = 91011;
+ int ECV_FAILED_TO_UPDATE_VALUE = 91012;
+ int ECV_DOWNCAST_FAILED_CANNOT_DOWNCAST_ROOT = 91013;
+ int ECV_DOWNCAST_FINDER_ERROR = 91014;
+ int ECV_DOWNCAST_CREATE_ERROR = 91015;
+ int ECV_INVALID_TABLE_TYPE = 91016;
+ int ECV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET = 91017;
int CME_DATA_HAS_BEEN_ALREADY_CHANGED = 92001;
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-choices.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-choices.java.vm 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-choices.java.vm 2007-08-22 07:11:44 UTC (rev 44)
@@ -38,12 +38,12 @@
org.equanda.validation.Choice validator=(org.equanda.validation.Choice)Thread.currentThread().getContextClassLoader().loadClass("$choice.Name").newInstance();
if (validator.isAllowed($chosenValue)) found${field.Name}=true;
} catch (Exception e) {
- throw new EquandaConstraintViolation( UCV_COULD_NOT_TEST_CHOICES_USING_CLASS, e, "$choice.Name", "field.${table.Name}.${field.Name}.label", e.getClass().toString() );
+ throw new EquandaConstraintViolation( ECV_COULD_NOT_TEST_CHOICES_USING_CLASS, e, "$choice.Name", "field.${table.Name}.${field.Name}.label", e.getClass().toString() );
}
#end
#end
if (!found${field.Name}) {
- throw new EquandaConstraintViolation(UCV_VALUE_IS_NOT_ONE_OF_THE_CHOICES, $chosenValue, "field.${table.Name}.${field.Name}.label");
+ throw new EquandaConstraintViolation(ECV_VALUE_IS_NOT_ONE_OF_THE_CHOICES, $chosenValue, "field.${table.Name}.${field.Name}.label");
}
}
#end
@@ -57,12 +57,12 @@
org.equanda.validation.Choice validator=(org.equanda.validation.Choice)Thread.currentThread().getContextClassLoader().loadClass("$choice.Name").newInstance();
if (validator.isAllowed($chosenValue)) found${field.Name}=true;
} catch (Exception e) {
- throw new EquandaConstraintViolation( UCV_COULD_NOT_TEST_CHOICES_USING_CLASS, e, "$choice.Name", "field.${table.Name}.${field.Name}.label", e.getClass().toString() );
+ throw new EquandaConstraintViolation( ECV_COULD_NOT_TEST_CHOICES_USING_CLASS, e, "$choice.Name", "field.${table.Name}.${field.Name}.label", e.getClass().toString() );
}
#end
#end
if (!found${field.Name}) {
- throw new EquandaConstraintViolation(UCV_VALUE_IS_NOT_ONE_OF_THE_CHOICES, String.valueOf( $chosenValue ), "field.${table.Name}.${field.Name}.label");
+ throw new EquandaConstraintViolation(ECV_VALUE_IS_NOT_ONE_OF_THE_CHOICES, String.valueOf( $chosenValue ), "field.${table.Name}.${field.Name}.label");
}
#end
#end
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm 2007-08-22 07:11:44 UTC (rev 44)
@@ -32,12 +32,12 @@
#if ($ii.fieldLevel)
if ($field.varName!=null) {
if (!(${field.varName}.compareTo($ii.Value)${ii.Test}0)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
#else
String tmp=$ii.Value;
if (($field.varName!=null) && (tmp!=null)) {
if (!(${field.varName}.compareTo(tmp)${ii.Test}0)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
#end
}
}
@@ -46,11 +46,11 @@
#if( $field.isBoolean() )
#if ($ii.fieldLevel)
if (!($field.varName$ii.Test$ii.Value)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Boolean($ii.Value).toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Boolean($ii.Value).toString());
#else
boolean tmp=$ii.Value;
if (!($field.varName${ii.Test}tmp)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Boolean($ii.Value).toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Boolean($ii.Value).toString());
#end
}
#end
@@ -63,7 +63,7 @@
if (($field.varName!=null) && (tmp!=null)) {
#end
if (!(${field.varName}.compareTo(tmp)${ii.Test}0)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", ${ii.Value}.toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", ${ii.Value}.toString());
}
}
#end
@@ -76,7 +76,7 @@
if (($field.varName!=null) && (tmp!=null)) {
#end
if (!(${field.varName}.compareTo(tmp)${ii.Test}0)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", ${ii.Value}.toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", ${ii.Value}.toString());
}
}
#end
@@ -84,22 +84,22 @@
#if( $field.isInt() )
#if ($ii.fieldLevel)
if (!($field.varName$ii.Test$ii.Value)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Integer($ii.Value).toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Integer($ii.Value).toString());
#else
int tmp=$ii.Value;
if (!($field.varName${ii.Test}tmp)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Integer($ii.Value).toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Integer($ii.Value).toString());
#end
}
#end
#if( $field.isDouble() )
#if ($ii.fieldLevel)
if (!($field.varName$ii.Test$ii.Value)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Double($ii.Value).toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Double($ii.Value).toString());
#else
double tmp=$ii.Value;
if (!($field.varName${ii.Test}tmp)) {
- throw new EquandaConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Double($ii.Value).toString());
+ throw new EquandaConstraintViolation(ECV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", new Double($ii.Value).toString());
#end
}
#end
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-mutable.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-mutable.java.vm 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-mutable.java.vm 2007-08-22 07:11:44 UTC (rev 44)
@@ -38,7 +38,7 @@
if ( entity.get${ii.Field.Name}() != 0 )
#end
{
- throw new EquandaConstraintViolation(UCV_IMMUTABLE_IF_OTHER_FIELD_IS_SET, "field.${table.Name}.${field.Name}.label", "field.${table.Name}.${ii.Name}.label");
+ throw new EquandaConstraintViolation(ECV_IMMUTABLE_IF_OTHER_FIELD_IS_SET, "field.${table.Name}.${field.Name}.label", "field.${table.Name}.${ii.Name}.label");
}
#end
#end
@@ -54,7 +54,7 @@
#elseif( $iif.isLink() || $iif.isString() )
if ( entity.get${iif.Name}() != null )
#else
- if ( entity.get${iif.Name}() != 0 )
+ if ( entity.get${iif.Name}() != 0 )
#end
#end
exclude+="|$ii.Name|";
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm 2007-08-22 07:11:44 UTC (rev 44)
@@ -39,7 +39,7 @@
{
if ( value == null )
{
- throw new EquandaConstraintViolation( UCV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
}
#* check constraints *#
#parse("MediatorBase-mutable.java.vm")
@@ -88,7 +88,7 @@
{
if ( value == null )
{
- throw new EquandaConstraintViolation( UCV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
}
#* check constraints *#
#parse("MediatorBase-mutable.java.vm")
@@ -167,7 +167,7 @@
#if ( ( $field.isString() || $field.isDate() || $field.isTimestamp() ) && $field.isRequired() )
if ( $field.VarName == null )
{
- throw new EquandaConstraintViolation( UCV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
}
#end
@@ -183,7 +183,7 @@
#if ( $field.isUnique() )
if ( object.count${field.Name}($field.VarName) > 0 )
{
- throw new EquandaConstraintViolation( UCV_FIELD_IS_UNIQUE, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_FIELD_IS_UNIQUE, "field.${table.Name}.${field.Name}.label" );
}
#end
entity.set${field.Name}( $field.VarName );
@@ -202,13 +202,13 @@
#if ( $field.isRequired() )
if ( value == null )
{
- throw new EquandaConstraintViolation( UCV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
}
#end
#if ( $field.isBidirectional() && $field.LinkField.isEmbedded() )
if ( value == null && entity.get${field.Name}() != null )
{
- throw new EquandaConstraintViolation( UCV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET, "field.${table.Name}.${field.Name}.label" );
}
#end
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2007-08-22 07:11:44 UTC (rev 44)
@@ -89,7 +89,7 @@
if (exclude.indexOf("|$ii.Name|")==-1)
if (entity.get${iif.Name}())
{
- throw new EquandaConstraintViolation(UCV_IMMUTABLE_IF_OTHER_FIELD_IS_SET, "field.${table.Name}."+field+".label", "field.${table.Name}.${ii.Name}.label");
+ throw new EquandaConstraintViolation(ECV_IMMUTABLE_IF_OTHER_FIELD_IS_SET, "field.${table.Name}."+field+".label", "field.${table.Name}.${ii.Name}.label");
}
#end
#end
@@ -149,12 +149,12 @@
#if( !$field.isMultiple() )
if ( value${field.Name} == null )
{
- throw new EquandaConstraintViolation( UCV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
}
#else
if ( value${field.Name}==null || value${field.Name}.isEmpty() )
{
- throw new EquandaConstraintViolation( UCV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_FIELD_IS_REQUIRED, "field.${table.Name}.${field.Name}.label" );
}
#end
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm 2007-08-22 07:11:44 UTC (rev 44)
@@ -95,7 +95,7 @@
#end
if ( mediator == null )
{
- throw new EquandaPersistenceException( UCV_INVALID_TABLE_TYPE, type, "table.${table.Name}.label" );
+ throw new EquandaPersistenceException( ECV_INVALID_TABLE_TYPE, type, "table.${table.Name}.label" );
}
mediator.init(entity, this, entityManager);
}
@@ -112,7 +112,7 @@
}
else
{
- throw new EquandaConstraintViolation( UCV_DOWNCAST_FAILED_CANNOT_DOWNCAST_ROOT );
+ throw new EquandaConstraintViolation( ECV_DOWNCAST_FAILED_CANNOT_DOWNCAST_ROOT );
}
}
@@ -226,7 +226,7 @@
#end
if (count${field.Name}($field.VarName)>0)
{
- throw new EquandaConstraintViolation( UCV_FIELD_IS_UNIQUE, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_FIELD_IS_UNIQUE, "field.${table.Name}.${field.Name}.label" );
}
#end
#end
@@ -279,7 +279,7 @@
#end
if (count${field.Name}($field.VarName)>0)
{
- throw new EquandaConstraintViolation( UCV_FIELD_IS_UNIQUE, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_FIELD_IS_UNIQUE, "field.${table.Name}.${field.Name}.label" );
}
#end
#end
@@ -462,7 +462,7 @@
#if( !( $field.isInt() || $field.isDouble() || $field.isBoolean() ) )
if ( el == null )
{
- throw new EquandaConstraintViolation( UCV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
}
#end
try
@@ -536,7 +536,7 @@
mediator.init( entityManager );
if ( el == null )
{
- throw new EquandaConstraintViolation( UCV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
+ throw new EquandaConstraintViolation( ECV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD, "field.${table.Name}.${field.Name}.label" );
}
try
{
Modified: trunk/test/src/main/be/equanda/test/om/server/AutoFieldsMediator.java
===================================================================
--- trunk/test/src/main/be/equanda/test/om/server/AutoFieldsMediator.java 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/test/src/main/be/equanda/test/om/server/AutoFieldsMediator.java 2007-08-22 07:11:44 UTC (rev 44)
@@ -60,7 +60,7 @@
}
catch ( Exception e )
{
- throw new EquandaPersistenceException( UPE_PROBLEM_IN_AUTOMULTIPLEAUTO, e);
+ throw new EquandaPersistenceException( EPE_PROBLEM_IN_AUTOMULTIPLEAUTO, e);
}
array.add( obj );
return array;
Modified: trunk/test/src/main/be/equanda/test/om/server/EquandaRoleMediator.java
===================================================================
--- trunk/test/src/main/be/equanda/test/om/server/EquandaRoleMediator.java 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/test/src/main/be/equanda/test/om/server/EquandaRoleMediator.java 2007-08-22 07:11:44 UTC (rev 44)
@@ -77,7 +77,7 @@
{
if ( !right1.getEquandaType().equals( right2.getEquandaType() ) )
{
- throw new EquandaPersistenceException( UPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS );
+ throw new EquandaPersistenceException( EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS );
}
if ( right1.getEquandaType().equals( "EDIT" ) )
{
@@ -207,7 +207,7 @@
{
if ( !right1.getEquandaType().equals( right2.getEquandaType() ) )
{
- throw new EquandaPersistenceException( UPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS );
+ throw new EquandaPersistenceException( EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS );
}
found = true;
break;
@@ -237,12 +237,12 @@
if ( resultName == null )
{
log.error( "Cannot merge roles, resultName must be a name for a new role, not null" );
- throw new EquandaPersistenceException( UPE_RESULTNAME_CANNOT_BE_NULL );
+ throw new EquandaPersistenceException( EPE_RESULTNAME_CANNOT_BE_NULL );
}
if ( mergeName == null )
{
log.error( "mergeName must be the name of an existing role, not null" );
- throw new EquandaPersistenceException( UPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL );
+ throw new EquandaPersistenceException( EPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL );
}
try
{
@@ -251,7 +251,7 @@
if ( mergeVal == null )
{
log.error( "role " + mergeName + " not found" );
- throw new EquandaPersistenceException( UPE_ROLE_NOT_FOUND, mergeName );
+ throw new EquandaPersistenceException( EPE_ROLE_NOT_FOUND, mergeName );
}
Collection mergeRights = mergeVal.getRights();
Collection ourRights = object.getEquandaProxy().getRights();
Modified: trunk/test/src/main/be/equanda/test/om/server/LinkableMediator.java
===================================================================
--- trunk/test/src/main/be/equanda/test/om/server/LinkableMediator.java 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/test/src/main/be/equanda/test/om/server/LinkableMediator.java 2007-08-22 07:11:44 UTC (rev 44)
@@ -5,7 +5,7 @@
import org.equanda.persistence.om.EquandaPersistenceException;
import org.equanda.test.om.server.pm.DMRemove2Bean;
import org.equanda.test.om.server.pm.DMRemove2Finder;
-import static org.equanda.test.translation.TestExceptionCodes.UCV_REMOVE2_NOT_ALOWED_STRING_TO_ADD;
+import static org.equanda.test.translation.TestExceptionCodes.ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD;
/**
* Description!!!
@@ -57,7 +57,7 @@
DMRemove2Bean obj = DMRemove2Finder.findUOID( em, value );
if ( REMOVE2_NOT_ALOWED_STRING_TO_ADD.equals( obj.getTheString() ) )
{
- throw new EquandaConstraintViolation( UCV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
+ throw new EquandaConstraintViolation( ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
REMOVE2_NOT_ALOWED_STRING_TO_ADD );
}
}
@@ -71,7 +71,7 @@
DMRemove2Bean obj = DMRemove2Finder.findUOID( em, value );
if ( REMOVE2_NOT_ALOWED_STRING_TO_REMOVE.equals( obj.getTheString() ) )
{
- throw new EquandaConstraintViolation( UCV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
+ throw new EquandaConstraintViolation( ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
REMOVE2_NOT_ALOWED_STRING_TO_ADD );
}
}
Modified: trunk/test/src/main/be/equanda/test/om/server/ProgrConstraintsMediator.java
===================================================================
--- trunk/test/src/main/be/equanda/test/om/server/ProgrConstraintsMediator.java 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/test/src/main/be/equanda/test/om/server/ProgrConstraintsMediator.java 2007-08-22 07:11:44 UTC (rev 44)
@@ -43,7 +43,7 @@
{
if ( multipleOf100 % 100 != 0 )
{
- throw new EquandaConstraintViolation( UCV_NUMBER_NOT_MULTIPLE_OF_100, Integer.toString( multipleOf100 ) );
+ throw new EquandaConstraintViolation( ECV_NUMBER_NOT_MULTIPLE_OF_100, Integer.toString( multipleOf100 ) );
}
super.setMultipleOf100( multipleOf100 );
}
Modified: trunk/test/src/main/be/equanda/test/om/server/VehicleWithWingsMediator.java
===================================================================
--- trunk/test/src/main/be/equanda/test/om/server/VehicleWithWingsMediator.java 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/test/src/main/be/equanda/test/om/server/VehicleWithWingsMediator.java 2007-08-22 07:11:44 UTC (rev 44)
@@ -42,7 +42,7 @@
{
if ( speed < 100 )
{
- throw new EquandaDowngradeException( UDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS, new Integer( speed ).toString() );
+ throw new EquandaDowngradeException( EDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS, new Integer( speed ).toString() );
}
try
{
Modified: trunk/test/src/main/be/equanda/test/translation/TestExceptionCodes.java
===================================================================
--- trunk/test/src/main/be/equanda/test/translation/TestExceptionCodes.java 2007-08-21 17:07:57 UTC (rev 43)
+++ trunk/test/src/main/be/equanda/test/translation/TestExceptionCodes.java 2007-08-22 07:11:44 UTC (rev 44)
@@ -31,17 +31,17 @@
*/
public interface TestExceptionCodes
{
- public static int UPE_PROBLEM_IN_AUTOPASSPORT = 100001;
- public static int UPE_PROBLEM_IN_AUTOMULTIPLEAUTO = 100002;
- public static int UPE_PROBLEM_IN_AUTOMULTIPLEPASSPORT = 100003;
- public static int UPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS = 100004;
- public static int UPE_RESULTNAME_CANNOT_BE_NULL = 100005;
- public static int UPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL = 100006;
- public static int UPE_ROLE_NOT_FOUND = 100007;
+ public static int EPE_PROBLEM_IN_AUTOPASSPORT = 100001;
+ public static int EPE_PROBLEM_IN_AUTOMULTIPLEAUTO = 100002;
+ public static int EPE_PROBLEM_IN_AUTOMULTIPLEPASSPORT = 100003;
+ public static int EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS = 100004;
+ public static int EPE_RESULTNAME_CANNOT_BE_NULL = 100005;
+ public static int EPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL = 100006;
+ public static int EPE_ROLE_NOT_FOUND = 100007;
- public static int UCV_NUMBER_NOT_MULTIPLE_OF_100 = 110001;
- public static int UCV_REMOVE2_NOT_ALOWED_STRING_TO_ADD = 110002;
- public static int UCV_REMOVE2_NOT_ALOWED_STRING_TO_REMOVE = 110003;
+ public static int ECV_NUMBER_NOT_MULTIPLE_OF_100 = 110001;
+ public static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD = 110002;
+ public static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_REMOVE = 110003;
- public static int UDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS = 140001;
+ public static int EDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS = 140001;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
