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-08-02 13:16:27
|
Revision: 18
http://equanda.svn.sourceforge.net/equanda/?rev=18&view=rev
Author: triathlon98
Date: 2007-08-02 06:16:26 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
make sure more of the tests actually run
Added Paths:
-----------
trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java
trunk/equanda-generate/src/test/resources/MultipleTest/
trunk/equanda-generate/src/test/resources/NamesTest/
trunk/equanda-generate/src/test/resources/SelectTest/
trunk/equanda-generate/src/test/resources/UniqueNameTest/
trunk/equanda-generate/src/test/resources/UniqueTest/
trunk/equanda-generate/src/test/resources/ValueWhenNullTest/
Removed Paths:
-------------
trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/NamesChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/SelectChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullChecks.java
trunk/equanda-generate/src/test/resources/MultipleChecks/
trunk/equanda-generate/src/test/resources/NamesChecks/
trunk/equanda-generate/src/test/resources/SelectChecks/
trunk/equanda-generate/src/test/resources/UniqueChecks/
trunk/equanda-generate/src/test/resources/UniqueNameChecks/
trunk/equanda-generate/src/test/resources/ValueWhenNullChecks/
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleChecks.java 2007-08-02 13:08:59 UTC (rev 17)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleChecks.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -1,66 +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.generate;
-
-import junit.framework.TestCase;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-/**
- * test for multiple fields not allowing int and double
- *
- * @author NetRom team
- */
-public class MultipleChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testMultipleInt()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://MultipleChecks/MultipleInt.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testMultipleDouble()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://MultipleChecks/MultipleDouble.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -0,0 +1,66 @@
+/**
+ * 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.generate;
+
+import junit.framework.TestCase;
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+
+/**
+ * test for multiple fields not allowing int and double
+ *
+ * @author NetRom team
+ */
+public class MultipleTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testMultipleInt()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://MultipleTest/MultipleInt.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testMultipleDouble()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://MultipleTest/MultipleDouble.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/NamesChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/NamesChecks.java 2007-08-02 13:08:59 UTC (rev 17)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/NamesChecks.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -1,130 +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.generate;
-
-import junit.framework.TestCase;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-
-/**
- * test for invalid names for tables, fields and link-names
- *
- * @author NetRom team
- */
-public class NamesChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testInvalidTableName_0Length()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidTableName-0Length.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidTableName_Invalid1stChar()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidTableName-Invalid1stChar.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidTableName_InvalidChar()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidTableName-InvalidChar.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidTableName_ReservedName()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidTableName-ReservedName.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidFieldName_OLength()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidFieldName-0Length.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidFieldName_Invalid1stChar()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidFieldName-Invalid1stChar.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidFieldName_InvalidChar()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidFieldName-InvalidChar.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidLinkName_Invalid1stChar()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidLinkName-Invalid1stChar.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidLinkName_InvalidChar()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://NamesChecks/InvalidLinkName-InvalidChar.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/NamesChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -0,0 +1,130 @@
+/**
+ * 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.generate;
+
+import junit.framework.TestCase;
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+
+
+/**
+ * test for invalid names for tables, fields and link-names
+ *
+ * @author NetRom team
+ */
+public class NamesTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testInvalidTableName_0Length()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidTableName-0Length.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidTableName_Invalid1stChar()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidTableName-Invalid1stChar.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidTableName_InvalidChar()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidTableName-InvalidChar.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidTableName_ReservedName()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidTableName-ReservedName.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidFieldName_OLength()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidFieldName-0Length.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidFieldName_Invalid1stChar()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidFieldName-Invalid1stChar.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidFieldName_InvalidChar()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidFieldName-InvalidChar.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidLinkName_Invalid1stChar()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidLinkName-Invalid1stChar.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidLinkName_InvalidChar()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://NamesTest/InvalidLinkName-InvalidChar.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/SelectChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/SelectChecks.java 2007-08-02 13:08:59 UTC (rev 17)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/SelectChecks.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -1,138 +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.generate;
-
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-import junit.framework.TestCase;
-
-/**
- * Checks for invalid selects
- *
- * @author NetRom team
- */
-public class SelectChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testDirectSelectionsAndSubselects()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/DirectSelectionsAndSubselects.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testSelectionInvalidTest()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/SelectionInvalidTest.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOrderInvalidField()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/OrderInvalidField.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOrderBooleanField()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/OrderBooleanField.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOrderMultipleField()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/OrderMultipleField.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOrderLinkField()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/OrderLinkField.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testSingleSelectWithLimit()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/SingleSelectWithLimit.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOperatorAddNoSubselects()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/OperatorAddNoSubselects.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOperatorTryNoSubselects()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/OperatorTryNoSubselects.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOperatorAddSingleSelect()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://SelectChecks/OperatorAddSingleSelect.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/SelectChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -0,0 +1,138 @@
+/**
+ * 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.generate;
+
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+import junit.framework.TestCase;
+
+/**
+ * Checks for invalid selects
+ *
+ * @author NetRom team
+ */
+public class SelectTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testDirectSelectionsAndSubselects()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/DirectSelectionsAndSubselects.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testSelectionInvalidTest()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/SelectionInvalidTest.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testOrderInvalidField()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/OrderInvalidField.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testOrderBooleanField()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/OrderBooleanField.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testOrderMultipleField()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/OrderMultipleField.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testOrderLinkField()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/OrderLinkField.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testSingleSelectWithLimit()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/SingleSelectWithLimit.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testOperatorAddNoSubselects()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/OperatorAddNoSubselects.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testOperatorTryNoSubselects()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/OperatorTryNoSubselects.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testOperatorAddSingleSelect()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://SelectTest/OperatorAddSingleSelect.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueChecks.java 2007-08-02 13:08:59 UTC (rev 17)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueChecks.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -1,75 +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.generate;
-
-import junit.framework.TestCase;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-/**
- * test for unique fields not allowing multiple, calculated, link
- *
- * @author NetRom team
- */
-public class UniqueChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testUniqueCalculated()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueChecks/UniqueCalculated.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testUniqueMultiple()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueChecks/UniqueMultiple.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testUniqueLink()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueChecks/UniqueLink.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameChecks.java 2007-08-02 13:08:59 UTC (rev 17)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameChecks.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -1,142 +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.generate;
-
-import junit.framework.TestCase;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-/**
- * test case for unique name enforcement
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- * @author NetRom team
- */
-public class UniqueNameChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testFieldNameNotUnique()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/FieldNameNotUnique.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testTableNameNotUnique()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/TableNameNotUnique.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testTableTypeNotUnique()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/TableTypeNotUnique.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testActionNotUnique()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/ActionNotUnique.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testSelectNotUnique()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/SelectNotUnique.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testBuildNotUnique()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/BuildNotUnique.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testGroupJoin()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/GroupJoin.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertFalse( gen.getFailed() );
- }
-
- /**
- * Failing when same group is in different pages
- *
- * @throws Exception
- */
- public void testGroupJoinFailed1()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/GroupJoinFailed1.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- /**
- * Failing when same group appears at different nesting levels
- *
- * @throws Exception
- */
-
- public void testGroupJoinFailed2()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://UniqueNameChecks/GroupJoinFailed2.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -0,0 +1,142 @@
+/**
+ * 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.generate;
+
+import junit.framework.TestCase;
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+
+/**
+ * test case for unique name enforcement
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @author NetRom team
+ */
+public class UniqueNameTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testFieldNameNotUnique()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/FieldNameNotUnique.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testTableNameNotUnique()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/TableNameNotUnique.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testTableTypeNotUnique()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/TableTypeNotUnique.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testActionNotUnique()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/ActionNotUnique.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testSelectNotUnique()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/SelectNotUnique.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testBuildNotUnique()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/BuildNotUnique.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testGroupJoin()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/GroupJoin.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertFalse( gen.getFailed() );
+ }
+
+ /**
+ * Failing when same group is in different pages
+ *
+ * @throws Exception
+ */
+ public void testGroupJoinFailed1()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/GroupJoinFailed1.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ /**
+ * Failing when same group appears at different nesting levels
+ *
+ * @throws Exception
+ */
+
+ public void testGroupJoinFailed2()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueNameTest/GroupJoinFailed2.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -0,0 +1,75 @@
+/**
+ * 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.generate;
+
+import junit.framework.TestCase;
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+
+/**
+ * test for unique fields not allowing multiple, calculated, link
+ *
+ * @author NetRom team
+ */
+public class UniqueTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testUniqueCalculated()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueTest/UniqueCalculated.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testUniqueMultiple()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueTest/UniqueMultiple.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testUniqueLink()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://UniqueTest/UniqueLink.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullChecks.java 2007-08-02 13:08:59 UTC (rev 17)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullChecks.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -1,94 +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.generate;
-
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-import junit.framework.TestCase;
-
-/**
- * Checks for invalid value-when-null constraints
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- * @author NetRom team
- */
-public class ValueWhenNullChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testValueWhenNullAuto()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ValueWhenNullChecks/ValueWhenNullAuto.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testValueWhenNullCalculated()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ValueWhenNullChecks/ValueWhenNullCalculated.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testValueWhenNullMultiple()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ValueWhenNullChecks/ValueWhenNullMultiple.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testValueWhenNullInvalidType()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ValueWhenNullChecks/ValueWhenNullInvalidType.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testValueWhenNullTwice()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ValueWhenNullChecks/ValueWhenNullTwice.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java 2007-08-02 13:16:26 UTC (rev 18)
@@ -0,0 +1,94 @@
+/**
+ * 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.generate;
+
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+import junit.framework.TestCase;
+
+/**
+ * Checks for invalid value-when-null constraints
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @author NetRom team
+ */
+public class ValueWhenNullTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testValueWhenNullAuto()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ValueWhenNullTest/ValueWhenNullAuto.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testValueWhenNullCalculated()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ValueWhenNullTest/ValueWhenNullCalculated.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testValueWhenNullMultiple()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ValueWhenNullTest/ValueWhenNullMultiple.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testValueWhenNullInvalidType()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ValueWhenNullTest/ValueWhenNullInvalidType.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testValueWhenNullTwice()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ValueWhenNullTest/ValueWhenNullTwice.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
Copied: trunk/equanda-generate/src/test/resources/MultipleTest (from rev 12, trunk/equanda-generate/src/test/resources/MultipleChecks)
Copied: trunk/equanda-generate/src/test/resources/NamesTest (from rev 12, trunk/equanda-generate/src/test/resources/NamesChecks)
Copied: trunk/equanda-generate/src/test/resources/SelectTest (from rev 12, trunk/equanda-generate/src/test/resources/SelectChecks)
Copied: trunk/equanda-generate/src/test/resources/UniqueNameTest (from rev 12, trunk/equanda-generate/src/test/resources/UniqueNameChecks)
Copied: trunk/equanda-generate/src/test/resources/UniqueTest (from rev 12, trunk/equanda-generate/src/test/resources/UniqueChecks)
Copied: trunk/equanda-generate/src/test/resources/ValueWhenNullTest (from rev 12, trunk/equanda-generate/src/test/resources/ValueWhenNullChecks)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-02 13:09:01
|
Revision: 17
http://equanda.svn.sourceforge.net/equanda/?rev=17&view=rev
Author: triathlon98
Date: 2007-08-02 06:08:59 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
make sure more of the tests actually run
Modified Paths:
--------------
trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java
Added Paths:
-----------
trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java
trunk/equanda-generate/src/test/resources/CaseConversionTest/
trunk/equanda-generate/src/test/resources/ChoicesTest/
trunk/equanda-generate/src/test/resources/CompareTest/
trunk/equanda-generate/src/test/resources/DefaultTest/
trunk/equanda-generate/src/test/resources/DisplayTest/
trunk/equanda-generate/src/test/resources/FailOnInvalidDefinitionTest/
trunk/equanda-generate/src/test/resources/ImmutableAndMutableTest/
trunk/equanda-generate/src/test/resources/ImmutableAndMutableTest/ImmutableAndMutable.xml
trunk/equanda-generate/src/test/resources/LinksTest/
trunk/equanda-generate/src/test/resources/LobTest/
Removed Paths:
-------------
trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CompareChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinition.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LinksChecks.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LobChecks.java
trunk/equanda-generate/src/test/resources/CaseConversionChecks/
trunk/equanda-generate/src/test/resources/ChoicesChecks/
trunk/equanda-generate/src/test/resources/CompareChecks/
trunk/equanda-generate/src/test/resources/DefaultChecks/
trunk/equanda-generate/src/test/resources/DisplayChecks/
trunk/equanda-generate/src/test/resources/FailOnInvalidDefinition/
trunk/equanda-generate/src/test/resources/ImmutableAndMutableChecks/
trunk/equanda-generate/src/test/resources/ImmutableAndMutableTest/ImmutableAndMutableChecks.xml
trunk/equanda-generate/src/test/resources/LinksChecks/
trunk/equanda-generate/src/test/resources/LobChecks/
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -25,7 +25,6 @@
package org.equanda.generate;
import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
import junit.framework.TestCase;
/**
@@ -48,7 +47,7 @@
public void testCaseConversionInvalidType()
throws Exception
{
- ini.addValue( "config", "definition", "classpath://CaseConversionChecks/CaseConversionInvalidType.xml" );
+ ini.addValue( "config", "definition", "classpath://CaseConversionTest/CaseConversionInvalidType.xml" );
Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
gen.generate();
assertTrue( gen.getFailed() );
@@ -57,7 +56,7 @@
public void testCaseConversionAuto()
throws Exception
{
- ini.addValue( "config", "definition", "classpath://CaseConversionChecks/CaseConversionAuto.xml" );
+ ini.addValue( "config", "definition", "classpath://CaseConversionTest/CaseConversionAuto.xml" );
Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
gen.generate();
assertTrue( gen.getFailed() );
@@ -66,7 +65,7 @@
public void testCaseConversionCalculated()
throws Exception
{
- ini.addValue( "config", "definition", "classpath://CaseConversionChecks/CaseConversionCalculated.xml" );
+ ini.addValue( "config", "definition", "classpath://CaseConversionTest/CaseConversionCalculated.xml" );
Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
gen.generate();
assertTrue( gen.getFailed() );
@@ -75,7 +74,7 @@
public void testCaseConversionInvalidValue()
throws Exception
{
- ini.addValue( "config", "definition", "classpath://CaseConversionChecks/CaseConversionInvalidValue.xml" );
+ ini.addValue( "config", "definition", "classpath://CaseConversionTest/CaseConversionInvalidValue.xml" );
Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
gen.generate();
assertTrue( gen.getFailed() );
@@ -84,7 +83,7 @@
public void testCaseConversionNoValueNoClass()
throws Exception
{
- ini.addValue( "config", "definition", "classpath://CaseConversionChecks/CaseConversionNoValueNoClass.xml" );
+ ini.addValue( "config", "definition", "classpath://CaseConversionTest/CaseConversionNoValueNoClass.xml" );
Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
gen.generate();
assertTrue( gen.getFailed() );
@@ -94,7 +93,7 @@
public void testCaseConversionBothValueAndClass()
throws Exception
{
- ini.addValue( "config", "definition", "classpath://CaseConversionChecks/CaseConversionBothValueAndClass.xml" );
+ ini.addValue( "config", "definition", "classpath://CaseConversionTest/CaseConversionBothValueAndClass.xml" );
Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
gen.generate();
assertTrue( gen.getFailed() );
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesChecks.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesChecks.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -1,102 +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.generate;
-
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-import junit.framework.TestCase;
-
-/**
- * Checks for invalid choices
- *
- * @author NetRom team
- */
-public class ChoicesChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testChoiceDate()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ChoicesChecks/ChoiceDate.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testChoiceTimestamp()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ChoicesChecks/ChoiceTimestamp.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testChoiceCalculated()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ChoicesChecks/ChoiceCalculated.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidBoolean()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ChoicesChecks/ChoiceInvalidBoolean.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidInt()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ChoicesChecks/ChoiceInvalidInt.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInvalidDouble()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ChoicesChecks/ChoiceInvalidDouble.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -0,0 +1,102 @@
+/**
+ * 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.generate;
+
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+import junit.framework.TestCase;
+
+/**
+ * Checks for invalid choices
+ *
+ * @author NetRom team
+ */
+public class ChoicesTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testChoiceDate()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ChoicesTest/ChoiceDate.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testChoiceTimestamp()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ChoicesTest/ChoiceTimestamp.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testChoiceCalculated()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ChoicesTest/ChoiceCalculated.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidBoolean()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ChoicesTest/ChoiceInvalidBoolean.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidInt()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ChoicesTest/ChoiceInvalidInt.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInvalidDouble()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ChoicesTest/ChoiceInvalidDouble.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/CompareChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/CompareChecks.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/CompareChecks.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -1,192 +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.generate;
-
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-import junit.framework.TestCase;
-
-/**
- * test case for compare limitations
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- * @author NetRom team
- */
-public class CompareChecks
- extends TestCase
-{
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testCompareAuto()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareAuto.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareCalculated()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareCalculated.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareMultiple()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareMultiple.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareGlobalAuto()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareGlobalAuto.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareGlobalCalculated()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareGlobalCalculated.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareGlobalMultiple()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareGlobalMultiple.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareDifferentTypes()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareDifferentTypes.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareGlobalDifferentTypes()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareGlobalDifferentTypes.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareBooleanInvalidTest()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareBooleanInvalidTest.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareGlobalBooleanInvalidTest()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareGlobalBooleanInvalidTest.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareInvalidBoolean()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareInvalidBoolean.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareInvalidInt()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareInvalidInt.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareInvalidDouble()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareInvalidDouble.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareInvalidDate()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareInvalidDate.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareInvalidTimestamp()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareInvalidTimestamp.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testCompareGlobalLeftImmutable()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://CompareChecks/CompareGlobalLeftImmutable.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/CompareChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -0,0 +1,192 @@
+/**
+ * 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.generate;
+
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+import junit.framework.TestCase;
+
+/**
+ * test case for compare limitations
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @author NetRom team
+ */
+public class CompareTest
+ extends TestCase
+{
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testCompareAuto()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareAuto.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareCalculated()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareCalculated.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareMultiple()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareMultiple.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareGlobalAuto()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareGlobalAuto.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareGlobalCalculated()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareGlobalCalculated.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareGlobalMultiple()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareGlobalMultiple.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareDifferentTypes()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareDifferentTypes.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareGlobalDifferentTypes()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareGlobalDifferentTypes.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareBooleanInvalidTest()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareBooleanInvalidTest.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareGlobalBooleanInvalidTest()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareGlobalBooleanInvalidTest.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareInvalidBoolean()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareInvalidBoolean.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareInvalidInt()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareInvalidInt.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareInvalidDouble()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareInvalidDouble.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareInvalidDate()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareInvalidDate.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareInvalidTimestamp()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareInvalidTimestamp.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testCompareGlobalLeftImmutable()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://CompareTest/CompareGlobalLeftImmutable.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultChecks.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultChecks.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -1,57 +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.generate;
-
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-import junit.framework.TestCase;
-
-/**
- * Checks for invalid defaults
- *
- * @author NetRom team
- */
-public class DefaultChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testDefaultLink()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://DefaultChecks/DefaultLink.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -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.generate;
+
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+import junit.framework.TestCase;
+
+/**
+ * Checks for invalid defaults
+ *
+ * @author NetRom team
+ */
+public class DefaultTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testDefaultLink()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://DefaultTest/DefaultLink.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayChecks.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayChecks.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -1,64 +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.generate;
-
-import junit.framework.TestCase;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-/**
- * test case for constraints for display fields
- *
- * @author NetRom team
- */
-public class DisplayChecks extends TestCase
-{
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testValueExcludeDisplayed()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://DisplayChecks/ValueExcludeDisplayed.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testInternalDisplayed()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://DisplayChecks/InternalDisplayed.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -0,0 +1,65 @@
+/**
+ * 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.generate;
+
+import junit.framework.TestCase;
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+
+/**
+ * test case for constraints for display fields
+ *
+ * @author NetRom team
+ */
+public class DisplayTest
+ extends TestCase
+{
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testValueExcludeDisplayed()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://DisplayTest/ValueExcludeDisplayed.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testInternalDisplayed()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://DisplayTest/InternalDisplayed.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinition.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinition.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinition.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -1,77 +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.generate;
-
-import junit.framework.TestCase;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-/**
- * test case for invalid definition
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- * @author NetRom team
- */
-public class FailOnInvalidDefinition
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testFailOnInvalidDTD()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://FailOnInvalidDefinition/Invalid.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testAllowValidDTD()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://FailOnInvalidDefinition/Valid.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertFalse( gen.getFailed() );
- }
-
- public void testOutputDirRequired()
- throws Exception
- {
- ini.removeValue( "config", "outputdir" );
- ini.addValue( "config", "definition", "classpath://FailOnInvalidDefinition/Valid.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-}
\ No newline at end of file
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinition.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -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.generate;
+
+import junit.framework.TestCase;
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+
+/**
+ * test case for invalid definition
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @author NetRom team
+ */
+public class FailOnInvalidDefinitionTest
+ extends TestCase
+{
+
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testFailOnInvalidDTD()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://FailOnInvalidDefinitionTest/Invalid.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+
+ public void testAllowValidDTD()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://FailOnInvalidDefinitionTest/Valid.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertFalse( gen.getFailed() );
+ }
+
+ public void testOutputDirRequired()
+ throws Exception
+ {
+ ini.removeValue( "config", "outputdir" );
+ ini.addValue( "config", "definition", "classpath://FailOnInvalidDefinitionTest/Valid.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertTrue( gen.getFailed() );
+ }
+}
\ No newline at end of file
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableChecks.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableChecks.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -1,55 +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.generate;
-
-import junit.framework.TestCase;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-/**
- * test case for immutable/mutable constraints in a parent table depending on fields from a child table
- *
- * @author Coralia Paunoiu
- */
-public class ImmutableAndMutableChecks extends TestCase
-{
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testImmutableAndMutable()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://ImmutableAndMutableChecks/ImmutableAndMutableChecks.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertFalse( gen.getFailed() );
- }
-}
Copied: trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java (from rev 12, trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableChecks.java)
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -0,0 +1,55 @@
+/**
+ * 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.generate;
+
+import junit.framework.TestCase;
+import org.equanda.util.INIFile;
+
+/**
+ * test case for immutable/mutable constraints in a parent table depending on fields from a child table
+ *
+ * @author Coralia Paunoiu
+ */
+public class ImmutableAndMutableTest
+ extends TestCase
+{
+ private INIFile ini = new INIFile();
+
+ protected void setUp()
+ throws Exception
+ {
+ ini.addValue( "config", "template", "null" );
+ ini.addValue( "config", "outputdir", "." );
+ }
+
+ public void testImmutableAndMutable()
+ throws Exception
+ {
+ ini.addValue( "config", "definition", "classpath://ImmutableAndMutableTest/ImmutableAndMutable.xml" );
+ Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
+ gen.generate();
+ assertFalse( gen.getFailed() );
+ }
+}
Deleted: trunk/equanda-generate/src/test/java/org/equanda/generate/LinksChecks.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/LinksChecks.java 2007-08-02 12:56:03 UTC (rev 16)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/LinksChecks.java 2007-08-02 13:08:59 UTC (rev 17)
@@ -1,210 +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.generate;
-
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-import junit.framework.TestCase;
-
-
-/**
- * Checks for invalid and valid links
- *
- * @author NetRom team
- */
-public class LinksChecks
- extends TestCase
-{
-
- private INIFile ini = new INIFile();
-
- protected void setUp()
- throws Exception
- {
- ini.addValue( "config", "template", "null" );
- ini.addValue( "config", "outputdir", "." );
- }
-
- public void testOtherSideSingleFieldNotLink()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/OtherSideSingleWithFieldNotLink.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOtherSideSingleIncorrect()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/OtherSideSingleIncorrect.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testOtherSideMultipleIncorrect()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/OtherSideMultipleIncorrect.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testLinkName2Times()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/LinkName2Times.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testLinkNameDifferentRelations1()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/LinkNameDifferentRelations1.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testLinkNameDifferentRelations2()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/LinkNameDifferentRelations2.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testUseRelationTableFieldNotLink()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/UseRelationTableFieldNotLink.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testUseRelationTableFieldMultiple()
- throws Exception
- {
- ini.addValue( "config", "definition", "classpath://LinksChecks/UseRelationTableFieldMultiple.xml" );
- Generator gen = new Generator( ini, System.getProperty( "equanda-test.omroot.dir" ) );
- gen.generate();
- assertTrue( gen.getFailed() );
- }
-
- public void testUseRelationTableOtherSideSingle()
- throws Exception
- {
- ini.a...
[truncated message content] |
|
From: <tri...@us...> - 2007-08-02 12:56:44
|
Revision: 16
http://equanda.svn.sourceforge.net/equanda/?rev=16&view=rev
Author: triathlon98
Date: 2007-08-02 05:56:03 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
1766074 remove "mapping" from project/om dtd
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java
trunk/equanda-generate/src/main/resources/equanda.dtd
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java 2007-08-02 11:07:22 UTC (rev 15)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java 2007-08-02 12:56:03 UTC (rev 16)
@@ -43,7 +43,6 @@
put( "type", null );
put( "database", null );
put( "table", null );
- put( "mapping", null );
put( "template", null );
put( "default-instance", null );
put( "overwrite-default", null );
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-08-02 11:07:22 UTC (rev 15)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-08-02 12:56:03 UTC (rev 16)
@@ -138,7 +138,7 @@
String delegatePath;
private boolean immutableIfConverted, mutableEvenIfConverted, compareConverted;
- private static String[] childrenList = { "description", "internal", "link-name", "mapping", "choice", "multiple",
+ private static String[] childrenList = { "description", "internal", "link-name", "choice", "multiple",
"owner", "auto", "calculated", "other-side-multiple", "other-side-single",
"value-include", "value-exclude", "cascade-keep", "cascade-delete", "allow-delete",
"default", "use-relation-table", "use-relation-field", "suggest", "cloneable", "not-cloneable",
@@ -332,22 +332,8 @@
public boolean canAppendChild( CharSequence tag, Attributes attr )
{
- if ( tag.equals( "mapping" ) )
+ if ( tag.equals( "multiple" ) )
{
- String db = attr.getValue( "database" ).toString();
- if ( db == null | db.equals( "" ) )
- {
- dbName = attr.getValue( "name" ).toString();
- }
- else
- {
- // @todo use getDatabase in generator combined with the database name to replace dbName when
- // a mapping child tag with the database name is given
- }
- return false;
- }
- else if ( tag.equals( "multiple" ) )
- {
// check if it's int, double, blob, clob
if ( getFieldType() == ( TYPE_INT ) )
{
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-08-02 11:07:22 UTC (rev 15)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-08-02 12:56:03 UTC (rev 16)
@@ -94,7 +94,7 @@
private String defaultInstanceClass;
private static String[] childrenList = {
- "description", "mapping", "if", "template", "security-role", "default-instance",
+ "description", "if", "template", "security-role", "default-instance",
"security-role-remove", "page", "cloneable", "not-cloneable", "cascade-keep",
"constraints", "hide", "no-hide", "select", "build", "action", "include", "data-filter" };
private static String[] constraintsChildrenList = { "unique", "required", "immutable", "immutable-if",
@@ -241,22 +241,8 @@
public boolean canAppendChild( CharSequence tag, Attributes attr )
{
- if ( tag.equals( "mapping" ) )
+ if ( tag.equals( "immutable-if" ) )
{
- String db = attr.getValue( "database" ).toString();
- if ( db == null || db.equals( "" ) )
- {
- dbName = attr.getValue( "name" ).toString();
- }
- else
- {
- // @todo use getDatabase in generator combined with the database name to replace dbName when
- // a mapping child tag with the database name is given
- }
- return false;
- }
- else if ( tag.equals( "immutable-if" ) )
- {
if ( immutableIf == null ) immutableIf = new ArrayList<MutableIf>();
immutableIf.add( new MutableIf( attr.getValue( "field" ) ) );
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java 2007-08-02 11:07:22 UTC (rev 15)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java 2007-08-02 12:56:03 UTC (rev 16)
@@ -111,7 +111,7 @@
String delegateField;
String delegatePath;
- private static String[] childrenList = { "internal", "mapping", "choice", "multiple",
+ private static String[] childrenList = { "internal", "choice", "multiple",
"owner", "auto", "calculated", "other-side-multiple", "other-side-single",
"cascade-keep", "cascade-delete", "allow-delete",
"default", "use-relation-table", "use-relation-field", "suggest",
Modified: trunk/equanda-generate/src/main/resources/equanda.dtd
===================================================================
--- trunk/equanda-generate/src/main/resources/equanda.dtd 2007-08-02 11:07:22 UTC (rev 15)
+++ trunk/equanda-generate/src/main/resources/equanda.dtd 2007-08-02 12:56:03 UTC (rev 16)
@@ -58,7 +58,6 @@
-->
<!ELEMENT table (
(description)?,
- (mapping|%param.tag;)*,
(template|%param.tag;)*,
(default-instance)?,
(security-role)?,
@@ -84,13 +83,6 @@
category CDATA #IMPLIED
>
-<!ELEMENT mapping EMPTY>
-<!ATTLIST mapping
-database CDATA #IMPLIED
-name CDATA #REQUIRED
-true CDATA #IMPLIED
-false CDATA #IMPLIED>
-
<!--
Template table definition.
This is actually a kind of inheritance. As Java only supports single inheritance, the inheritance on the
@@ -173,7 +165,6 @@
<!ELEMENT field ( (description)?,
(internal)?,
(link-name)?,
- (mapping|%param.tag;)*,
(choice)*,
(multiple)?,
(owner)?,
@@ -209,7 +200,6 @@
<!-- simple type definition, which allows certain field settings to be filled automatically -->
<!ELEMENT type (
(internal)?,
- (mapping|%param.tag;)*,
(choice)*,
(multiple)?,
(owner)?,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-02 11:07:26
|
Revision: 15
http://equanda.svn.sourceforge.net/equanda/?rev=15&view=rev
Author: triathlon98
Date: 2007-08-02 04:07:22 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
1766014 add login/logout actions, not yet used
Modified Paths:
--------------
trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
Modified: trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
===================================================================
--- trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2007-08-02 09:09:22 UTC (rev 14)
+++ trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2007-08-02 11:07:22 UTC (rev 15)
@@ -14,7 +14,7 @@
</constraints>
</field>
<field name="FirstName" type="string" length="30"/>
- <field name="LastName" type="string" length="30"/>
+ <field name="Name" type="string" length="30"/>
</page>
<page>
<field name="Password" type="string" length="10" renderer="password"/>
@@ -66,7 +66,7 @@
<select name="FullName">
<selection field="FirstName"/>
- <selection field="LastName"/>
+ <selection field="Name"/>
<security-role>NONE</security-role>
</select>
@@ -85,4 +85,19 @@
<security-role>NONE</security-role>
<hide/>
</select>
+
+ <action name="login">
+ <description>
+ Action which should be called automatically when logging in.
+ </description>
+ </action>
+
+ <action name="logout">
+ <description>
+ Action which should be called automatically when logging out.
+ It is not guaranteed that this is called, specifically it will not be called when the session times out.
+ It may also not be called in other cases.
+ </description>
+ </action>
+
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-08-02 09:09:24
|
Revision: 14
http://equanda.svn.sourceforge.net/equanda/?rev=14&view=rev
Author: triathlon98
Date: 2007-08-02 02:09:22 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
make cobertura plugin behave better on clean
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-07-13 13:44:04 UTC (rev 13)
+++ trunk/pom.xml 2007-08-02 09:09:22 UTC (rev 14)
@@ -101,18 +101,18 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.0</version>
+ <!--<version>2.0</version>-->
<configuration>
<instrumentation></instrumentation>
</configuration>
- <!--<executions>
- <execution>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- -->
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</reporting>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-07-13 13:44:07
|
Revision: 13
http://equanda.svn.sourceforge.net/equanda/?rev=13&view=rev
Author: triathlon98
Date: 2007-07-13 06:44:04 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
fixes to assure component templates are found
Modified Paths:
--------------
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-07-13 10:11:02 UTC (rev 12)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-07-13 13:44:04 UTC (rev 13)
@@ -92,7 +92,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/action/EquandaAction/EquandaAction.html" )
+ @Asset( value = "/org/equanda/tapestry/components/action/equandaAction/EquandaAction.html" )
public abstract IAsset get$template();
@Component( type = "For", id = "foreachParameter",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java 2007-07-13 10:11:02 UTC (rev 12)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java 2007-07-13 13:44:04 UTC (rev 13)
@@ -42,7 +42,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/action/EquandaParameter/EquandaParameter.html" )
+ @Asset( value = "/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.html" )
public abstract IAsset get$template();
}
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java 2007-07-13 10:11:02 UTC (rev 12)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java 2007-07-13 13:44:04 UTC (rev 13)
@@ -77,7 +77,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/select/EquandaSelect/EquandaSelect.html" )
+ @Asset( value = "/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.html" )
public abstract IAsset get$template();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java 2007-07-13 10:11:02 UTC (rev 12)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java 2007-07-13 13:44:04 UTC (rev 13)
@@ -42,7 +42,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/select/EquandaSelectField/EquandaSelectField.html" )
+ @Asset( value = "/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.html" )
public abstract IAsset get$template();
public String getLineId()
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java 2007-07-13 10:11:02 UTC (rev 12)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java 2007-07-13 13:44:04 UTC (rev 13)
@@ -59,7 +59,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/select/EquandaSelectParameters/EquandaSelectParameters.html" )
+ @Asset( value = "/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.html" )
public abstract IAsset get$template();
/**
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java 2007-07-13 10:11:02 UTC (rev 12)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java 2007-07-13 13:44:04 UTC (rev 13)
@@ -150,7 +150,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/select/EquandaSelectResults/EquandaSelectResults.html" )
+ @Asset( value = "/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.html" )
public abstract IAsset get$template();
@Asset( value = "/images/arrow-up.gif" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-07-13 10:11:05
|
Revision: 12
http://equanda.svn.sourceforge.net/equanda/?rev=12&view=rev
Author: triathlon98
Date: 2007-07-13 03:11:02 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
some code cleanup
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-07-12 19:06:07 UTC (rev 11)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-07-13 10:11:02 UTC (rev 12)
@@ -2207,55 +2207,27 @@
{
if ( caseConversionType != CaseConversionType.NONE )
{
- if ( !isString() )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is not string so it cannot have case" );
- return false;
- }
- if ( isAuto() )
- {
- gen.setFailed( true );
- SaveException.error( "Field " + table.getName() + '.' + this.name + " is auto so it cannot have case" );
- return false;
- }
- if ( isCalculated() )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is calculated so it cannot have case" );
- return false;
- }
+ if ( !isString() ) return err( "is not string so it cannot have case" );
+ if ( isAuto() ) return err( "is auto so it cannot have case" );
+ if ( isCalculated() ) return err( "is calculated so it cannot have case" );
}
if ( unique )
{
// check if it's multiple, calculated, link
- if ( multiple )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is multiple so it can not be unique" );
- return false;
- }
- if ( calculated )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is calculated so it can not be unique" );
- return false;
- }
- if ( isLink() )
- {
- gen.setFailed( true );
- SaveException
- .error( "Field " + table.getName() + '.' + this.name + " is link so it can not be unique" );
- return false;
- }
+ if ( multiple ) return err( "is multiple so it can not be unique" );
+ if ( calculated ) return err( "is calculated so it can not be unique" );
+ if ( isLink() ) return err( "is link so it can not be unique" );
}
return true;
}
+ private boolean err( String msg )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Field " + table.getName() + '.' + this.name + ' ' + msg );
+ return false;
+ }
+
public boolean hasSecurityRole()
{
return getSecurityRole() != null && !getSecurityRole().equals( "NONE" );
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-07-12 19:06:07 UTC (rev 11)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-07-13 10:11:02 UTC (rev 12)
@@ -34,7 +34,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
-import java.util.List;
/**
* a node for processing the XML tree
@@ -63,7 +62,7 @@
private String replace; // replace this table by given file or directory (dir starts with "$")
private String database; // database name for this table
private String baseClass; // parent class for the objects,
- private ArrayList tableChild = new ArrayList(); // list if tables which inherit from this table
+ private ArrayList<OMTable> tableChild = new ArrayList<OMTable>(); // list if tables which inherit from this table
boolean cloneable; // is this Table cloneable?
boolean cascadeKeep;
private ArrayList<OMSelect> selects;
@@ -389,7 +388,6 @@
{
Node tree = doc.getDocumentRoot();
doc.removeChild( tree );
- System.out.println( "add "+file+" in "+this.getParentNode().getTagName() );
this.getParentNode().appendChild( tree );
}
}
@@ -905,10 +903,10 @@
return getChildren( "action" );
}
- private ArrayList getChildren( String name )
+ private ArrayList<Node> getChildren( String name )
{
NodeList nl = getNodesByTagName( name );
- ArrayList list = new ArrayList( nl.getLength() );
+ ArrayList<Node> list = new ArrayList<Node>( nl.getLength() );
for ( int i = 0; i < nl.getLength() ; i++ ) list.add( nl.item( i ) );
return list;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-07-12 19:06:09
|
Revision: 11
http://equanda.svn.sourceforge.net/equanda/?rev=11&view=rev
Author: triathlon98
Date: 2007-07-12 12:06:07 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
allow simple type templates (type and length)
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMEquanda.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
trunk/equanda-generate/src/main/resources/equanda.dtd
trunk/equanda-util/src/main/java/org/equanda/util/xml/XMLParser.java
Added Paths:
-----------
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java
trunk/equanda-generate/src/test/resources/TableInclude/
trunk/equanda-generate/src/test/resources/TableInclude/IncludedTable.table
trunk/equanda-generate/src/test/resources/TableInclude/TableDirInclude.xml
trunk/equanda-util/src/main/java/org/equanda/util/xml/tree/DocumentFactory.java
Removed Paths:
-------------
trunk/equanda-generate/src/test/java/org/equanda/generate/AllTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionChecks.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-07-06 14:40:12 UTC (rev 10)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2007-07-12 19:06:07 UTC (rev 11)
@@ -461,7 +461,7 @@
OMAction action;
for ( int a = 0; a < table.getActions().size() ; a++ )
{
- action = (OMAction) table.getActions().get( a );
+ action = table.getActions().get( a );
if ( !action.isHidden() )
{
context.put( "action", action );
@@ -835,7 +835,7 @@
}
}
- private static void transform( Document doc )
+ public void transform( Document doc )
{
Node next, element = doc.getDocumentRoot();
// now move through the tree again, allowing transformations to be done
@@ -855,7 +855,7 @@
}
}
- private static void parseTemplates( Document doc )
+ public void parseTemplates( Document doc )
{
Node next, element = doc.getDocumentRoot();
// move through the tree again, parsing the templates
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java 2007-07-06 14:40:12 UTC (rev 10)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/EquandaNodesMap.java 2007-07-12 19:06:07 UTC (rev 11)
@@ -40,6 +40,7 @@
public EquandaNodesMap()
{
put( "equanda", null );
+ put( "type", null );
put( "database", null );
put( "table", null );
put( "mapping", null );
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMEquanda.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMEquanda.java 2007-07-06 14:40:12 UTC (rev 10)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMEquanda.java 2007-07-12 19:06:07 UTC (rev 11)
@@ -40,7 +40,7 @@
implements NodeWithChildConstraints
{
- private static String[] childrenList = { "database", "if", "user-interface" };
+ private static String[] childrenList = { "database", "if", "user-interface", "type" };
public String[] getChildrenList()
{
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-07-06 14:40:12 UTC (rev 10)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-07-12 19:06:07 UTC (rev 11)
@@ -189,31 +189,37 @@
{
equandaType = value.toString();
type = TYPE_LINK;
- if ( value.equals( "string" ) ) type = TYPE_STRING;
- if ( value.equals( "boolean" ) ) type = TYPE_BOOLEAN;
- if ( value.equals( "date" ) )
+ if ( "string".equals( equandaType ) )
{
+ type = TYPE_STRING;
+ }
+ else if ( "boolean".equals( equandaType ) )
+ {
+ type = TYPE_BOOLEAN;
+ }
+ else if ( "date".equals( equandaType ) )
+ {
type = TYPE_DATE;
}
- if ( value.equals( "timestamp" ) )
+ else if ( "timestamp".equals( equandaType ) )
{
type = TYPE_TIMESTAMP;
}
- if ( value.equals( "int" ) )
+ else if ( "int".equals( equandaType ) )
{
type = TYPE_INT;
defaultValue = "0";
}
- if ( value.equals( "double" ) )
+ else if ( "double".equals( equandaType ) )
{
type = TYPE_DOUBLE;
defaultValue = "0.0";
}
- if ( value.equals( "blob" ) )
+ else if ( "blob".equals( equandaType ) )
{
type = TYPE_BLOB;
}
- if ( value.equals( "clob" ) )
+ else if ( "clob".equals( equandaType ) )
{
type = TYPE_CLOB;
}
@@ -230,7 +236,6 @@
throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
"Field " + getParentName() + '.' + this.name +
" - length parameter should be integer" );
-
}
}
else if ( name.equals( "display-length" ) )
@@ -244,7 +249,6 @@
throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
"Field " + getParentName() + '.' + this.name +
" - display length parameter should be integer" );
-
}
}
else if ( name.equals( "renderer" ) )
@@ -292,8 +296,7 @@
|| value.charAt( 0 ) == '_' )
{
throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
- "Field " + getParentName() + '.' + value
- +
+ "Field " + getParentName() + '.' + value +
" - invalid fieldname, should not start with \"equanda\" or \"UOID\" or \"_\"" );
}
}
@@ -304,8 +307,7 @@
|| value.charAt( 0 ) == '_' )
{
throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
- "Field " + getParentName() + '.' + this.name
- +
+ "Field " + getParentName() + '.' + this.name +
" - invalid singular name, should not start with \"equanda\" or \"UOID\" or \"_\"" );
}
}
@@ -378,28 +380,6 @@
}
else if ( tag.equals( "unique" ) )
{
- // check if it's multiple, calculated, link
- if ( multiple )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is multiple so it can not be unique" );
- return false;
- }
- if ( calculated )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is calculated so it can not be unique" );
- return false;
- }
- if ( isLink() )
- {
- gen.setFailed( true );
- SaveException
- .error( "Field " + table.getName() + '.' + this.name + " is link so it can not be unique" );
- return false;
- }
unique = true;
if ( attr.getValue( "convert-class" ) != null )
{
@@ -920,26 +900,6 @@
}
else if ( tag.equals( "case" ) )
{
- if ( !isString() )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is not string so it cannot have case" );
- return false;
- }
- if ( isAuto() )
- {
- gen.setFailed( true );
- SaveException.error( "Field " + table.getName() + '.' + this.name + " is auto so it cannot have case" );
- return false;
- }
- if ( isCalculated() )
- {
- gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is calculated so it cannot have case" );
- return false;
- }
if ( attr.getValue( "value" ) == null && attr.getValue( "class" ) == null )
{
gen.setFailed( true );
@@ -1795,7 +1755,7 @@
return defaultValue;
}
- /**
+ /*
* Used in ddltool
* Tries to replace choice names with values
* For strings, returns the default value surrounded by \' (to be inserted in another string)
@@ -1887,7 +1847,7 @@
public String toString()
{
- return "<field name=\"" + getName() + "\"/>\n";
+ return "<field name=\"" + getName() + "\" type=\"" + equandaType + "\" / >\n";
}
/**
@@ -1897,6 +1857,43 @@
{
if ( type == TYPE_LINK )
{
+ // it could well be that this is actually a type template, not a table
+ if ( Character.isLowerCase( linkTableName.charAt( 0 ) ) )
+ {
+ // complex type, use that
+ boolean found = false;
+ Node node = this.getParentNode();
+ while ( !( node instanceof OMEquanda ) ) node = node.getParentNode();
+ NodeList nl = node.getNodesByTagName( "type" );
+ for ( int i = 0; i < nl.getLength() ; i++ )
+ {
+ OMType omType = (OMType) nl.item( i );
+ if ( equandaType.equals( omType.getName() ) )
+ {
+ found = true;
+ this.type = omType.getType();
+ equandaType = omType.getEquandaType();
+ if ( this.type == TYPE_LINK ) linkTableName = equandaType;
+ if ( renderer == null ) renderer = omType.getRenderer();
+ if ( length == 0 ) length = omType.getFieldLength();
+ if ( displayLength == 0 ) displayLength = omType.getDisplayLength();
+ // @todo we need more from the template here, like all constraints etc
+ }
+ }
+ if ( !found )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR, "Field " + getParentName() +
+ '.' + this.name + " type " +
+ linkTableName + " unknown" );
+ }
+ }
+ }
+
+ // do some basic validation, only done at this point because base type replacement needs to be done
+ doValidation();
+
+ if ( type == TYPE_LINK )
+ {
// if this field is a link, check that the linked table exists (and is root)
String tableRootName = table.getRoot().getName();
Node node = this.getParentNode();
@@ -2049,8 +2046,8 @@
if ( !found )
{
gen.setFailed( true );
- SaveException.error(
- "Field " + table.getName() + '.' + this.name + " has unknown type (or is not root)" );
+ SaveException.error( "Field " + table.getName() + '.' + this.name + " has unknown type " +
+ linkTableName + " (or is not root)" );
}
if ( !( bidirectional && otherSideMultiplicity == OTHER_SIDE_MULTIPLE ) && useRelationTable )
{
@@ -2206,6 +2203,59 @@
}
}
+ private boolean doValidation()
+ {
+ if ( caseConversionType != CaseConversionType.NONE )
+ {
+ if ( !isString() )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Field " + table.getName() + '.' + this.name + " is not string so it cannot have case" );
+ return false;
+ }
+ if ( isAuto() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Field " + table.getName() + '.' + this.name + " is auto so it cannot have case" );
+ return false;
+ }
+ if ( isCalculated() )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Field " + table.getName() + '.' + this.name + " is calculated so it cannot have case" );
+ return false;
+ }
+ }
+ if ( unique )
+ {
+ // check if it's multiple, calculated, link
+ if ( multiple )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Field " + table.getName() + '.' + this.name + " is multiple so it can not be unique" );
+ return false;
+ }
+ if ( calculated )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Field " + table.getName() + '.' + this.name + " is calculated so it can not be unique" );
+ return false;
+ }
+ if ( isLink() )
+ {
+ gen.setFailed( true );
+ SaveException
+ .error( "Field " + table.getName() + '.' + this.name + " is link so it can not be unique" );
+ return false;
+ }
+ }
+ return true;
+ }
+
public boolean hasSecurityRole()
{
return getSecurityRole() != null && !getSecurityRole().equals( "NONE" );
@@ -2437,7 +2487,7 @@
{
for ( MutableIf constraint : constraints )
{
- al.add( (MutableIf) constraint );
+ al.add( constraint );
}
}
constraints = getImutableIf( table, true, true );
@@ -2445,7 +2495,7 @@
{
for ( MutableIf constraint : constraints )
{
- al.add( (MutableIf) constraint );
+ al.add( constraint );
}
}
return al;
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-07-06 14:40:12 UTC (rev 10)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-07-12 19:06:07 UTC (rev 11)
@@ -389,6 +389,7 @@
{
Node tree = doc.getDocumentRoot();
doc.removeChild( tree );
+ System.out.println( "add "+file+" in "+this.getParentNode().getTagName() );
this.getParentNode().appendChild( tree );
}
}
Added: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMType.java 2007-07-12 19:06:07 UTC (rev 11)
@@ -0,0 +1,1422 @@
+/**
+ * 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.xml;
+
+import org.equanda.util.xml.tree.*;
+import org.equanda.util.SaveException;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.DateTimeFormat;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import javolution.util.FastMap;
+import javolution.xml.sax.Attributes;
+
+/**
+ * Representation of a generic type which can be used as base field definition
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @version $Revision $
+ */
+public class OMType
+ extends OMDefaultParent
+ implements CharacterData, NodeWithAttributeConstraints, NodeWithChildConstraints
+{
+ private static enum CaseConversionType
+ {
+ NONE, VALUE, CLASS
+ }
+
+ private static final int TAG_DEFAULT = 1;
+ private static final int TAG_LINK_NAME = 2;
+ private static final int TAG_WS_VALUE = 3;
+ private static final int TAG_WS_ROLE = 4;
+ private static final int TAG_SECURITY_ROLE = 5;
+ private static final int TAG_UNKNOWN = 6;
+
+ private static final int OTHER_SIDE_UNKNOWN = 1;
+ private static final int OTHER_SIDE_SINGLE = 2;
+ private static final int OTHER_SIDE_MULTIPLE = 3;
+
+ // general info
+ private String name;
+ private String singular;
+ private String defaultValue; // default value for field, including assignment operator
+ private boolean owner; // this field is the owner in a bidirectional link
+ private boolean multiple; // are several values allowed in this field?
+ private int type = OMField.TYPE_STRING;
+ private String equandaType="string";
+ int length, displayLength;
+ private String linkName; // name for link (to allow bi-directional links, not obligatory)
+ private boolean inherited; // indicates whether this is a inherited field
+ private boolean auto;
+ private boolean calculated;
+ private boolean internal;
+ private int inTag; // currently processed tag for appendData
+ private boolean display; // show field in short reference to object?
+ private boolean hide; // hide field in GUI?
+ private boolean hideIf; // hide field in GUI depending on a class?
+ private String hideIfClass; // Class implementing the HideIf interface, to be used in GUI at runtime, determining the visibility of the field
+ private String wsValue = "UOID"; // field to serialize for ws queries for linked fields
+ private String wsRole = "|all|"; // roles which can get this field when serializing for ws queries
+ private String securityRole;
+ private int otherSideMultiplicity = OTHER_SIDE_UNKNOWN; // multiplicity of other side (for links only)
+ private String defaultType; // type of default: value, auto, class
+ private boolean embedded;
+ private boolean cascadeDelete;
+ private boolean cascadeKeep;
+ private boolean allowDelete = true;
+ private boolean useRelationTable;
+ private boolean fieldReference, fieldDescription;
+ private boolean indexed; // true when field should be indexed
+ private Suggest suggest;
+ private CaseConversionType caseConversionType = CaseConversionType.NONE;
+ private String caseConversion; // "upper", "lower", "mixed", or a class name
+ private String renderer;
+
+ // constraints
+ boolean immutable;
+ boolean unique;
+ String uniqueConverter = null;
+ boolean required;
+ boolean compared;
+ boolean valueWhenNull;
+ boolean valueWhenZero;
+ ArrayList<MutableIf> immutableIf, mutableEvenIf;
+ ArrayList<Compare> compare;
+ String delegateField;
+ String delegatePath;
+
+ private static String[] childrenList = { "internal", "mapping", "choice", "multiple",
+ "owner", "auto", "calculated", "other-side-multiple", "other-side-single",
+ "cascade-keep", "cascade-delete", "allow-delete",
+ "default", "use-relation-table", "use-relation-field", "suggest",
+ "constraints", "display", "no-display", "hide", "no-hide", "ws-value",
+ "ws-role", "indexed", "case", "security-role", "if",
+ "is-reference", "is-description", "embedded" };
+
+ private static final String[] requiredAttributes = { "name", "type" };
+
+ private static final Map<String, AttributeConstraints> attributeConstraints =
+ new FastMap<String, AttributeConstraints>();
+
+ static
+ {
+ attributeConstraints.put( "type", new AttributeConstraints( "string", null ) );
+ attributeConstraints.put( "renderer", new AttributeConstraints( "default", null ) );
+ }
+
+ public Map<String, AttributeConstraints> getAttributeConstraints()
+ {
+ return attributeConstraints;
+ }
+
+ public String[] getRequiredAttributes()
+ {
+ return requiredAttributes;
+ }
+
+ public String[] getChildrenList()
+ {
+ return childrenList;
+ }
+
+ public void setAttribute( CharSequence name, CharSequence value )
+ throws XMLTreeException
+ {
+ String val = value.toString();
+ if ( name.equals( "type" ) )
+ {
+ equandaType = value.toString();
+ type = OMField.TYPE_LINK;
+ if ( value.equals( "string" ) ) type = OMField.TYPE_STRING;
+ if ( value.equals( "boolean" ) ) type = OMField.TYPE_BOOLEAN;
+ if ( value.equals( "date" ) ) type = OMField.TYPE_DATE;
+ if ( value.equals( "timestamp" ) ) type = OMField.TYPE_TIMESTAMP;
+ if ( value.equals( "int" ) )
+ {
+ type = OMField.TYPE_INT;
+ defaultValue = "0";
+ }
+ if ( value.equals( "double" ) )
+ {
+ type = OMField.TYPE_DOUBLE;
+ defaultValue = "0.0";
+ }
+ if ( value.equals( "blob" ) ) type = OMField.TYPE_BLOB;
+ if ( value.equals( "clob" ) ) type = OMField.TYPE_CLOB;
+ }
+ else if ( name.equals( "length" ) )
+ {
+ try
+ {
+ length = Integer.parseInt( value.toString() );
+ }
+ catch ( NumberFormatException nfe )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Type " + this.name + " - length parameter should be integer" );
+ }
+ }
+ else if ( name.equals( "display-length" ) )
+ {
+ try
+ {
+ displayLength = Integer.parseInt( value.toString() );
+ }
+ catch ( NumberFormatException nfe )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Type " + this.name + " - display length parameter should be integer" );
+ }
+ }
+ else if ( name.equals( "renderer" ) )
+ {
+ renderer = value.toString();
+ }
+ else if ( name.equals( "name" ) )
+ {
+ if ( value.length() == 0 )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Type " + value + " - name can not be 0 in length" );
+ }
+ char charsName[] = val.toCharArray();
+ if ( !Character.isLowerCase( charsName[ 0 ] ) )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Type " + value + " - name should start with a lower case letter" );
+ }
+
+ for ( int i = 1; i < charsName.length ; i++ )
+ {
+ if ( ( !Character.isLetter( charsName[ i ] ) ) && ( !Character.isDigit( charsName[ i ] ) ) &&
+ ( charsName[ i ] != '_' ) )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR, "Type " + value +
+ " Field name can only contain letters, digits and underscores (found " +
+ charsName[ i ] + " in " + val +
+ ')' );
+ }
+ }
+ this.name = val;
+ if ( val.toUpperCase().startsWith( "EQUANDA" ) || val.toUpperCase().startsWith( "UOID" )
+ || value.charAt( 0 ) == '_' )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Type " + value +
+ " - invalid fieldname, should not start with \"equanda\" or \"UOID\" or \"_\"" );
+ }
+ }
+ else
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR );
+ }
+ }
+
+ public boolean canAppendChild( CharSequence tag, Attributes attr )
+ {
+ if ( tag.equals( "multiple" ) )
+ {
+ // check if it's int, double, blob, clob
+ if ( getFieldType() == ( OMField.TYPE_INT ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is of type int, so it can't be multiple!" );
+ return false;
+ }
+ if ( getFieldType() == ( OMField.TYPE_DOUBLE ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is of type double, so it can't be multiple!" );
+ return false;
+ }
+ multiple = true;
+ }
+ else if ( tag.equals( "owner" ) )
+ {
+ // check if is link
+ if ( type != OMField.TYPE_LINK )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is not of type link, so it can't be the owner!" );
+ return false;
+ }
+ owner = true;
+ }
+ else if ( tag.equals( "unique" ) )
+ {
+ // check if it's multiple, calculated, link
+ if ( multiple )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is multiple so it can not be unique" );
+ return false;
+ }
+ if ( calculated )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is calculated so it can not be unique" );
+ return false;
+ }
+ if ( isLink() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is link so it can not be unique" );
+ return false;
+ }
+ unique = true;
+ if ( attr.getValue( "convert-class" ) != null )
+ {
+ uniqueConverter = attr.getValue( "convert-class" ).toString();
+ }
+ }
+ else if ( tag.equals( "internal" ) )
+ {
+ internal = true;
+ hide = true;
+ auto = true; // internal fields are not exposed, so they must have automatic values
+ wsRole = "|none|";
+ }
+ else if ( tag.equals( "required" ) )
+ {
+ required = true;
+ }
+ else if ( tag.equals( "immutable" ) )
+ {
+ immutable = true;
+ required = true;
+ }
+ else if ( tag.equals( "immutable-if" ) )
+ {
+ if ( immutableIf == null ) immutableIf = new ArrayList<MutableIf>();
+ immutableIf.add( new MutableIf( attr.getValue( "field" ) ) );
+ }
+ else if ( tag.equals( "mutable-even-if" ) )
+ {
+ if ( mutableEvenIf == null ) mutableEvenIf = new ArrayList<MutableIf>();
+
+ String field;
+ String when = null;
+ if ( attr.getValue( "field" ) == null )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " mutable-even-if: field is required" );
+ return false;
+ }
+ field = attr.getValue( "field" ).toString();
+ if ( attr.getValue( "when" ) != null )
+ {
+ when = attr.getValue( "when" ).toString();
+ }
+
+ mutableEvenIf.add( new MutableIf( field, when ) );
+ }
+ else if ( tag.equals( "default" ) )
+ {
+ if ( type == OMField.TYPE_LINK )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is link so it cannot have default" );
+ return false;
+ }
+ if ( attr.getValue( "type" ) != null )
+ {
+ defaultType = attr.getValue( "type" ).toString();
+ }
+ // clear possible default, rest is accepted as String
+ defaultValue = "";
+ inTag = TAG_DEFAULT;
+ }
+ else if ( tag.equals( "suggest" ) )
+ {
+ // ignore suggests for fields with choices
+ if ( hasChoice() ) return false;
+
+ boolean valueSuggest = ( attr.getValue( "value" ) != null ) || ( attr.getValue( "value-list" ) != null );
+
+ if ( attr.getValue( "path" ) != null )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - suggest for fields may not have path" );
+ }
+
+ boolean tableAndFieldSuggest = ( attr.getValue( "table" ) != null ) &&
+ ( attr.getValue( "field" ) != null );
+
+ if ( ( attr.getValue( "table" ) != null && !tableAndFieldSuggest ) ||
+ ( attr.getValue( "field" ) != null && !tableAndFieldSuggest ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - suggest for fields should have both field and table, or none" );
+ }
+
+ if ( tableAndFieldSuggest && valueSuggest )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - suggest for fields may not have both table + field and value/value-list " );
+ }
+
+ String field = null;
+ String value = null;
+ String path = null;
+ String strTable = null;
+ String valueList = null;
+
+ if ( attr.getValue( "field" ) != null ) field = attr.getValue( "field" ).toString();
+ if ( attr.getValue( "value" ) != null ) value = attr.getValue( "value" ).toString();
+ if ( attr.getValue( "path" ) != null ) path = attr.getValue( "path" ).toString();
+ if ( attr.getValue( "table" ) != null ) strTable = attr.getValue( "table" ).toString();
+ if ( attr.getValue( "value-list" ) != null ) valueList = attr.getValue( "value-list" ).toString();
+
+ suggest = new Suggest( gen, null, this, value, field, path, strTable, valueList );
+ return false;
+ }
+ else if ( tag.equals( "auto" ) )
+ {
+ auto = true;
+ }
+ else if ( tag.equals( "calculated" ) )
+ {
+ if ( hasChoice() )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Type " + this.name + " has choices so it can not be calculated" );
+ return false;
+ }
+ calculated = true;
+ }
+ else if ( tag.equals( "embedded" ) )
+ {
+ if ( !isLink() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is not a link so it cannot be embedded" );
+ return false;
+ }
+ embedded = true;
+ cascadeDelete = true;
+ }
+ else if ( tag.equals( "cascade-delete" ) )
+ {
+ if ( !isLink() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is not link so it cannot be cascade-delete" );
+ return false;
+ }
+ cascadeDelete = true;
+ }
+ else if ( tag.equals( "cascade-keep" ) )
+ {
+ if ( !isLink() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is not link so it cannot be cascade-keep" );
+ return false;
+ }
+ cascadeKeep = true;
+ }
+ else if ( tag.equals( "allow-delete" ) )
+ {
+ if ( !isLink() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is not link so it cannot be allow-delete" );
+ return false;
+ }
+ allowDelete = true;
+ }
+ else if ( tag.equals( "use-relation-table" ) )
+ {
+ if ( !isLink() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is not link, so it cannot have use-relation-table!" );
+ return false;
+ }
+ if ( isMultiple() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is multiple, so it cannot have use-relation-table!" );
+ return false;
+ }
+ useRelationTable = true;
+ }
+ else if ( tag.equals( "constraints" ) )
+ {
+ // nothing to do, just force that no "constraints" node is created
+ }
+ else if ( tag.equals( "hide" ) )
+ {
+ if ( attr.getValue( "if-class" ) == null )
+ {
+ hide = true;
+ wsRole = "|none|";
+ }
+ else
+ {
+ hideIf = true;
+ hideIfClass = attr.getValue( "if-class" ).toString();
+ }
+ }
+ else if ( tag.equals( "is-reference" ) )
+ {
+ if ( isBlob() || isClob() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + getName() + '.' + this.name + " is lob so it cannot be reference!" );
+
+ }
+ fieldReference = true;
+ }
+ else if ( tag.equals( "is-description" ) )
+ {
+ if ( isBlob() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + getName() + '.' + this.name + " is blob so it cannot be description!" );
+
+ }
+ fieldDescription = true;
+ }
+ else if ( tag.equals( "no-hide" ) )
+ {
+ hide = false;
+ }
+ else if ( tag.equals( "display" ) )
+ {
+ if ( internal )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is internal so it cannot be displayed!" );
+ }
+ display = true;
+ }
+ else if ( tag.equals( "no-display" ) )
+ {
+ display = false;
+ }
+ else if ( tag.equals( "ws-value" ) )
+ {
+ // clear possible default, rest is accepted as String, but only for linked field
+ if ( type != OMField.TYPE_LINK )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - ws-value only allowed for linked fields" );
+ }
+ wsValue = "";
+ inTag = TAG_WS_VALUE;
+ }
+ else if ( tag.equals( "ws-role" ) )
+ {
+ // clear possible default, rest is accepted as String
+ wsRole = "";
+ inTag = TAG_WS_ROLE;
+ }
+ else if ( tag.equals( "value-when-null" ) )
+ {
+ // check if it's multiple, auto, calculated
+ if ( multiple )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is multiple so it can not have value-when-null constraints" );
+ return false;
+ }
+ if ( auto )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is auto so it can not have value-when-null constraints" );
+ return false;
+ }
+ if ( calculated )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is calculated so it can not have value-when-null constraints" );
+ return false;
+ }
+ // check type: it only makes sense for string, date, timestamp, link
+ if ( ( type != OMField.TYPE_STRING ) && ( type != OMField.TYPE_TIMESTAMP ) && ( type != OMField.TYPE_DATE ) &&
+ ( type != OMField.TYPE_LINK ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - value-when-null only allowed for string, date and timestamp" );
+ return false;
+ }
+
+ if ( attr.getValue( "field" ) != null )
+ {
+ delegateField = attr.getValue( "field" ).toString();
+ }
+ if ( attr.getValue( "path" ) != null )
+ {
+ delegatePath = attr.getValue( "path" ).toString();
+ }
+
+ // check if field is the same as current
+ if ( ( delegatePath == null ) && ( name.equals( attr.getValue( "field" ) ) ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - delegated field must be a different field" );
+ return false;
+ }
+ if ( valueWhenNull )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - only one value-when-null constraint is allowed per field" );
+ return false;
+ }
+
+ valueWhenNull = true;
+ }
+ else if ( tag.equals( "value-when-zero" ) )
+ {
+ // check if it's multiple, auto, calculated
+ if ( multiple )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is multiple so it can not have value-when-zero constraints" );
+ return false;
+ }
+ if ( auto )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is auto so it can not have value-when-zero constraints" );
+ return false;
+ }
+ if ( calculated )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is calculated so it can not have value-when-zero constraints" );
+ return false;
+ }
+ // check type: it only makes sense for int and double and boolean
+ if ( ( type != OMField.TYPE_INT ) && ( type != OMField.TYPE_DOUBLE ) && ( type != OMField.TYPE_BOOLEAN ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - value-when-zero only allowed for int and double and boolean" );
+ return false;
+ }
+
+ if ( attr.getValue( "field" ) != null )
+ {
+ delegateField = attr.getValue( "field" ).toString();
+ }
+ if ( attr.getValue( "path" ) != null )
+ {
+ delegatePath = attr.getValue( "path" ).toString();
+ }
+
+ // check if field is the same as current
+ if ( ( delegatePath == null ) && ( name.equals( attr.getValue( "field" ) ) ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - delegated field must be a different field" );
+ return false;
+ }
+ if ( valueWhenZero )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - only one value-when-zero constraint is allowed per field" );
+ return false;
+ }
+
+ valueWhenZero = true;
+ }
+ else if ( tag.equals( "compare" ) )
+ {
+ if ( attr.getValue( "value" ) == null )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Type " + this.name + " value expected for compare at field level" );
+ return false;
+ }
+ addCompare( attr, true );
+ }
+ else if ( tag.equals( "security-role" ) )
+ {
+ inTag = TAG_SECURITY_ROLE;
+ }
+ else if ( tag.equals( "other-side-single" ) )
+ {
+ if ( type != OMField.TYPE_LINK )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - other-side-single can only be used for link fields" );
+ return false;
+ }
+ otherSideMultiplicity = OTHER_SIDE_SINGLE;
+ }
+ else if ( tag.equals( "other-side-multiple" ) )
+ {
+ if ( type != OMField.TYPE_LINK )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - other-side-multiple can only be used for link fields" );
+ return false;
+ }
+ otherSideMultiplicity = OTHER_SIDE_MULTIPLE;
+ }
+ else if ( tag.equals( "case" ) )
+ {
+ if ( !isString() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is not string so it cannot have case" );
+ return false;
+ }
+ if ( isAuto() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is auto so it cannot have case" );
+ return false;
+ }
+ if ( isCalculated() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " is calculated so it cannot have case" );
+ return false;
+ }
+ if ( attr.getValue( "value" ) == null && attr.getValue( "class" ) == null )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " has case but value and class are both null" );
+ return false;
+ }
+ if ( attr.getValue( "value" ) != null && attr.getValue( "class" ) != null )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " has case but value and class are both set" );
+ return false;
+ }
+ if ( attr.getValue( "value" ) != null )
+ {
+ caseConversionType = CaseConversionType.VALUE;
+ caseConversion = attr.getValue( "value" ).toString();
+ if ( !caseConversion.equals( "upper" ) && !caseConversion.equals( "lower" ) &&
+ !caseConversion.equals( "mixed" ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ "- case value should be one of \"upper\", \"lower\", \"mixed\"" );
+ return false;
+ }
+ }
+ else
+ {
+ caseConversionType = CaseConversionType.CLASS;
+ caseConversion = attr.getValue( "class" ).toString();
+ }
+ }
+ else if ( tag.equals( "indexed" ) )
+ {
+ indexed = true;
+ }
+ else if ( tag.equals( "xxx" ) )
+ {
+ System.out.println( "\n\n added xxx \n\n" );
+ }
+ else
+ {
+ if ( tag.equals( "choice" ) )
+ {
+ if ( isBlob() || isClob() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is of type LOB so it cannot have choices!" );
+ return false;
+ }
+ }
+ return super.canAppendChild( tag, attr );
+ }
+ return false;
+ }
+
+ boolean addCompare( Attributes attr, boolean fieldLevel )
+ {
+ // check if it's multiple, auto, compared
+ if ( multiple )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is multiple so it can not have compare constraints" );
+ return false;
+ }
+ if ( auto )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Type " + this.name + " is auto so it can not have compare constraints" );
+ return false;
+ }
+ if ( calculated )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " is calculated so it can not have compare constraints" );
+ return false;
+ }
+ // check if test is valid
+ if ( ( !attr.getValue( "test" ).equals( "=" ) ) &&
+ ( !attr.getValue( "test" ).equals( "!=" ) ) &&
+ ( !attr.getValue( "test" ).equals( "<" ) ) &&
+ ( !attr.getValue( "test" ).equals( ">" ) ) &&
+ ( !attr.getValue( "test" ).equals( "<=" ) ) &&
+ ( !attr.getValue( "test" ).equals( ">=" ) ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - invalid value for test (" + attr.getValue( "test" ) + ')' );
+ return false;
+ }
+ // check if combination of types (field and value) is valid
+ DateTimeFormatter df = DateTimeFormat.forPattern( "yyyy-MM-dd HH:mm:ss" );
+ String strDate = "";
+ if ( fieldLevel )
+ {
+ switch ( type )
+ {
+ case OMField.TYPE_STRING:
+ break;
+ case OMField.TYPE_BOOLEAN:
+ if ( ( !attr.getValue( "value" ).equals( "true" ) ) &&
+ ( !attr.getValue( "value" ).equals( "false" ) ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - value for compare is not boolean (" +
+ attr.getValue( "value" ) + ')' );
+ return false;
+ }
+ // check test...
+ if ( ( !attr.getValue( "test" ).equals( "=" ) ) && ( !attr.getValue( "test" ).equals( "!=" ) ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - test for compare " +
+ attr.getValue( "test" ) + " does not work for boolean" );
+ return false;
+ }
+ break;
+ case OMField.TYPE_DATE:
+ if ( ( attr.getValue( "value" ).equals( "NOW" ) ) ||
+ ( attr.getValue( "value" ).equals( "TODAY" ) ) )
+ {
+ strDate = "new java.sql.Date(System.currentTimeMillis())";
+ }
+ else if ( attr.getValue( "value" ).equals( "YESTERDAY" ) )
+ {
+ strDate = "new java.sql.Date(System.currentTimeMillis()-3600*24*1000)";
+ }
+ else if ( attr.getValue( "value" ).equals( "TOMORROW" ) )
+ {
+ strDate = "new java.sql.Date(System.currentTimeMillis()+3600*24*1000)";
+ }
+ else
+ {
+ //df.applyPattern( "yyyy-MM-dd HH:mm:ss" );
+ try
+ {
+ strDate = "new java.sql.Date(" +
+ df.parseDateTime( attr.getValue( "value" ).toString() ).getMillis() + "L)";
+ }
+ catch ( Exception e )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - value (" + attr.getValue( "value" ) +
+ ") does not match pattern for date (yyyy-MM-dd HH:mm:ss)" );
+ return false;
+ }
+ }
+ break;
+ case OMField.TYPE_TIMESTAMP:
+ if ( ( attr.getValue( "value" ).equals( "NOW" ) ) )
+ {
+ strDate = "new java.sql.Timestamp(System.currentTimeMillis())";
+ }
+ else
+ {
+ //df.applyPattern( "yyyy-MM-dd HH:mm:ss" );
+ try
+ {
+ strDate = "new java.sql.Timestamp(" +
+ df.parseDateTime( attr.getValue( "value" ).toString() ).getMillis() + "L)";
+ }
+ catch ( Exception e )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - value for compare (" +
+ attr.getValue( "value" ) +
+ ") does not match pattern for timestamp (yyyy-MM-dd HH:mm:ss)" );
+ return false;
+ }
+ }
+ break;
+ case OMField.TYPE_INT:
+ try
+ {
+ Integer.parseInt( attr.getValue( "value" ).toString() );
+ }
+ catch ( NumberFormatException e )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - value for compare is not an integer (" +
+ attr.getValue( "value" ) + ')' );
+ return false;
+ }
+ break;
+ case OMField.TYPE_DOUBLE:
+ try
+ {
+ Double.parseDouble( attr.getValue( "value" ).toString() );
+ }
+ catch ( NumberFormatException e )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - value for compare is not a double (" +
+ attr.getValue( "value" ) + ')' );
+ return false;
+ }
+ break;
+ default:
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ "- compare works only on string, int, timestamp, date, double and boolean" );
+ return false;
+ }
+ }
+ else
+ {
+ switch ( type )
+ {
+ case OMField.TYPE_BOOLEAN:
+ //check test...
+ if ( ( !attr.getValue( "test" ).equals( "=" ) ) && ( !attr.getValue( "test" ).equals( "!=" ) ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name + " - test " +
+ attr.getValue( "test" ) + " does not work for boolean" );
+ return false;
+ }
+ case OMField.TYPE_STRING:
+ case OMField.TYPE_DATE:
+ case OMField.TYPE_TIMESTAMP:
+ case OMField.TYPE_INT:
+ case OMField.TYPE_DOUBLE:
+ break;
+ default:
+ gen.setFailed( true );
+ SaveException.error( "Type " + this.name +
+ " - compare works only on string, int, timestamp, date, double and boolean" );
+ return false;
+ }
+ }
+
+ if ( compare == null ) compare = new ArrayList<Compare>();
+ if ( fieldLevel )
+ {
+ if ( ( type == OMField.TYPE_DATE ) || ( type == OMField.TYPE_TIMESTAMP ) )
+ {
+ compare.add( new Compare( attr.getValue( "test" ).toString(), strDate, true ) );
+ }
+ else
+ {
+ compare.add(
+ new Compare( attr.getValue( "test" ).toString(), attr.getValue( "value" ).toString(), true ) );
+ }
+ }
+ else
+ {
+ compare.add( new Compare( attr.getValue( "test" ).toString(),
+ "get" + attr.getValue( "right" ).toString() + "()", false ) );
+ }
+ compared = true;
+ return true;
+ }
+
+ public boolean isLink()
+ {
+ return OMField.TYPE_LINK == type;
+ }
+
+ public boolean isString()
+ {
+ return OMField.TYPE_STRING == type;
+ }
+
+ public boolean isBlob()
+ {
+ return OMField.TYPE_BLOB == type;
+ }
+
+ public boolean isClob()
+ {
+ return OMField.TYPE_CLOB == type;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public int getFieldType()
+ {
+ return type;
+ }
+
+ public boolean isMultiple()
+ {
+ return multiple;
+ }
+
+ public boolean isRequired()
+ {
+ return required;
+ }
+
+ public boolean isImmutable()
+ {
+ return immutable;
+ }
+
+ public boolean isUnique()
+ {
+ return unique;
+ }
+
+ public String getUniqueConverter()
+ {
+ return uniqueConverter;
+ }
+
+ public boolean isAuto()
+ {
+ return auto;
+ }
+
+ public boolean isCalculated()
+ {
+ return calculated;
+ }
+
+ public int getFieldLength()
+ {
+ return length;
+ }
+
+ public int getDisplayLength()
+ {
+ if ( displayLength > 0 ) return displayLength;
+ return getFieldLength();
+ }
+
+ public boolean hasImmutableIf()
+ {
+ return immutableIf != null;
+ }
+
+ public boolean hasMutableEvenIf()
+ {
+ return mutableEvenIf != null;
+ }
+
+ public List<OMChoice> getChoices()
+ {
+ NodeList nl = getNodesByTagName( "choice" );
+ List<OMChoice> list = new ArrayList<OMChoice>( nl.getLength() );
+ for ( int i = 0; i < nl.getLength() ; i++ )
+ {
+ list.add( (OMChoice) nl.item( i ) );
+ }
+ return list;
+ }
+
+ public boolean hasChoice()
+ {
+ return getChoices().size() != 0;
+ }
+
+ public boolean isInternal()
+ {
+ return internal;
+ }
+
+ public boolean isDisplayed()
+ {
+ return display;
+ }
+
+ public boolean isHidden()
+ {
+ return hide;
+ }
+
+ public boolean isHiddenIf()
+ {
+ return hideIf;
+ }
+
+ public String getHideIfClass()
+ {
+ return hideIfClass;
+ }
+
+ public boolean isReference()
+ {
+ return fieldReference;
+ }
+
+ public boolean isDescription()
+ {
+ return fieldDescription;
+ }
+
+ public boolean hasCompare()
+ {
+ return compare != null;
+ }
+
+ public boolean hasValueWhenNull()
+ {
+ return valueWhenNull;
+ }
+
+ public boolean hasValueWhenZero()
+ {
+ return valueWhenZero;
+ }
+
+ public boolean hasDelegatePath()
+ {
+ return delegatePath != null;
+ }
+
+ public String getWsValue()
+ {
+ return wsValue;
+ }
+
+ public String getSingular()
+ {
+ if ( singular == null )
+ {
+ singular = name;
+ if ( singular.charAt( singular.length() - 1 ) == 's' )
+ {
+ singular =
+ singular.substring( 0, singular.length() - 1 );
+ }
+ }
+ return singular;
+ }
+
+ public String getWsRole()
+ {
+ if ( wsRole.length() == 0 )
+ {
+ wsRole = "|none|";
+ }
+ else if ( wsRole.charAt( 0 ) != '|' )
+ {
+ wsRole = '|' + wsRole.replace( ' ', '|' ).replace( ',', '|' ) + '|';
+ }
+ return wsRole;
+ }
+
...
[truncated message content] |
|
From: <tri...@us...> - 2007-07-06 14:40:15
|
Revision: 10
http://equanda.svn.sourceforge.net/equanda/?rev=10&view=rev
Author: triathlon98
Date: 2007-07-06 07:40:12 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
more rename fixes, running seems to work now
Modified Paths:
--------------
trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/util/EquandaAlert.table
trunk/equanda-server/src/main/java/org/equanda/login/LoginInfo.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachmentInputContainer.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInputContainer.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferencesInputBlock/PreferencesInputBlock.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInputBlock/RightsInputBlock.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/navigation/NavigationEntryContainer.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/EquandaBasePage.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/TapestryHome.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/add/AddPage.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/alerts/Alerts.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/shared/AddViewEditUsageMenuListener.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/login/changePassword/ChangePassword.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/startPageConfig/StartPageConfig.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/EditableRightsSelectionModel.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RoleSelectionModel.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RunnableRightsSelectionModel.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/CacheLoaderPersister.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/LoaderType.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/util/LoginResolver.java
trunk/equanda-tapestry/src/main/resources/META-INF/hivemodule.xml
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/EquandaTable.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.html
trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateRole.html
trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateUser.html
trunk/equanda-tapestry/src/test/selenium/useradmin/TestSetGUIAccessProhibited.html
trunk/equanda-tapestry/src/test/selenium/useradmin/TestUserNotAdministrator.html
trunk/test/src/etc/site_tapestry/site.war/translations.txt
Added Paths:
-----------
trunk/test/src/equanda/xejb/include/equanda/
trunk/test/src/equanda/xejb/include/equanda/alertFieldCause.xml
trunk/test/src/equanda/xejb/include/equanda/userLanguage.xml
trunk/test/src/main/be/equanda/test/om/server/EquandaRoleMediator.java
Removed Paths:
-------------
trunk/test/src/equanda/xejb/include/alert/
trunk/test/src/equanda/xejb/include/equanda/fieldCause.xml
trunk/test/src/main/be/equanda/test/om/server/UnidRoleMediator.java
Modified: trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
===================================================================
--- trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2007-07-06 14:40:12 UTC (rev 10)
@@ -24,11 +24,8 @@
<multiple/>
</field>
- <field name="Language" type="string">
- <choice name="LANGUAGE_ENGLISH" value="en"/>
- <choice name="LANGUAGE_FRENCH" value="fr"/>
- <choice name="LANGUAGE_DUTCH" value="nl"/>
- <choice name="LANGUAGE_ROMANIAN" value="ro"/>
+ <field name="Language" type="string" length="2">
+ <include file="include/equanda/userLanguage.xml" required="false"/>
</field>
<field name="TablesPreferences" type="EquandaRight">
Modified: trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/util/EquandaAlert.table
===================================================================
--- trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/util/EquandaAlert.table 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-generate/src/main/resources/org/equanda/infrastructure/util/EquandaAlert.table 2007-07-06 14:40:12 UTC (rev 10)
@@ -3,7 +3,7 @@
<table name="EquandaAlert" expected-amount="medium">
<security-role-remove>LocalUser, LocalAdmin</security-role-remove>
- <include file="include/alert/table.xml" required="false"/>
+ <include file="include/equanda/alertTable.xml" required="false"/>
<page>
<field name="Time" type="timestamp">
<description>
@@ -31,7 +31,7 @@
</description>
<choice name="CAUSE_TYPE_OTHER" value="OTHER"/>
<choice name="CAUSE_TYPE_IMPORT" value="IMPORT"/>
- <include file="include/alert/fieldCause.xml" required="false"/>
+ <include file="include/equanda/alertFieldCause.xml" required="false"/>
<default>CAUSE_TYPE_OTHER</default>
<constraints>
<required/>
Modified: trunk/equanda-server/src/main/java/org/equanda/login/LoginInfo.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/login/LoginInfo.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-server/src/main/java/org/equanda/login/LoginInfo.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -27,10 +27,10 @@
import java.util.List;
/**
- * Information from the equandaUser table:
- * -application server userName
- * -application server password
- * -is administrator? if so, the border will differ, other menus would be available
+ * Information from the EquandaUser table:
+ * - application server userName
+ * - application server password
+ * - is administrator? if so, the border will differ, other menus would be available
*
* @author NetRom team
*/
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -110,7 +110,7 @@
return action.getParameters();
}
- @Component( type = "EquandaParameter", id = "EquandaParameter",
+ @Component( type = "EquandaParameter", id = "equandaParameter",
bindings = {
"actionObject = actionObject",
"parameterDescription = parameter",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -144,7 +144,7 @@
/*
* Component which handles the rendering of the groups.
*/
- /*@Component(type = "EquandaGroup", id = "EquandaGroup", inheritInformalParameters = true,
+ /*@Component(type = "EquandaGroup", id = "equandaGroup", inheritInformalParameters = true,
bindings = {
"proxy = proxy",
"displayMode = displayMode",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -81,7 +81,7 @@
/**
* Component which handles the rendering of the groups.
*/
- @Component( type = "EquandaGroup", id = "EquandaGroup", inheritInformalParameters = true,
+ @Component( type = "EquandaGroup", id = "equandaGroup", inheritInformalParameters = true,
bindings = {
"proxy = proxy",
"displayMode = displayMode",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -134,7 +134,7 @@
"tableDescription = tableDescription" } )
public abstract RenderBlock getRenderExtraTableBlock();
- @Component( type = "EquandaType", id = "EquandaType", inheritInformalParameters = true,
+ @Component( type = "EquandaType", id = "equandaType", inheritInformalParameters = true,
bindings = {
"tableDescription = tableDescription",
"proxy = proxy",
@@ -147,7 +147,7 @@
/*
* Component which handles the rendering of the pages.
*/
- @Component( type = "EquandaPage", id = "EquandaPage", inheritInformalParameters = true,
+ @Component( type = "EquandaPage", id = "equandaPage", inheritInformalParameters = true,
bindings = {
"proxy = proxy",
"displayMode = displayMode",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachmentInputContainer.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachmentInputContainer.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachmentInputContainer.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -16,7 +16,7 @@
* ********************************* Component definitions: **********************************
*/
- @Component( type = "EquandaAttachment", id = "EquandaAttachment", inheritInformalParameters = true,
+ @Component( type = "EquandaAttachment", id = "equandaAttachment", inheritInformalParameters = true,
bindings = {
"fieldId = getFieldId()",
"binder = getFieldBinder()",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -79,14 +79,14 @@
* ********************************* Component definitions: **********************************
*/
- @Component( type = "EquandaSingleField", id = "EquandaSingleField",
+ @Component( type = "EquandaSingleField", id = "equandaSingleField",
bindings = {
"proxy = proxy",
"fieldDescription = fieldDescription",
"displayMode = displayMode" } )
public abstract EquandaSingleField getEquandaSingleField();
- @Component( type = "EquandaMultipleField", id = "EquandaMultipleField",
+ @Component( type = "EquandaMultipleField", id = "equandaMultipleField",
bindings = {
"proxy = proxy",
"fieldDescription = fieldDescription",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInputContainer.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInputContainer.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInputContainer.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -45,7 +45,7 @@
* ********************************* Component definitions: **********************************
*/
- @Component( type = "EquandaLinkInput", id = "EquandaLinkInput", inheritInformalParameters = true,
+ @Component( type = "EquandaLinkInput", id = "equandaLinkInput", inheritInformalParameters = true,
bindings = {
"fieldId = getFieldId()",
"binder = getFieldBinder()",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -54,7 +54,7 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaMultipleField.class );
- /**
+ /*
* ********************************** Assets defintions: *************************************
*/
@@ -65,7 +65,7 @@
public abstract IAsset getMultipleFieldScript();
- /**
+ /*
* ********************************** Property defintions: ***********************************
*/
@@ -75,7 +75,7 @@
public abstract String getRemoveList();
- /**
+ /*
* ********************************* Component definitions: **********************************
*/
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -47,7 +47,7 @@
* ********************************* Component definitions: **********************************
*/
- @Component( type = "EquandaSimpleInput", id = "EquandaSimpleInput", inheritInformalParameters = true,
+ @Component( type = "EquandaSimpleInput", id = "equandaSimpleInput", inheritInformalParameters = true,
bindings = {
"fieldType = getFieldType()",
"fieldId = getFieldId()",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -90,13 +90,13 @@
/*
* ********************************* Component definitions: **********************************
*/
- @Component( type = "EquandaSelectParameters", id = "EquandaSelectParameters", inheritInformalParameters = true,
+ @Component( type = "EquandaSelectParameters", id = "equandaSelectParameters", inheritInformalParameters = true,
bindings = {
"selectObject = selectObject",
"selectDescription = selectDescription" } )
public abstract EquandaSelectParameters getEquandaSelectParametersComponent();
- @Component( type = "EquandaSelectResults", id = "EquandaSelectResults", inheritInformalParameters = true,
+ @Component( type = "EquandaSelectResults", id = "equandaSelectResults", inheritInformalParameters = true,
bindings = {
"selectObject = selectObject",
"selectDescription = selectDescription",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -82,7 +82,7 @@
"volatile = true" } )
public abstract ForBean getForeachSelectionComponent();
- @Component( type = "EquandaSelectField", id = "EquandaSelectField",
+ @Component( type = "EquandaSelectField", id = "equandaSelectField",
bindings = {
"selectObject = selectObject",
"selectionDescription = selectionDescription" } )
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -207,7 +207,7 @@
"volatile = true" } )
public abstract ForBean getForeachMultipleValueColumnComponent();
- @Component( type = "EquandaView", id = "EquandaView",
+ @Component( type = "EquandaView", id = "equandaView",
bindings = {
"tableDescription = getTable()",
"proxy = getPage().getPageParameters().getProxy()" } )
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -89,7 +89,7 @@
@Component( type = "Insert", id = "error", bindings = { "value = error" } )
public abstract Insert getErrorComponent();
- @Component( type = "EquandaTable", id = "EquandaTable",
+ @Component( type = "EquandaTable", id = "equandaTable",
bindings = {
"proxy = proxy",
"displayMode = getDisplayMode()",
@@ -98,7 +98,7 @@
"tableDescription = tableDescription" } )
public abstract EquandaTable getEquandaTable();
- @Component( type = "EquandaLinkSelects", id = "EquandaLinkSelects",
+ @Component( type = "EquandaLinkSelects", id = "equandaLinkSelects",
bindings = {
"proxy = proxy",
"submit = getDisplayMode().isEdit()",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -222,7 +222,7 @@
setError( "No role selected !!!" );
return null;
}
- EquandaProxy role = EquandaProxyAccessor.findUoid( "equandaRole", getUoidRole() );
+ EquandaProxy role = EquandaProxyAccessor.findUoid( "EquandaRole", getUoidRole() );
if ( role == null )
{
setError( "No role selected !!!" );
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferencesInputBlock/PreferencesInputBlock.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferencesInputBlock/PreferencesInputBlock.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferencesInputBlock/PreferencesInputBlock.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -69,7 +69,7 @@
return getMessages().getMessage( label );
}
- @Component( type = "PreferenceInput", id = "EquandaInput", inheritInformalParameters = true,
+ @Component( type = "PreferenceInput", id = "equandaInput", inheritInformalParameters = true,
bindings = {
"tableDescription = getParams().getTableDescription()",
"fieldDescription = getFieldDescription()",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -89,7 +89,7 @@
@Component( type = "Insert", id = "error", bindings = { "value = error" } )
public abstract Insert getErrorComponent();
- @Component( type = "EquandaTable", id = "EquandaTable",
+ @Component( type = "EquandaTable", id = "equandaTable",
bindings = {
"proxy = null",
"displayMode = getViewDisplayMode()",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInputBlock/RightsInputBlock.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInputBlock/RightsInputBlock.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInputBlock/RightsInputBlock.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -86,7 +86,7 @@
return getMessages().getMessage( label );
}
- @Component( type = "RightsInput", id = "EquandaInput", inheritInformalParameters = true,
+ @Component( type = "RightsInput", id = "equandaInput", inheritInformalParameters = true,
bindings = {
"key = getKey()",
"fieldRights = getInvoker().getPage().getPageParameters().getFieldRights()",
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -99,7 +99,7 @@
@Component( type = "Insert", id = "error", bindings = { "value = error" } )
public abstract Insert getErrorComponent();
- @Component( type = "EquandaTable", id = "EquandaTable",
+ @Component( type = "EquandaTable", id = "equandaTable",
bindings = {
"proxy = null",
"displayMode = null",
@@ -282,7 +282,7 @@
throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, EquandaPersistenceException
{
TableRightsPageParameters params = ( (TableRightsPage) getNavPage() ).getPageParameters();
- EquandaProxy role = EquandaProxyAccessor.findUoid( "equandaRole", params.getRoleUoid() );
+ EquandaProxy role = EquandaProxyAccessor.findUoid( "EquandaRole", params.getRoleUoid() );
if ( role != null )
{
String roleName = (String) EquandaProxyAccessor.getField( role, "RoleName" );
@@ -303,7 +303,7 @@
GMTable table = DescriptionFactory.getTableDescription( params.getTableName() );
Map<String, String> rightsToLoad = params.getFieldRights();
rightsToLoad.clear();
- EquandaProxy role = EquandaProxyAccessor.findUoid( "equandaRole", params.getRoleUoid() );
+ EquandaProxy role = EquandaProxyAccessor.findUoid( "EquandaRole", params.getRoleUoid() );
if ( role != null )
{
String roleName = (String) EquandaProxyAccessor.getField( role, "RoleName" );
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/navigation/NavigationEntryContainer.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/navigation/NavigationEntryContainer.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/navigation/NavigationEntryContainer.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -50,7 +50,7 @@
{
private static long GARBAGE_ENTRY_COLLECT_INTERVAL = 3600 * 1000; // remove garbage every hour or so
private static long GARBAGE_TIMEOUT_INTERVAL = 24 * 3600 * 1000; // more than 24h old is garbage
- public static final String NAVIGATION_TABLE = "equandaNavigation";
+ public static final String NAVIGATION_TABLE = "EquandaNavigation";
public static final String FIELD_NAVIGATIONENTRY = "NavigationEntry";
private static final Logger log = Logger.getLogger( NavigationEntryContainer.class );
@@ -173,7 +173,7 @@
log.debug( "------------- EntryGarbageCollector - another garbage check ------------- " );
}
- // remove all equandaNavigation records from the database which are too old
+ // remove all EquandaNavigation records from the database which are too old
long threshold = System.currentTimeMillis() - GARBAGE_TIMEOUT_INTERVAL;
EquandaQueryImpl query =
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/EquandaBasePage.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/EquandaBasePage.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/EquandaBasePage.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -88,7 +88,7 @@
* and ... to create one just for this ....
*/
- @Component( type = "equanda:EquandaInputBlock", id = "EquandaInputBlock" )
+ @Component( type = "equanda:EquandaInputBlock", id = "equandaInputBlock" )
public abstract Block getEquandaInputBlockComponent();
public Block getInputFieldBlock()
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/TapestryHome.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/TapestryHome.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/TapestryHome.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -50,7 +50,7 @@
try
{
EquandaProxy user;
- List<EquandaProxy> results = EquandaProxyAccessor.find( "equandaUser", "UserName", new Class[]{ String.class },
+ List<EquandaProxy> results = EquandaProxyAccessor.find( "EquandaUser", "UserName", new Class[]{ String.class },
new String[]{ getSessionUserAdmin().getUserName() } );
if ( results == null || results.size() == 0 )
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/add/AddPage.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/add/AddPage.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/add/AddPage.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -44,7 +44,7 @@
/*
* Component which handles the rendering of the pages.
*/
- @Component( type = "EquandaAdd", id = "EquandaAdd",
+ @Component( type = "EquandaAdd", id = "equandaAdd",
bindings = {
"tableDescription = PageParameters.tableDescription",
"proxy = PageParameters.proxy" } )
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/alerts/Alerts.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/alerts/Alerts.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/alerts/Alerts.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -104,7 +104,7 @@
int max= ResourceUtil.getConfigInt( ConfigurationKeys.MAX_ALERTS );
try
{
- EquandaSelector sel = EquandaProxyAccessor.getSelector( "equandaAlert" );
+ EquandaSelector sel = EquandaProxyAccessor.getSelector( "EquandaAlert" );
AlertsAdministrationQuery query = new AlertsAdministrationQuery( getPageParameters().isShowWarnings() );
if ( max > 0 )
{
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/shared/AddViewEditUsageMenuListener.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/shared/AddViewEditUsageMenuListener.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/shared/AddViewEditUsageMenuListener.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -56,7 +56,7 @@
{
PageParameters pp = page.getPageParameters();
if ( pp instanceof AddViewEditPageParameters &&
- "equandaUser".equals( ( (AddViewEditPageParameters) pp ).getTableName() ) )
+ "EquandaUser".equals( ( (AddViewEditPageParameters) pp ).getTableName() ) )
{
page.getGlobalUserAdmin().resetUsers();
}
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -96,19 +96,19 @@
getNavigationManager().forward( page );
}
- public void actionListenerequandaUser( IRequestCycle cycle )
+ public void actionListenerEquandaUser( IRequestCycle cycle )
{
TableManagerPage page =
(TableManagerPage) getNavigationManager().getForwardPage( this, "TableManagerPage", true );
- page.getPageParameters().setTableName( "equandaUser" );
+ page.getPageParameters().setTableName( "EquandaUser" );
getNavigationManager().forward( page );
}
- public void actionListenerequandaRole( IRequestCycle cycle )
+ public void actionListenerEquandaRole( IRequestCycle cycle )
{
TableManagerPage page =
(TableManagerPage) getNavigationManager().getForwardPage( this, "TableManagerPage", true );
- page.getPageParameters().setTableName( "equandaRole" );
+ page.getPageParameters().setTableName( "EquandaRole" );
getNavigationManager().forward( page );
}
@@ -143,14 +143,14 @@
return getTableLabel( getTableName() );
}
- public String getTableLabelequandaUser()
+ public String getTableLabelEquandaUser()
{
- return getTableLabel( "equandaUser" );
+ return getTableLabel( "EquandaUser" );
}
- public String getTableLabelequandaRole()
+ public String getTableLabelEquandaRole()
{
- return getTableLabel( "equandaRole" );
+ return getTableLabel( "EquandaRole" );
}
public String getTitle()
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/login/changePassword/ChangePassword.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/login/changePassword/ChangePassword.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/login/changePassword/ChangePassword.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -74,7 +74,7 @@
}
try
{
- List<EquandaProxy> results = EquandaProxyAccessor.find( "equandaUser", "UserPassword",
+ List<EquandaProxy> results = EquandaProxyAccessor.find( "EquandaUser", "UserPassword",
new Class[]{ String.class, String.class },
new String[]{ getSessionUserAdmin().getUserName(),
getOldPassword() } );
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/startPageConfig/StartPageConfig.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/startPageConfig/StartPageConfig.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/pages/userAdmin/startPageConfig/StartPageConfig.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -62,7 +62,7 @@
try
{
EquandaProxy user;
- List<EquandaProxy> results = EquandaProxyAccessor.find( "equandaUser", "UserName", new Class[]{ String.class },
+ List<EquandaProxy> results = EquandaProxyAccessor.find( "EquandaUser", "UserName", new Class[]{ String.class },
new String[]{ getSessionUserAdmin().getUserName() } );
if ( results == null || results.size() == 0 )
{
@@ -87,7 +87,7 @@
try
{
EquandaProxy user;
- List<EquandaProxy> results = EquandaProxyAccessor.find( "equandaUser", "UserName", new Class[]{ String.class },
+ List<EquandaProxy> results = EquandaProxyAccessor.find( "EquandaUser", "UserName", new Class[]{ String.class },
new String[]{ getSessionUserAdmin().getUserName() } );
if ( results == null || results.size() == 0 )
{
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/EditableRightsSelectionModel.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/EditableRightsSelectionModel.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/EditableRightsSelectionModel.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -35,7 +35,7 @@
public class EditableRightsSelectionModel
extends ChoiceFieldSelectionModel
{
- public static final String RIGHTS_TABLE_NAME = "equandaRight";
+ public static final String RIGHTS_TABLE_NAME = "EquandaRight";
public static final String RIGHTS_FIELD_NAME = "EditAccess";
private static EditableRightsSelectionModel instance = new EditableRightsSelectionModel();
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RoleSelectionModel.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RoleSelectionModel.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RoleSelectionModel.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -42,7 +42,7 @@
{
private org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( getClass() );
- public static final String ROLE_TABLE_NAME = "equandaRole";
+ public static final String ROLE_TABLE_NAME = "EquandaRole";
public static final String ROLE_SELECT_ALL_FINDER_NAME = "AllRoles";
private List<String> uoids = null;
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RunnableRightsSelectionModel.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RunnableRightsSelectionModel.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/selectionModel/RunnableRightsSelectionModel.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -35,7 +35,7 @@
public class RunnableRightsSelectionModel
extends ChoiceFieldSelectionModel
{
- public static final String RIGHTS_TABLE_NAME = "equandaRight";
+ public static final String RIGHTS_TABLE_NAME = "EquandaRight";
public static final String RIGHTS_FIELD_NAME = "RunAccess";
private static RunnableRightsSelectionModel instance = new RunnableRightsSelectionModel();
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -22,8 +22,8 @@
{
private static final Logger log = Logger.getLogger( GlobalUserAdmin.class );
- public static final String TABLE_EQUANDA_USER_NAME = "equandaUser";
- public static final String TABLE_EQUANDA_ROLE_NAME = "equandaRole";
+ public static final String TABLE_EQUANDA_USER_NAME = "EquandaUser";
+ public static final String TABLE_EQUANDA_ROLE_NAME = "EquandaRole";
UserAdminCache userAdminCache;
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/CacheLoaderPersister.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/CacheLoaderPersister.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/CacheLoaderPersister.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -24,16 +24,16 @@
try
{
Set<String> users = new HashSet<String>();
- if ( type.table.equals( "equandaRole" ) )
+ if ( type.table.equals( "EquandaRole" ) )
{
- for ( EquandaProxy proxy : EquandaProxyAccessor.find( "equandaRole", "AllRoles", null, null ) )
+ for ( EquandaProxy proxy : EquandaProxyAccessor.find( "EquandaRole", "AllRoles", null, null ) )
{
users.add( (String) EquandaProxyAccessor.getField( proxy, "RoleName" ) );
}
}
else
{
- for ( EquandaProxy proxy : EquandaProxyAccessor.find( "equandaUser", "AllUsers", null, null ) )
+ for ( EquandaProxy proxy : EquandaProxyAccessor.find( "EquandaUser", "AllUsers", null, null ) )
{
users.add( (String) EquandaProxyAccessor.getField( proxy, "UserName" ) );
}
@@ -157,22 +157,22 @@
String collName = type.collectionFieldName;
collName = collName.substring( 0, 1 ).toLowerCase() +
collName.substring( 1 ); // transform first letter to lowercase
- if ( type.table.equals( "equandaRole" ) )
+ if ( "EquandaRole".equals( type.table ) )
{
query.setQueryString(
"SELECT DISTINCT r FROM DMEquandaRoleBean role, IN(role." + collName +
- ") r WHERE ( role.roleName = :name ) AND ( r.identifier = :id ) AND (r.EquandaType = :EquandaType)" );
+ ") r WHERE ( role.roleName = :name ) AND ( r.identifier = :id ) AND (r.equandaType = :equandaType)" );
}
else
{
query.setQueryString(
"SELECT DISTINCT r FROM DMEquandaUserBean user, IN(user." + collName +
- ") r WHERE ( user.userName = :name ) AND ( r.identifier = :id ) AND (r.EquandaType = :EquandaType)" );
+ ") r WHERE ( user.userName = :name ) AND ( r.identifier = :id ) AND (r.equandaType = :equandaType)" );
}
query.getParameters().put( "name", name );
query.getParameters().put( "id", id );
- query.getParameters().put( "EquandaType", type.equandaType );
- selector = EquandaProxyAccessor.getSelector( "equandaRight" );
+ query.getParameters().put( "equandaType", type.equandaType );
+ selector = EquandaProxyAccessor.getSelector( "EquandaRight" );
return selector.findEquandaSingleProxy( query );
}
catch ( Exception e )
@@ -195,7 +195,7 @@
{
selector = EquandaProxyAccessor.getSelector( type.table );
Object results;
- if ( type.table.equals( "equandaRole" ) )
+ if ( "EquandaRole".equals( type.table ) )
{
results = selector.getClass().getMethod( "findRole", String.class ).invoke( selector, name );
}
@@ -215,7 +215,7 @@
if ( ejb != null )
{
right.equandaUpdate();
- if ( type.table.equals( "equandaRole" ) )
+ if ( "EquandaRole".equals( type.table ) )
{
ejb.getClass().getMethod( "addEquandaLinkRight", UOID.class ).invoke( ejb, right.getUOID() );
}
@@ -252,15 +252,15 @@
try
{
List<EquandaProxy> proxyes;
- if ( type.table.equals( "equandaRole" ) )
+ if ( type.table.equals( "EquandaRole" ) )
{
proxyes =
- EquandaProxyAccessor.find( "equandaRole", "Role", new Class[]{ String.class }, new Object[]{ name } );
+ EquandaProxyAccessor.find( "EquandaRole", "Role", new Class[]{ String.class }, new Object[]{ name } );
}
else
{
proxyes =
- EquandaProxyAccessor.find( "equandaUser", "UserName", new Class[]{ String.class }, new Object[]{ name } );
+ EquandaProxyAccessor.find( "EquandaUser", "UserName", new Class[]{ String.class }, new Object[]{ name } );
}
if ( proxyes == null || proxyes.isEmpty() ) return null;
return proxyes.get( 0 );
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/LoaderType.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/LoaderType.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/useradmin/cache/LoaderType.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -9,22 +9,22 @@
*/
public enum LoaderType
{
- ROLE_EDITABLE( Fqn.fromString( "ROLE_EDITABLE" ), "equandaRole", "Rights", "EDIT", "EditAccess", String.class ),
- ROLE_RUNNABLE( Fqn.fromString( "ROLE_RUNNABLE" ), "equandaRole", "Rights", "RUNN", "RunAccess", String.class ),
- ROLE_TABLE_PREF( Fqn.fromString( "ROLE_TABLE_PREF" ), "equandaRole", "Rights", "TABL", "TablePreference",
+ ROLE_EDITABLE( Fqn.fromString( "ROLE_EDITABLE" ), "EquandaRole", "Rights", "EDIT", "EditAccess", String.class ),
+ ROLE_RUNNABLE( Fqn.fromString( "ROLE_RUNNABLE" ), "EquandaRole", "Rights", "RUNN", "RunAccess", String.class ),
+ ROLE_TABLE_PREF( Fqn.fromString( "ROLE_TABLE_PREF" ), "EquandaRole", "Rights", "TABL", "TablePreference",
String.class ),
- USER_TABLE_PREF( Fqn.fromString( "USER_TABLE_PREF" ), "equandaUser", "TablesPreferences", "TABL",
+ USER_TABLE_PREF( Fqn.fromString( "USER_TABLE_PREF" ), "EquandaUser", "TablesPreferences", "TABL",
"TablePreference", String.class ),
- USER_FIELD_PREF( Fqn.fromString( "USER_FIELD_PREF" ), "equandaUser", "FieldsPreferences", "PREF", "Preference",
+ USER_FIELD_PREF( Fqn.fromString( "USER_FIELD_PREF" ), "EquandaUser", "FieldsPreferences", "PREF", "Preference",
String.class ),
- USER_LIST_PREF( Fqn.fromString( "USER_LIST_PREF" ), "equandaUser", "ListPreferences", "PREF", "Preference",
+ USER_LIST_PREF( Fqn.fromString( "USER_LIST_PREF" ), "EquandaUser", "ListPreferences", "PREF", "Preference",
String.class ),
- USER_REPORT_PREF( Fqn.fromString( "USER_REPORT_PREF" ), "equandaUser", "ReportPreferences", "PREF", "Preference",
+ USER_REPORT_PREF( Fqn.fromString( "USER_REPORT_PREF" ), "EquandaUser", "ReportPreferences", "PREF", "Preference",
String.class ),
- USER_LIST_PREF_WIDTH( Fqn.fromString( "USER_LIST_PREF_WIDTH" ), "equandaUser", "ListPreferences", "PREF", "Width",
+ USER_LIST_PREF_WIDTH( Fqn.fromString( "USER_LIST_PREF_WIDTH" ), "EquandaUser", "ListPreferences", "PREF", "Width",
int.class ),
- USER_REPORT_PREF_PERCENT( Fqn.fromString( "USER_REPORT_PREF_PERCENT" ), "equandaUser", "ReportPreferences", "PREF",
+ USER_REPORT_PREF_PERCENT( Fqn.fromString( "USER_REPORT_PREF_PERCENT" ), "EquandaUser", "ReportPreferences", "PREF",
"Percentage", int.class );
Fqn fqn;
String table;
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/util/LoginResolver.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/util/LoginResolver.java 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/util/LoginResolver.java 2007-07-06 14:40:12 UTC (rev 10)
@@ -41,7 +41,7 @@
{
if ( userName == null ) return null;
List<EquandaProxy> results =
- EquandaProxyAccessor.find( "equandaUser", "UserName", new Class[]{ String.class }, new String[]{ userName } );
+ EquandaProxyAccessor.find( "EquandaUser", "UserName", new Class[]{ String.class }, new String[]{ userName } );
EquandaProxy user = null;
if ( results != null && results.size() > 0 ) user = results.get( 0 );
LoginInfo info = new LoginInfo();
Modified: trunk/equanda-tapestry/src/main/resources/META-INF/hivemodule.xml
===================================================================
--- trunk/equanda-tapestry/src/main/resources/META-INF/hivemodule.xml 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/resources/META-INF/hivemodule.xml 2007-07-06 14:40:12 UTC (rev 10)
@@ -57,7 +57,7 @@
<service-point id="userAdminCache" interface="org.equanda.tapestry.useradmin.cache.UserAdminCache">
<invoke-factory>
<construct class="org.equanda.tapestry.useradmin.cache.UserAdminCache">
- <set property="cacheServiceName" value="jboss.cache:service=equandaCacheService"/>
+ <set property="cacheServiceName" value="jboss.cache:service=EquandaCacheService"/>
</construct>
</invoke-factory>
</service-point>
Modified: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/EquandaTable.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/EquandaTable.html 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/EquandaTable.html 2007-07-06 14:40:12 UTC (rev 10)
@@ -33,7 +33,7 @@
<span jwcid="@If" condition="ognl:isTableVisible()">
- <span jwcid="@Script" scriptAsset="asset:EquandaTableScript" tableName="prop:tableName"/>
+ <span jwcid="@Script" scriptAsset="asset:equandaTableScript" tableName="prop:tableName"/>
<span jwcid="@If" condition="ognl:page.useExtraTableBlock()"><span jwcid="renderExtraTableBlock"/></span>
Modified: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.html 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.html 2007-07-06 14:40:12 UTC (rev 10)
@@ -51,7 +51,7 @@
<tr jwcid="foreachValue">
<td align="left">
<span jwcid="@If" condition="ognl:isFieldLink()">
- <span jwcid="@If" condition="ognl:isAttachment()">
+ <span jwcid="@If" condition="ognl:isAttachment()">
<input jwcid="equandaAttachment"/>
</span>
<span jwcid="@Else">
Modified: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.html 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/pages/userAdmin/adminMenu/AdminMenu.html 2007-07-06 14:40:12 UTC (rev 10)
@@ -34,12 +34,12 @@
<border jwcid="@Border" internationalizedTitle="prop:title">
<span jwcid="keepAlive"/>
<center>
- <span jwcid="@NavigationLink" listener="listener:actionListenerequandaUser">
- <span jwcid="@Insert" value="prop:tableLabelequandaUser"/>
+ <span jwcid="@NavigationLink" listener="listener:actionListenerEquandaUser">
+ <span jwcid="@Insert" value="prop:tableLabelEquandaUser"/>
</span>
<br/>
- <span jwcid="@NavigationLink" listener="listener:actionListenerequandaRole">
- <span jwcid="@Insert" value="prop:tableLabelequandaRole"/>
+ <span jwcid="@NavigationLink" listener="listener:actionListenerEquandaRole">
+ <span jwcid="@Insert" value="prop:tableLabelEquandaRole"/>
</span>
<hr/>
<span jwcid="foreachTable">
Modified: trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateRole.html
===================================================================
--- trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateRole.html 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateRole.html 2007-07-06 14:40:12 UTC (rev 10)
@@ -39,25 +39,25 @@
<tr>
<td>clickAndWait</td>
- <td>link=equandaRole</td>
+ <td>link=EquandaRole</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>link=Add equandaRole</td>
+ <td>link=Add EquandaRole</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>field_equandaRole_RoleName</td>
+ <td>field_EquandaRole_RoleName</td>
<td>Role</td>
</tr>
<tr>
<td>type</td>
- <td>field_equandaRole_AppserverRole</td>
+ <td>field_EquandaRole_AppserverRole</td>
<td>LocalUser</td>
</tr>
@@ -65,7 +65,7 @@
<tr>
<td>check</td>
- <td>field_equandaRole_Administrator</td>
+ <td>field_EquandaRole_Administrator</td>
<td></td>
</tr>
Modified: trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateUser.html
===================================================================
--- trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateUser.html 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/test/selenium/useradmin/TestCreateUser.html 2007-07-06 14:40:12 UTC (rev 10)
@@ -40,31 +40,31 @@
<tr>
<td>clickAndWait</td>
- <td>link=equandaUser</td>
+ <td>link=EquandaUser</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>link=Add equandaUser</td>
+ <td>link=Add EquandaUser</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>field_equandaUser_UserName</td>
+ <td>field_EquandaUser_UserName</td>
<td>user</td>
</tr>
<tr>
<td>type</td>
- <td>field_equandaUser_Password</td>
+ <td>field_EquandaUser_Password</td>
<td>password</td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>insert_equandaUser_Roles</td>
+ <td>insert_EquandaUser_Roles</td>
<td></td>
</tr>
Modified: trunk/equanda-tapestry/src/test/selenium/useradmin/TestSetGUIAccessProhibited.html
===================================================================
--- trunk/equanda-tapestry/src/test/selenium/useradmin/TestSetGUIAccessProhibited.html 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/test/selenium/useradmin/TestSetGUIAccessProhibited.html 2007-07-06 14:40:12 UTC (rev 10)
@@ -39,7 +39,7 @@
<tr>
<td>clickAndWait</td>
- <td>link=equandaRole</td>
+ <td>link=EquandaRole</td>
<td></td>
</tr>
@@ -59,7 +59,7 @@
<tr>
<td>check</td>
- <td>field_equandaRole_GuiAccessProhibited</td>
+ <td>field_EquandaRole_GuiAccessProhibited</td>
<td></td>
</tr>
Modified: trunk/equanda-tapestry/src/test/selenium/useradmin/TestUserNotAdministrator.html
===================================================================
--- trunk/equanda-tapestry/src/test/selenium/useradmin/TestUserNotAdministrator.html 2007-07-05 16:14:42 UTC (rev 9)
+++ trunk/equanda-tapestry/src/test/selenium/useradmin/TestUserNotAdministrator.html 2007-07-06 14:40:12 UTC (rev 10)
@@ -39,7 +39,7 @@
<tr>
<td>clickAndWait</td>
- <td>link=equandaRole</td>
+ <td>link=EquandaRole</td>
<td></td>
</tr>
@@ -58,7 +58,7 @@
<tr>
<td>uncheck</td>
- <td>field_equandaRole_Administrator</td>
+ <td>field_EquandaRole_Administrator</td>
<td></td>
</tr>
Copied: trunk/test/src/equanda/xejb/include/equanda (from rev 4, trunk/test/src/equanda/xejb/include/alert)
Added: trunk/test/src/equanda/xejb/include/equanda/alertFieldCause.xml
===================================================================
--- trunk/test/src/equanda/xejb/include/equanda/alertFieldCause.xml (rev 0)
+++ trunk/test/src/equanda/xejb/include/equanda/alertFieldCause.xml 2007-07-06 14:40:12 UTC (rev 10)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<include-data>
+ <choice name="CAUSE_TYPE_1" value="C1"/>
+ <choice name="CAUSE_TYPE_2" value="C2"/>
+</include-data>
\ No newline at end of file
Deleted: trunk/test/src/equanda/xejb/include/equanda/fieldCause.xml
===================================================================
--- trunk/test/src/equanda/xejb/include/alert/fieldCause.xml 2007-07-04 17:24:52 UTC (rev 4)
+++ trunk/test/src/equanda/xejb/include/equanda/fieldCause.xml 2007-07-06 14:40:12 UTC (rev 10)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<include-data>
- <choice name="CAUSE_TYPE_1" value="C1"/>
- <choice name="CAUSE_TYPE_2" value="C2"/>
-</include-data>
\ No newline at end of file
Added: trunk/test/src/equanda/xejb/include/equanda/userLanguage.xml
===================================================================
--- trunk/test/src/equanda/xejb/include/equanda/userLanguage.xml (rev 0)
+++ trunk/test/src/equanda/xejb/include/equanda/userLanguage.xml 2007-07-06 14:40:12 UTC (rev 10)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<include-data>
+ <choice name="LANGUAGE_ENGLISH" value="en"/>
+ <choice name="LANGUAGE_FRENCH" value="fr"/>
+ <choice name="LANGUAGE_DUTCH" value="nl"/>
+ <choice name="LANGUAGE_ROMANIAN" value="ro"/>
+</include-data>
\ No newline at end of file
Modified: trunk/test/src/etc/site_tapestry/site.war/translatio...
[truncated message content] |
|
From: <tri...@us...> - 2007-07-05 16:14:43
|
Revision: 9
http://equanda.svn.sourceforge.net/equanda/?rev=9&view=rev
Author: triathlon98
Date: 2007-07-05 09:14:42 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
more rename fixes, working on running
Modified Paths:
--------------
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-07-05 16:11:52 UTC (rev 8)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-07-05 16:14:42 UTC (rev 9)
@@ -188,7 +188,7 @@
/*
* For Wiki.
*/
- @Component( type = "equandaWikiInput", id = "equandaWikiField", inheritInformalParameters = true,
+ @Component( type = "EquandaWikiInput", id = "equandaWikiField", inheritInformalParameters = true,
bindings = {
"fieldId = fieldId",
"binder = binder",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-07-05 16:11:55
|
Revision: 8
http://equanda.svn.sourceforge.net/equanda/?rev=8&view=rev
Author: triathlon98
Date: 2007-07-05 09:11:52 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
more rename fixes, working on running
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ddltool/Map.java.vm
trunk/equanda-generate/src/main/velocity/ddltool.ini
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaPagination.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaReportField.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaAdd/EquandaAdd.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java
trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java
trunk/equanda-tapestry/src/main/resources/equanda-tapestry.library
Added Paths:
-----------
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaPagination.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaReportField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/EquandaAction.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/EquandaAdd.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/EquandaEdit.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaField/EquandaField2.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaGroup/EquandaGroup.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaPage/EquandaPage.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/EquandaTable.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/EquandaTable.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaType/EquandaType.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaType/EquandaType.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaView/EquandaView.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaInput/EquandaInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.html
Removed Paths:
-------------
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidPagination.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidReportField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/UnidAction.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/UnidParameter.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/UnidAdd.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/UnidEdit.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaField/UnidField2.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaGroup/UnidGroup.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaLinkSelects/UnidLinkSelects.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaPage/UnidPage.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/UnidTable.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaTable/UnidTable.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaType/UnidType.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaType/UnidType.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaView/UnidView.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaAttachment/UnidAttachment.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaAttachment/UnidAttachment.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaInput/UnidInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaLinkInput/UnidLinkInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaLinkInput/UnidLinkInput.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/UnidMultipleField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/UnidMultipleField.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaSimpleInput/UnidSimpleInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaSingleField/UnidSingleField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaTimestamp/UnidTimestamp.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaWikiInput/UnidWikiInput.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/input/equandaWikiInput/UnidWikiInput.script
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelect/UnidSelect.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelectField/UnidSelectField.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelectParameters/UnidSelectParameters.html
trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/select/equandaSelectResults/UnidSelectResults.html
Modified: trunk/equanda-generate/src/main/velocity/ddltool/Map.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ddltool/Map.java.vm 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-generate/src/main/velocity/ddltool/Map.java.vm 2007-07-05 16:11:52 UTC (rev 8)
@@ -1,3 +1,32 @@
+#**
+ * 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/
+ *
+ * Code generated by applying this template can be freely used.
+ *
+ * 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.
+ *#
+/**
+ * This file is generated by equanda on $generationdate, do not modify
+ */
+
package ${package};
import java.util.Hashtable;
@@ -9,7 +38,7 @@
*
* @author Andrei,Florin
*/
-public class equandaMap
+public class EquandaMap
implements org.equanda.tool.ddltool.DatabaseMap
{
@@ -19,7 +48,7 @@
private Collection<String[]> tablesForLinks = null; // [0] -table name; [1] -1st field name; [2] -second field name; [3] -true/false unique constraint
private Hashtable<String, Collection<String>> dbFields = null;
- public equandaMap() {}
+ public EquandaMap() {}
public void init()
{
Modified: trunk/equanda-generate/src/main/velocity/ddltool.ini
===================================================================
--- trunk/equanda-generate/src/main/velocity/ddltool.ini 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-generate/src/main/velocity/ddltool.ini 2007-07-05 16:11:52 UTC (rev 8)
@@ -3,5 +3,5 @@
[root-tables]
-output1=${outputDir}/equandaMap.java
+output1=${outputDir}/EquandaMap.java
template1=Map.java.vm
\ No newline at end of file
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaPagination.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaPagination.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaPagination.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -17,7 +17,7 @@
/*
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaPagination.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaPagination.html" )
public abstract IAsset get$template();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaReportField.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaReportField.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/EquandaReportField.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -103,7 +103,7 @@
@Parameter( name = "size" )
public abstract int getSize();
- @Asset( value = "/org/equanda/tapestry/components/EquandaReportField.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaReportField.html" )
public abstract IAsset get$template();
@Component( type = "TextField", id = "value_text_field", inheritInformalParameters = true,
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaAdd/EquandaAdd.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaAdd/EquandaAdd.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaAdd/EquandaAdd.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -40,7 +40,7 @@
public abstract class EquandaAdd
extends AddViewEditCommons
{
- @Asset( value = "/org/equanda/tapestry/components/EquandaAdd/EquandaAdd.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaAdd/EquandaAdd.html" )
public abstract IAsset get$template();
public DisplayMode getDisplayMode()
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -59,7 +59,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaEdit/EquandaEdit.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaEdit/EquandaEdit.html" )
public abstract IAsset get$template();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -56,7 +56,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaGroup/EquandaGroup.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaGroup/EquandaGroup.html" )
public abstract IAsset get$template();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -70,7 +70,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaLinkSelects/EquandaLinkSelects.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.html" )
public abstract IAsset get$template();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -56,7 +56,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaPage/EquandaPage.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaPage/EquandaPage.html" )
public abstract IAsset get$template();
/**
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -89,10 +89,10 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaTable/EquandaTable.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaTable/EquandaTable.html" )
public abstract IAsset get$template();
- @Asset( value = "/org/equanda/tapestry/components/EquandaTable/EquandaTable.script" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaTable/EquandaTable.script" )
public abstract IAsset getEquandaTableScript();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -71,10 +71,10 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaType/EquandaType.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaType/EquandaType.html" )
public abstract IAsset get$template();
- @Asset( value = "/org/equanda/tapestry/components/EquandaType/EquandaType.script" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaType/EquandaType.script" )
public abstract IAsset getEquandaTypeScript();
@Component( type = "PropertySelection", id = "equandaTypeCombobox", inheritInformalParameters = true,
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -44,7 +44,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/EquandaView/EquandaView.html" )
+ @Asset( value = "/org/equanda/tapestry/components/equandaView/EquandaView.html" )
public abstract IAsset get$template();
public DisplayMode getDisplayMode()
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -67,10 +67,10 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaAttachment/EquandaAttachment.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.html" )
public abstract IAsset get$template();
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaAttachment/EquandaAttachment.script" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.script" )
public abstract IAsset getEquandaAttachmentScript();
@Component( type = "TextField", id = "equandaUoid", inheritInformalParameters = true,
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -68,7 +68,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaInput/EquandaInput.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaInput/EquandaInput.html" )
public abstract IAsset get$template();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -171,10 +171,10 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaLinkInput/EquandaLinkInput.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.html" )
public abstract IAsset get$template();
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaLinkInput/EquandaLinkInput.script" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.script" )
public abstract IAsset getLinkInputScript();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -58,10 +58,10 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaMultipleField/EquandaMultipleField.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.html" )
public abstract IAsset get$template();
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaMultipleField/EquandaMultipleField.script" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.script" )
public abstract IAsset getMultipleFieldScript();
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -131,7 +131,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaSimpleInput/EquandaSimpleInput.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.html" )
public abstract IAsset get$template();
/*
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -42,7 +42,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaSingleField/EquandaSingleField.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.html" )
public abstract IAsset get$template();
}
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -118,7 +118,7 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/EquandaTimestamp/EquandaTimestamp.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.html" )
public abstract IAsset get$template();
/**
Modified: trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java
===================================================================
--- trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java 2007-07-05 16:11:52 UTC (rev 8)
@@ -74,13 +74,13 @@
* ********************************** Assets defintions: *************************************
*/
- @Asset( value = "/org/equanda/tapestry/components/input/equandaWikiInput/equandaWikiInput.html" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.html" )
public abstract IAsset get$template();
@Asset( value = "/images/wiki-preview.gif" )
public abstract IAsset getImageWikiPreview();
- @Asset( value = "/org/equanda/tapestry/components/input/equandaWikiInput/equandaWikiInput.script" )
+ @Asset( value = "/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.script" )
public abstract IAsset getEquandaWikiInputScript();
@Component( type = "TextArea", id = "equandaWikiEditor", inheritInformalParameters = true,
Modified: trunk/equanda-tapestry/src/main/resources/equanda-tapestry.library
===================================================================
--- trunk/equanda-tapestry/src/main/resources/equanda-tapestry.library 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/resources/equanda-tapestry.library 2007-07-05 16:11:52 UTC (rev 8)
@@ -14,7 +14,7 @@
<!-- limit accepted locales -->
<meta key="org.apache.tapestry.accepted-locales" value="en,nl"/>
- <component-type type="equandaReportField" specification-path="/org/equanda/tapestry/components/equandaReportField.jwc"/>
+ <component-type type="EquandaReportField" specification-path="/org/equanda/tapestry/components/EquandaReportField.jwc"/>
<component-type type="ImageButton" specification-path="/org/equanda/tapestry/components/ImageButton.jwc"/>
<component-type type="ButtonSubmit" specification-path="/org/equanda/tapestry/components/ButtonSubmit.jwc"/>
Copied: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaPagination.html (from rev 4, trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidPagination.html)
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaPagination.html (rev 0)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaPagination.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -0,0 +1,27 @@
+<span jwcid="@If" condition="ognl:hasMultiplePages()">
+ <span jwcid="@If" condition="ognl:!isFirstPage()">
+ <span jwcid="@NavigationLink" listener="listener:firstPage" parameters="prop:currentPage"
+ id="LINK_FIRST_PAGE">
+ <<
+ </span>
+ <span jwcid="@NavigationLink" listener="listener:previousPage" parameters="prop:currentPage"
+ id="LINK_PREVIOUS_PAGE">
+ <
+ </span>
+ </span>
+
+ <span id="CURRENT_PAGE"><span jwcid="@Insert" value="ognl:currentPage+1"/></span>
+ /
+ <span id="PAGE_COUNT"><span jwcid="@Insert" value="prop:pageCount"/></span>
+
+ <span jwcid="@If" condition="ognl:!isLastPage()">
+ <span jwcid="@NavigationLink" listener="listener:nextPage" parameters="prop:currentPage"
+ id="LINK_NEXT_PAGE">
+ >
+ </span>
+ <span jwcid="@NavigationLink" listener="listener:lastPage" parameters="prop:currentPage"
+ id="LINK_LAST_PAGE">
+ >>
+ </span>
+ </span>
+</span>
\ No newline at end of file
Copied: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaReportField.html (from rev 4, trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidReportField.html)
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaReportField.html (rev 0)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/EquandaReportField.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -0,0 +1,42 @@
+<span jwcid="@If" condition="ognl:!readonly">
+ <span jwcid="@If" condition="ognl:isTextField()">
+ <input jwcid="value_text_field" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isTextareaField()">
+ <input jwcid="value_textarea_field" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isDateField()">
+ <input jwcid="value_date_field" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isBooleanField()">
+ <input jwcid="value_boolean_field" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isTimestampField()">
+ <input jwcid="value_timestamp_field" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isChoiceField()">
+ <input jwcid="value_choice_field" id="prop:fieldId"/>
+ </span>
+
+</span>
+
+<span jwcid="@Else">
+ <span jwcid="@If" condition="ognl:isTextField()">
+ <input jwcid="value_text_field_readonly" readonly="true" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isTextareaField()">
+ <input jwcid="value_textarea_field_readonly" readonly="true" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isDateField()">
+ <input jwcid="value_date_field_readonly" id="prop:fieldId" readonly="true"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isBooleanField()">
+ <input jwcid="value_boolean_field_readonly" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isTimestampField()">
+ <input jwcid="value_timestamp_field_readonly" id="prop:fieldId"/>
+ </span>
+ <span jwcid="@If" condition="ognl:isChoiceField()">
+ <input jwcid="value_choice_field_readonly" id="prop:fieldId"/>
+ </span>
+</span>
\ No newline at end of file
Deleted: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidPagination.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidPagination.html 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidPagination.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -1,27 +0,0 @@
-<span jwcid="@If" condition="ognl:hasMultiplePages()">
- <span jwcid="@If" condition="ognl:!isFirstPage()">
- <span jwcid="@NavigationLink" listener="listener:firstPage" parameters="prop:currentPage"
- id="LINK_FIRST_PAGE">
- <<
- </span>
- <span jwcid="@NavigationLink" listener="listener:previousPage" parameters="prop:currentPage"
- id="LINK_PREVIOUS_PAGE">
- <
- </span>
- </span>
-
- <span id="CURRENT_PAGE"><span jwcid="@Insert" value="ognl:currentPage+1"/></span>
- /
- <span id="PAGE_COUNT"><span jwcid="@Insert" value="prop:pageCount"/></span>
-
- <span jwcid="@If" condition="ognl:!isLastPage()">
- <span jwcid="@NavigationLink" listener="listener:nextPage" parameters="prop:currentPage"
- id="LINK_NEXT_PAGE">
- >
- </span>
- <span jwcid="@NavigationLink" listener="listener:lastPage" parameters="prop:currentPage"
- id="LINK_LAST_PAGE">
- >>
- </span>
- </span>
-</span>
\ No newline at end of file
Deleted: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidReportField.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidReportField.html 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/UnidReportField.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -1,42 +0,0 @@
-<span jwcid="@If" condition="ognl:!readonly">
- <span jwcid="@If" condition="ognl:isTextField()">
- <input jwcid="value_text_field" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isTextareaField()">
- <input jwcid="value_textarea_field" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isDateField()">
- <input jwcid="value_date_field" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isBooleanField()">
- <input jwcid="value_boolean_field" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isTimestampField()">
- <input jwcid="value_timestamp_field" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isChoiceField()">
- <input jwcid="value_choice_field" id="prop:fieldId"/>
- </span>
-
-</span>
-
-<span jwcid="@Else">
- <span jwcid="@If" condition="ognl:isTextField()">
- <input jwcid="value_text_field_readonly" readonly="true" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isTextareaField()">
- <input jwcid="value_textarea_field_readonly" readonly="true" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isDateField()">
- <input jwcid="value_date_field_readonly" id="prop:fieldId" readonly="true"/>
- </span>
- <span jwcid="@If" condition="ognl:isBooleanField()">
- <input jwcid="value_boolean_field_readonly" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isTimestampField()">
- <input jwcid="value_timestamp_field_readonly" id="prop:fieldId"/>
- </span>
- <span jwcid="@If" condition="ognl:isChoiceField()">
- <input jwcid="value_choice_field_readonly" id="prop:fieldId"/>
- </span>
-</span>
\ No newline at end of file
Copied: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/EquandaAction.html (from rev 6, trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/UnidAction.html)
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/EquandaAction.html (rev 0)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/EquandaAction.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -0,0 +1,44 @@
+<span jwcid="$remove$">
+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/
+
+Code generated by applying this template can be freely used.
+
+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.
+
+Description!!!
+
+Contributor(s):
+@author Florin
+</span>
+
+ <span class="displayError" jwcid="@Insert" value="prop:error"/>
+<form jwcid="@Form"
+ delegate="bean:validationDelegate"
+ clientValidationEnabled="ognl:true"
+ enctype="multipart/form-data" focus="ognl:false">
+
+ <table>
+ <span jwcid="foreachParameter">
+ <span jwcid="equandaParameter"/>
+ </span>
+ </table>
+ <input jwcid="@Submit" class="submitButton" listener="listener:formSubmit"/>
+</form>
\ No newline at end of file
Deleted: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/UnidAction.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/UnidAction.html 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaAction/UnidAction.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -1,44 +0,0 @@
-<span jwcid="$remove$">
-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/
-
-Code generated by applying this template can be freely used.
-
-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.
-
-Description!!!
-
-Contributor(s):
-@author Florin
-</span>
-
- <span class="displayError" jwcid="@Insert" value="prop:error"/>
-<form jwcid="@Form"
- delegate="bean:validationDelegate"
- clientValidationEnabled="ognl:true"
- enctype="multipart/form-data" focus="ognl:false">
-
- <table>
- <span jwcid="foreachParameter">
- <span jwcid="equandaParameter"/>
- </span>
- </table>
- <input jwcid="@Submit" class="submitButton" listener="listener:formSubmit"/>
-</form>
\ No newline at end of file
Copied: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.html (from rev 6, trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/UnidParameter.html)
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.html (rev 0)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -0,0 +1,49 @@
+<span jwcid="$remove$">
+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/
+
+Code generated by applying this template can be freely used.
+
+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.
+
+Description!!!
+
+Contributor(s):
+@author Florin
+</span>
+
+<tr>
+ <td>
+ <span jwcid="@If" condition="ognl:isFieldLink()">
+ <label jwcid="@FieldLabel" field="component:equandaLinkInput" prerender="ognl:false"/>
+ </span>
+ <span jwcid="@Else">
+ <label jwcid="@FieldLabel" field="component:equandaSimpleInput" prerender="ognl:false"/>
+ </span>
+ </td>
+ <td>
+ <span jwcid="@If" condition="ognl:isFieldLink()">
+ <input jwcid="equandaLinkInput"/>
+ </span>
+ <span jwcid="@Else">
+ <input jwcid="equandaSimpleInput"/>
+ </span>
+ </td>
+</tr>
Deleted: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/UnidParameter.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/UnidParameter.html 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/action/equandaParameter/UnidParameter.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -1,49 +0,0 @@
-<span jwcid="$remove$">
-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/
-
-Code generated by applying this template can be freely used.
-
-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.
-
-Description!!!
-
-Contributor(s):
-@author Florin
-</span>
-
-<tr>
- <td>
- <span jwcid="@If" condition="ognl:isFieldLink()">
- <label jwcid="@FieldLabel" field="component:equandaLinkInput" prerender="ognl:false"/>
- </span>
- <span jwcid="@Else">
- <label jwcid="@FieldLabel" field="component:equandaSimpleInput" prerender="ognl:false"/>
- </span>
- </td>
- <td>
- <span jwcid="@If" condition="ognl:isFieldLink()">
- <input jwcid="equandaLinkInput"/>
- </span>
- <span jwcid="@Else">
- <input jwcid="equandaSimpleInput"/>
- </span>
- </td>
-</tr>
Copied: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/EquandaAdd.html (from rev 6, trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/UnidAdd.html)
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/EquandaAdd.html (rev 0)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/EquandaAdd.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -0,0 +1,42 @@
+<span jwcid="$remove$">
+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/
+
+Code generated by applying this template can be freely used.
+
+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.
+
+Description!!!
+
+Contributor(s):
+@author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
+</span>
+
+<span class="displayError" jwcid="error"/>
+
+<form jwcid="EnityForm@Form"
+ listener="listener:formSubmit"
+ delegate="bean:validationDelegate"
+ clientValidationEnabled="ognl:true"
+ enctype="multipart/form-data" focus="ognl:false">
+ <input jwcid="entityUsageMenuUp"/>
+ <span jwcid="equandaTable"/>
+ <input jwcid="entityUsageMenuDown"/>
+</form>
Deleted: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/UnidAdd.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/UnidAdd.html 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaAdd/UnidAdd.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -1,42 +0,0 @@
-<span jwcid="$remove$">
-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/
-
-Code generated by applying this template can be freely used.
-
-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.
-
-Description!!!
-
-Contributor(s):
-@author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
-</span>
-
-<span class="displayError" jwcid="error"/>
-
-<form jwcid="EnityForm@Form"
- listener="listener:formSubmit"
- delegate="bean:validationDelegate"
- clientValidationEnabled="ognl:true"
- enctype="multipart/form-data" focus="ognl:false">
- <input jwcid="entityUsageMenuUp"/>
- <span jwcid="equandaTable"/>
- <input jwcid="entityUsageMenuDown"/>
-</form>
Copied: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/EquandaEdit.html (from rev 6, trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/UnidEdit.html)
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/EquandaEdit.html (rev 0)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/EquandaEdit.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -0,0 +1,57 @@
+<span jwcid="$remove$">
+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/
+
+Code generated by applying this template can be freely used.
+
+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.
+
+Description!!!
+
+Contributor(s):
+@author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
+@author Florin
+</span>
+
+<span class="displayError" jwcid="error"/>
+
+<form jwcid="EnityForm@Form"
+ listener="listener:formSubmit"
+ delegate="bean:validationDelegate"
+ clientValidationEnabled="ognl:true"
+ enctype="multipart/form-data" focus="ognl:false">
+
+ <input jwcid="entityUsageMenuUp"/>
+ <span jwcid="equandaTable"/>
+ <input jwcid="entityUsageMenuDown"/>
+
+ <center>
+ <span jwcid="foreachAction">
+ <span jwcid="@LinkSubmit" parameters="prop:action" listener="listener:action">
+ <span jwcid="@Insert"
+ value="prop:actionLabel"/>
+ </span>
+ <p/>
+ </span>
+ </center>
+
+ <span jwcid="equandaLinkSelects"/>
+
+</form>
\ No newline at end of file
Deleted: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/UnidEdit.html
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/UnidEdit.html 2007-07-05 14:34:08 UTC (rev 7)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaEdit/UnidEdit.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -1,57 +0,0 @@
-<span jwcid="$remove$">
-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/
-
-Code generated by applying this template can be freely used.
-
-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.
-
-Description!!!
-
-Contributor(s):
-@author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
-@author Florin
-</span>
-
-<span class="displayError" jwcid="error"/>
-
-<form jwcid="EnityForm@Form"
- listener="listener:formSubmit"
- delegate="bean:validationDelegate"
- clientValidationEnabled="ognl:true"
- enctype="multipart/form-data" focus="ognl:false">
-
- <input jwcid="entityUsageMenuUp"/>
- <span jwcid="equandaTable"/>
- <input jwcid="entityUsageMenuDown"/>
-
- <center>
- <span jwcid="foreachAction">
- <span jwcid="@LinkSubmit" parameters="prop:action" listener="listener:action">
- <span jwcid="@Insert"
- value="prop:actionLabel"/>
- </span>
- <p/>
- </span>
- </center>
-
- <span jwcid="equandaLinkSelects"/>
-
-</form>
\ No newline at end of file
Copied: trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaField/EquandaField2.html (from rev 6, trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaField/UnidField2.html)
===================================================================
--- trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaField/EquandaField2.html (rev 0)
+++ trunk/equanda-tapestry/src/main/resources/org/equanda/tapestry/components/equandaField/EquandaField2.html 2007-07-05 16:11:52 UTC (rev 8)
@@ -0,0 +1,48 @@
+<span jwcid="$remove$">
+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/
+
+Code generated by applying this template can be freely used.
+
+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 ...
[truncated message content] |
