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...> - 2009-06-04 14:12:58
|
Revision: 1109
http://equanda.svn.sourceforge.net/equanda/?rev=1109&view=rev
Author: triathlon98
Date: 2009-06-04 13:38:37 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
EQ-130 remove unused classes/files, improve choice handling (using generics) (51 tests to go)
Modified Paths:
--------------
branches/EQ-130/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java
branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml
branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/user-admin.xml
branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm
branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm
branches/EQ-130/equanda-generate/src/main/velocity/t5gui/base/OneObjectComponentBase.java.vm
branches/EQ-130/equanda-generate/src/main/velocity/t5gui/components/choicemodel.java.vm
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/Choice.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstance.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoice.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry3Letter.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountryCode.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOLanguage2Letter.java
branches/EQ-130/equanda-test/src/main/dm/Choices.table
branches/EQ-130/equanda-test/src/main/dm/VehicleWithWheels.table
branches/EQ-130/equanda-test/test-core/src/main/java/org/equanda/test/validator/ItemHider.java
branches/EQ-130/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ChoicesTest.java
Added Paths:
-----------
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceDefault.java
branches/EQ-130/equanda-test/test-core/src/main/java/org/equanda/test/validator/StarChoice.java
branches/EQ-130/equanda-test/test-core/src/main/java/org/equanda/test/validator/TwelveChoice.java
Removed Paths:
-------------
branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaFieldPreference.table
branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRight.table
branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightEditable.table
branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightRunnable.table
branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaTablePreference.table
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ChoiceAdapter.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DisplayPreferences.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EditableRights.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoiceAdapter.java
branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/RunnableRights.java
branches/EQ-130/equanda-test/test-core/src/main/java/org/equanda/test/validator/OtherChoices.java
Modified: branches/EQ-130/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java
===================================================================
--- branches/EQ-130/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -78,7 +78,7 @@
*
* @return allowed type identifiers
*/
- Collection<String> getAllowedStringValues();
+ Collection<String> getAllowedValues();
/**
* Get the allowed child types
Modified: branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml
===================================================================
--- branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/infrastructure.xml 2009-06-04 13:38:37 UTC (rev 1109)
@@ -3,13 +3,6 @@
<equanda>
<!-- user-admin support files -->
- <!-- need to be fixed for t5 gui
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaFieldPreference.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaRightEditable.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaRight.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaRightRunnable.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaTablePreference.table"/>
- -->
<table file="classpath://org/equanda/infrastructure/useradmin/EquandaRole.table"/>
<table file="classpath://org/equanda/infrastructure/useradmin/EquandaUser.table"/>
<!-- tapestry support files -->
Deleted: branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaFieldPreference.table
===================================================================
--- branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaFieldPreference.table 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaFieldPreference.table 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="EquandaFieldPreference" type="PREF">
- <description>
- Preferences for fields
- </description>
- <template parent="EquandaRight"/>
- <page>
- <field name="Preference">
- <choice class="org.equanda.validation.DisplayPreferences"/>
- <constraints>
- <!--required/-->
- </constraints>
- <display/>
- </field>
- <field name="Width" type="int"/>
- <field name="Percentage" type="int"/>
- </page>
-</table>
Deleted: branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRight.table
===================================================================
--- branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRight.table 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRight.table 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="EquandaRight" expected-amount="medium">
- <page>
- <field name="Identifier" length="75">
- <constraints>
- <required/>
- </constraints>
- <display/>
- </field>
- </page>
-
- <hide/>
-
- <select name="Identifier">
- <selection field="Identifier"/>
- </select>
-</table>
Deleted: branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightEditable.table
===================================================================
--- branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightEditable.table 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightEditable.table 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="EquandaRightEditable" type="EDIT">
- <description>Right for tables, fields, pages, groups</description>
- <template parent="EquandaRight"/>
- <page>
- <field name="EditAccess">
- <choice class="org.equanda.validation.EditableRights"/>
- <constraints>
- <!--required/-->
- </constraints>
- <display/>
- </field>
- </page>
-</table>
Deleted: branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightRunnable.table
===================================================================
--- branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightRunnable.table 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaRightRunnable.table 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="EquandaRightRunnable" type="RUNN">
- <description>
- Right for selects and actions.
- </description>
- <template parent="EquandaRight"/>
- <page>
- <field name="RunAccess">
- <choice class="org.equanda.validation.RunnableRights"/>
- <constraints>
- <!--required/-->
- </constraints>
- <display/>
- </field>
- </page>
-</table>
Deleted: branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaTablePreference.table
===================================================================
--- branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaTablePreference.table 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaTablePreference.table 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE table SYSTEM "equanda.dtd">
-
-<table name="EquandaTablePreference" type="TABL">
- <description>
- Preferences for tables
- </description>
- <template parent="EquandaRight"/>
- <page>
- <field name="TablePreference">
- <choice class="org.equanda.validation.DisplayPreferences"/>
- <constraints>
- <!--required/-->
- </constraints>
- <display/>
- </field>
- </page>
-</table>
Modified: branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/user-admin.xml
===================================================================
--- branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/user-admin.xml 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/user-admin.xml 2009-06-04 13:38:37 UTC (rev 1109)
@@ -4,11 +4,6 @@
<equanda>
<database name="equanda">
<!-- user-admin support files -->
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaFieldPreference.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaRightEditable.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaRight.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaRightRunnable.table"/>
- <table file="classpath://org/equanda/infrastructure/useradmin/EquandaTablePreference.table"/>
<table file="classpath://org/equanda/infrastructure/useradmin/EquandaRole.table"/>
<table file="classpath://org/equanda/infrastructure/useradmin/EquandaUser.table"/>
</database>
Modified: branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm
===================================================================
--- branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm 2009-06-04 13:38:37 UTC (rev 1109)
@@ -57,12 +57,12 @@
#parse( "ObjectTypeParentValue.vm" )
};
- public Collection<String> getAllowedStringNames()
+ public Collection<String> getAllowedNames()
{
return Arrays.asList( allowedChildNames );
}
- public Collection<String> getAllowedStringValues()
+ public Collection<String> getAllowedValues()
{
return Arrays.asList( allowedChildValues );
}
Modified: branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm
===================================================================
--- branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectTypeChoice.java.vm 2009-06-04 13:38:37 UTC (rev 1109)
@@ -43,7 +43,7 @@
public class ${table.Name}TypeChoice
extends ${table.Name}Type
- implements EnumerableChoice
+ implements EnumerableChoice<String>
{
// all the methods already exists, need this to implement EnumerableChoice
}
\ No newline at end of file
Modified: branches/EQ-130/equanda-generate/src/main/velocity/t5gui/base/OneObjectComponentBase.java.vm
===================================================================
--- branches/EQ-130/equanda-generate/src/main/velocity/t5gui/base/OneObjectComponentBase.java.vm 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-generate/src/main/velocity/t5gui/base/OneObjectComponentBase.java.vm 2009-06-04 13:38:37 UTC (rev 1109)
@@ -104,8 +104,8 @@
{
List<OptionModel> list = new ArrayList<OptionModel>();
${ejbPackage}.client.type.${table.Name}Type type = new ${ejbPackage}.client.type.${table.Name}Type();
- Collection<String> values = type.getAllowedStringValues();
- Iterator<String> names = type.getAllowedStringNames().iterator();
+ Collection<String> values = type.getAllowedValues();
+ Iterator<String> names = type.getAllowedNames().iterator();
for ( String value : values )
{
String name = names.next();
@@ -130,12 +130,12 @@
#foreach( $choice in $field.Choices )
#if( $choice.isFromClass() )
{
- EnumerableChoice choice = new ${choice.className}();
- if ( choice.getAllowedStringValues() != null && choice.getAllowedStringNames() != null
- && choice.getAllowedStringValues().size() == choice.getAllowedStringNames().size() )
+ EnumerableChoice<String> choice = new ${choice.className}();
+ if ( choice.getAllowedValues() != null && choice.getAllowedNames() != null
+ && choice.getAllowedValues().size() == choice.getAllowedNames().size() )
{
- Iterator<String> iteratorValues = choice.getAllowedStringValues().iterator();
- for ( String name : choice.getAllowedStringNames() )
+ Iterator<String> iteratorValues = choice.getAllowedValues().iterator();
+ for ( String name : choice.getAllowedNames() )
{
String option = iteratorValues.next();
if ( option.equals( val ) )
Modified: branches/EQ-130/equanda-generate/src/main/velocity/t5gui/components/choicemodel.java.vm
===================================================================
--- branches/EQ-130/equanda-generate/src/main/velocity/t5gui/components/choicemodel.java.vm 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-generate/src/main/velocity/t5gui/components/choicemodel.java.vm 2009-06-04 13:38:37 UTC (rev 1109)
@@ -6,54 +6,23 @@
#foreach( $choice in $field.choices )
#if( $choice.isFromClass() )
#if( $field.isInt() )
- {
- EnumerableChoice choice = new ${choice.className}();
- if ( choice.getAllowedIntValues() != null && choice.getAllowedIntNames() != null
- && choice.getAllowedIntValues().size() == choice.getAllowedIntNames().size() )
- {
- Iterator<Integer> iteratorValues = choice.getAllowedIntValues().iterator();
- for ( String name : choice.getAllowedIntNames() )
- {
- list.add( new EquandaOptionModel( name, iteratorValues.next() ) );
- }
- }
- }
+ #set( $choiceType = "Integer" )
#elseif( $field.isBoolean() )
- {
- EnumerableChoice choice = new ${choice.className}();
- if ( choice.getAllowedBooleanValues() != null && choice.getAllowedBooleanNames() != null
- && choice.getAllowedBooleanValues().size() == choice.getAllowedBooleanNames().size() )
- {
- Iterator<Boolean> iteratorValues = choice.getAllowedBooleanValues().iterator();
- for ( String name : choice.getAllowedBooleanNames() )
- {
- list.add( new EquandaOptionModel( name, iteratorValues.next() ) );
- }
- }
- }
+ #set( $choiceType = "Boolean" )
#elseif( $field.isDouble() )
- {
- EnumerableChoice choice = new ${choice.className}();
- if ( choice.getAllowedDoubleValues() != null && choice.getAllowedDoubleNames() != null
- && choice.getAllowedDoubleValues().size() == choice.getAllowedDoubleNames().size() )
- {
- Iterator<Double> iteratorValues = choice.getAllowedDoubleValues().iterator();
- for ( String name : choice.getAllowedDoubleNames() )
- {
- list.add( new EquandaOptionModel( name, iteratorValues.next() ) );
- }
- }
- }
+ #set( $choiceType = "Double" )
#else
+ #set( $choiceType = "String" )
+#end## end of field type check
{
- EnumerableChoice choice = new ${choice.className}();
- if ( choice.getAllowedStringValues() != null && choice.getAllowedStringNames() != null
- && choice.getAllowedStringValues().size() == choice.getAllowedStringNames().size() )
+ EnumerableChoice<$choiceType> choice = new ${choice.className}();
+ if ( choice.getAllowedValues() != null && choice.getAllowedNames() != null
+ && choice.getAllowedValues().size() == choice.getAllowedNames().size() )
{
- Iterator<String> iteratorValues = choice.getAllowedStringValues().iterator();
- for ( String name : choice.getAllowedStringNames() )
+ Iterator<$choiceType> iteratorValues = choice.getAllowedValues().iterator();
+ for ( String name : choice.getAllowedNames() )
{
- String value = iteratorValues.next();
+ $choiceType value = iteratorValues.next();
if ( choice instanceof ChoiceTranslation )
{
list.add( new EquandaOptionModel( ( ( ChoiceTranslation ) choice ).getTranslation( name ), value ) );
@@ -65,7 +34,6 @@
}
}
}
-#end## end of field type check
#else## not from class
list.add( new EquandaOptionModel( messages.get( "choice.${table.Name}.${field.Name}.$choice.Name" ),
#if( $field.isInt() )new Integer( $choice.value )#elseif( $field.isBoolean() )new Boolean( $choice.value )#elseif( $field.isDouble() )new Double( $choice.value )#else"$choice.value"#end ) );
Modified: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/Choice.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/Choice.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/Choice.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -29,13 +29,7 @@
* Interface which needs to be implemented for choice validation classes
*
*/
-public interface Choice
+public interface Choice<TYPE>
{
- boolean isAllowed( String s );
-
- boolean isAllowed( boolean b );
-
- boolean isAllowed( int i );
-
- boolean isAllowed( double d );
+ boolean isAllowed( TYPE obj );
}
Deleted: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ChoiceAdapter.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ChoiceAdapter.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ChoiceAdapter.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -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.validation;
-
-/**
- * Adapter class for Choice validation, extend and overwrite according to the correct type.
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- */
-public class ChoiceAdapter
- implements Choice
-{
-
- public boolean isAllowed( String s )
- {
- return false;
- }
-
- public boolean isAllowed( boolean b )
- {
- return false;
- }
-
- public boolean isAllowed( int i )
- {
- return false;
- }
-
- public boolean isAllowed( double d )
- {
- return false;
- }
-}
Modified: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstance.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstance.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstance.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -25,7 +25,8 @@
package org.equanda.validation;
/**
- * Interface which needs to be implemented for default validation classes
+ * Interface which needs to be implemented to allow a class to determine the default type for a
+ * (root) table in the domain model.
*
* @author NetRom team
*/
Copied: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceDefault.java (from rev 1033, branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java)
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceDefault.java (rev 0)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceDefault.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -0,0 +1,46 @@
+/**
+ * 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.validation;
+
+/**
+ * Default implementation for DefaultInstance.
+ *
+ * @author NetRom team
+ */
+public class DefaultInstanceDefault
+ implements DefaultInstance
+{
+ public boolean isForced()
+ {
+ return false;
+ }
+
+ public String getDefaultType()
+ {
+ return " ";
+ }
+
+}
+
Deleted: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,45 +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.validation;
-
-/**
- * Interface which needs to be implemented for default validation classes
- *
- * @author NetRom team
- */
-public class DefaultInstanceImpl
- implements DefaultInstance
-{
- public boolean isForced()
- {
- return false;
- }
-
- public String getDefaultType()
- {
- return " ";
- }
-
-}
-
Deleted: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DisplayPreferences.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DisplayPreferences.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/DisplayPreferences.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,80 +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.validation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Locale;
-
-/**
- * Choice class which contains preferences (display, hide) for fields, tables
- * used in equandaTablePreference.table and equandaFieldPreference.table in Useradmin
- *
- * @author <a href="mailto:fl...@pa...">Florin</a>
- */
-public class DisplayPreferences
- extends EnumerableChoiceAdapter
- implements ChoiceTranslation
-{
- public static String DISPLAY = "DISPLAY";
- public static String HIDE = "HIDE";
-
- private static final ArrayList<String> PREFERENCES;
-
- static
- {
- PREFERENCES = new ArrayList<String>();
- PREFERENCES.add( DISPLAY );
- PREFERENCES.add( HIDE );
- }
-
- public boolean isAllowed( String s )
- {
- return PREFERENCES.contains( s );
- }
-
- public Collection<String> getAllowedStringValues()
- {
- return PREFERENCES;
- }
-
- public Collection<String> getAllowedStringNames()
- {
- return PREFERENCES;
- }
-
- public String getTranslation( String str )
- {
- Locale[] available = Locale.getAvailableLocales();
- for ( Locale anAvailable : available )
- {
- if ( anAvailable.getLanguage().equals( str ) )
- {
- return anAvailable.getDisplayLanguage();
- }
- }
- return str;
- }
-}
Deleted: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EditableRights.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EditableRights.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EditableRights.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,82 +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.validation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Locale;
-
-/**
- * Choice class which contains rights (view, edit, or none) for fields, tables, groups, other items
- * used in equandaRightEditable.table in Useradmin
- *
- * @author <a href="mailto:fl...@pa...">Florin</a>
- */
-public class EditableRights
- extends EnumerableChoiceAdapter
- implements ChoiceTranslation
-{
- public static String EDIT = "EDIT";
- public static String VIEW = "VIEW";
- public static String NONE = "NONE";
-
- private static final ArrayList<String> RIGHTS;
-
- static
- {
- RIGHTS = new ArrayList<String>();
- RIGHTS.add( EDIT );
- RIGHTS.add( VIEW );
- RIGHTS.add( NONE );
- }
-
- public boolean isAllowed( String s )
- {
- return RIGHTS.contains( s );
- }
-
- public Collection<String> getAllowedStringValues()
- {
- return RIGHTS;
- }
-
- public Collection<String> getAllowedStringNames()
- {
- return RIGHTS;
- }
-
- public String getTranslation( String str )
- {
- Locale[] available = Locale.getAvailableLocales();
- for ( Locale anAvailable : available )
- {
- if ( anAvailable.getLanguage().equals( str ) )
- {
- return anAvailable.getDisplayLanguage();
- }
- }
- return str;
- }
-}
Modified: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoice.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoice.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoice.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -29,26 +29,14 @@
/**
* Subinterface of Choice, introducing functions getAllowedValues, getAllowedNames
* If a validator class implements EnumerableChoice, these functions
- * are used by the gui to produce a select widget for the respective field
+ * can used by the gui to produce a select widget for the respective field.
*
* @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
*/
-public interface EnumerableChoice
- extends Choice
+public interface EnumerableChoice<TYPE>
+ extends Choice<TYPE>
{
- Collection<String> getAllowedStringValues();
+ Collection<TYPE> getAllowedValues();
- Collection<String> getAllowedStringNames();
-
- Collection<Integer> getAllowedIntValues();
-
- Collection<String> getAllowedIntNames();
-
- Collection<Boolean> getAllowedBooleanValues();
-
- Collection<String> getAllowedBooleanNames();
-
- Collection<Double> getAllowedDoubleValues();
-
- Collection<String> getAllowedDoubleNames();
+ Collection<String> getAllowedNames();
}
Deleted: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoiceAdapter.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoiceAdapter.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/EnumerableChoiceAdapter.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -1,78 +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.validation;
-
-import java.util.Collection;
-
-/**
- * Adapter class for EnumerableChoice validation
- *
- * @author NetRom team
- * @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
- */
-public class EnumerableChoiceAdapter
- extends ChoiceAdapter
- implements EnumerableChoice
-{
- public Collection<String> getAllowedStringValues()
- {
- return null;
- }
-
- public Collection<String> getAllowedStringNames()
- {
- return null;
- }
-
- public Collection<Integer> getAllowedIntValues()
- {
- return null;
- }
-
- public Collection<String> getAllowedIntNames()
- {
- return null;
- }
-
- public Collection<Boolean> getAllowedBooleanValues()
- {
- return null;
- }
-
- public Collection<String> getAllowedBooleanNames()
- {
- return null;
- }
-
- public Collection<Double> getAllowedDoubleValues()
- {
- return null;
- }
-
- public Collection<String> getAllowedDoubleNames()
- {
- return null;
- }
-}
Modified: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -34,11 +34,10 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class ISOCountry2Letter
- extends EnumerableChoiceAdapter
- implements ChoiceTranslation
+ implements EnumerableChoice<String>, ChoiceTranslation
{
private static final int COUNTRIES_COUNT = 240;
- private static final LinkedHashSet<String> COUNTRIES;
+ private static final Collection<String> COUNTRIES;
public boolean isAllowed( String s )
{
@@ -289,12 +288,12 @@
COUNTRIES.add( "ZW" ); // Zimbabwe
}
- public Collection<String> getAllowedStringValues()
+ public Collection<String> getAllowedValues()
{
return COUNTRIES;
}
- public Collection<String> getAllowedStringNames()
+ public Collection<String> getAllowedNames()
{
return COUNTRIES;
}
Modified: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry3Letter.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry3Letter.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountry3Letter.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -33,7 +33,7 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class ISOCountry3Letter
- extends EnumerableChoiceAdapter
+ implements EnumerableChoice<String>
{
private static final int COUNTRIES_COUNT = 240;
private static final LinkedHashSet<String> COUNTRIES;
@@ -287,12 +287,12 @@
COUNTRIES.add( "ZWE" ); // Zimbabwe
}
- public Collection<String> getAllowedStringValues()
+ public Collection<String> getAllowedValues()
{
return COUNTRIES;
}
- public Collection<String> getAllowedStringNames()
+ public Collection<String> getAllowedNames()
{
return COUNTRIES;
}
Modified: branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountryCode.java
===================================================================
--- branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountryCode.java 2009-05-31 10:55:49 UTC (rev 1108)
+++ branches/EQ-130/equanda-server/src/main/java/org/equanda/validation/ISOCountryCode.java 2009-06-04 13:38:37 UTC (rev 1109)
@@ -24,8 +24,10 @@
package org.equanda.validation;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedHashSet;
+import java.util.HashMap;
+import java.util.Map;
/**
* Choice class which only accepts valid 2 letter country codes (according to ISO-3166, 2003-07-25)
@@ -33,279 +35,269 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class ISOCountryCode
- extends EnumerableChoiceAdapter
+ implements EnumerableChoice<Integer>
{
private static final int COUNTRIES_COUNT = 240;
- private static final LinkedHashSet<String> COUNTRIES;
+ private static final Map<Integer, String> COUNTRIES;
- public boolean isAllowed( String s )
+ public boolean isAllowed( Integer value )
{
- return COUNTRIES.contains( s );
+ return COUNTRIES.containsKey( value );
}
- public boolean isAllowed( int i )
- {
- String num = Integer.toString( i );
- int l = num.length();
- if ( l == 1 )
- {
- num = "00" + num;
- }
- else if ( l == 2 ) num = '0' + num;
- return COUNTRIES.contains( num );
- }
-
static
{
- COUNTRIES = new LinkedHashSet<String>( COUNTRIES_COUNT );
- COUNTRIES.add( "004" ); // Afghanistan
- COUNTRIES.add( "008" ); // Albania, People's Socialist Republic of
- COUNTRIES.add( "012" ); // Algeria, People's Democratic Republic of
- COUNTRIES.add( "016" ); // American Samoa
- COUNTRIES.add( "020" ); // Andorra, Principality of
- COUNTRIES.add( "024" ); // Angola, Republic of
- COUNTRIES.add( "660" ); // Anguilla
- COUNTRIES.add( "010" ); // Antarctica (the territory South of 60 deg S)
- COUNTRIES.add( "028" ); // Antigua and Barbuda
- COUNTRIES.add( "032" ); // Argentina, Argentine Republic
- COUNTRIES.add( "051" ); // Armenia
- COUNTRIES.add( "533" ); // Aruba
- COUNTRIES.add( "036" ); // Australia, Commonwealth of
- COUNTRIES.add( "040" ); // Austria, Republic of
- COUNTRIES.add( "031" ); // Azerbaijan, Republic of
- COUNTRIES.add( "044" ); // Bahamas, Commonwealth of the
- COUNTRIES.add( "048" ); // Bahrain, Kingdom of
- COUNTRIES.add( "050" ); // Bangladesh, People's Republic of
- COUNTRIES.add( "052" ); // Barbados
- COUNTRIES.add( "112" ); // Belarus
- COUNTRIES.add( "056" ); // Belgium, Kingdom of
- COUNTRIES.add( "084" ); // Belize
- COUNTRIES.add( "204" ); // Benin, People's Republic of
- COUNTRIES.add( "060" ); // Bermuda
- COUNTRIES.add( "064" ); // Bhutan, Kingdom of
- COUNTRIES.add( "068" ); // Bolivia, Republic of
- COUNTRIES.add( "070" ); // Bosnia and Herzegovina
- COUNTRIES.add( "072" ); // Botswana, Republic of
- COUNTRIES.add( "074" ); // Bouvet Island (Bouvetoya)
- COUNTRIES.add( "076" ); // Brazil, Federative Republic of
- COUNTRIES.add( "086" ); // British Indian Ocean Territory (Chagos Archipelago)
- COUNTRIES.add( "092" ); // British Virgin Islands
- COUNTRIES.add( "096" ); // Brunei Darussalam
- COUNTRIES.add( "100" ); // Bulgaria, People's Republic of
- COUNTRIES.add( "854" ); // Burkina Faso
- COUNTRIES.add( "108" ); // Burundi, Republic of
- COUNTRIES.add( "116" ); // Cambodia, Kingdom of
- COUNTRIES.add( "120" ); // Cameroon, United Republic of
- COUNTRIES.add( "124" ); // Canada
- COUNTRIES.add( "132" ); // Cape Verde, Republic of
- COUNTRIES.add( "136" ); // Cayman Islands
- COUNTRIES.add( "140" ); // Central African Republic
- COUNTRIES.add( "148" ); // Chad, Republic of
- COUNTRIES.add( "152" ); // Chile, Republic of
- COUNTRIES.add( "156" ); // China, People's Republic of
- COUNTRIES.add( "162" ); // Christmas Island
- COUNTRIES.add( "166" ); // Cocos (Keeling) Islands
- COUNTRIES.add( "170" ); // Colombia, Republic of
- COUNTRIES.add( "174" ); // Comoros, Union of the
- COUNTRIES.add( "180" ); // Congo, Democratic Republic of
- COUNTRIES.add( "178" ); // Congo, People's Republic of
- COUNTRIES.add( "184" ); // Cook Islands
- COUNTRIES.add( "188" ); // Costa Rica, Republic of
- COUNTRIES.add( "384" ); // Cote D'Ivoire, Ivory Coast, Republic of the
- COUNTRIES.add( "192" ); // Cuba, Republic of
- COUNTRIES.add( "196" ); // Cyprus, Republic of
- COUNTRIES.add( "203" ); // Czech Republic
- COUNTRIES.add( "208" ); // Denmark, Kingdom of
- COUNTRIES.add( "262" ); // Djibouti, Republic of
- COUNTRIES.add( "212" ); // Dominica, Commonwealth of
- COUNTRIES.add( "214" ); // Dominican Republic
- COUNTRIES.add( "218" ); // Ecuador, Republic of
- COUNTRIES.add( "818" ); // Egypt, Arab Republic of
- COUNTRIES.add( "222" ); // El Salvador, Republic of
- COUNTRIES.add( "226" ); // Equatorial Guinea, Republic of
- COUNTRIES.add( "232" ); // Eritrea
- COUNTRIES.add( "233" ); // Estonia
- COUNTRIES.add( "231" ); // Ethiopia
- COUNTRIES.add( "234" ); // Faeroe Islands
- COUNTRIES.add( "238" ); // Falkland Islands (Malvinas)
- COUNTRIES.add( "242" ); // Fiji, Republic of the Fiji Islands
- COUNTRIES.add( "246" ); // Finland, Republic of
- COUNTRIES.add( "250" ); // France, French Republic
- COUNTRIES.add( "254" ); // French Guiana
- COUNTRIES.add( "258" ); // French Polynesia
- COUNTRIES.add( "260" ); // French Southern Territories
- COUNTRIES.add( "266" ); // Gabon, Gabonese Republic
- COUNTRIES.add( "270" ); // Gambia, Republic of the
- COUNTRIES.add( "268" ); // Georgia
- COUNTRIES.add( "276" ); // Germany
- COUNTRIES.add( "288" ); // Ghana, Republic of
- COUNTRIES.add( "292" ); // Gibraltar
- COUNTRIES.add( "300" ); // Greece, Hellenic Republic
- COUNTRIES.add( "304" ); // Greenland
- COUNTRIES.add( "308" ); // Grenada
- COUNTRIES.add( "312" ); // Guadaloupe
- COUNTRIES.add( "316" ); // Guam
- COUNTRIES.add( "320" ); // Guatemala, Republic of
- COUNTRIES.add( "324" ); // Guinea, Revolutionary People's Rep'c of
- COUNTRIES.add( "624" ); // Guinea-Bissau, Republic of
- COUNTRIES.add( "328" ); // Guyana, Republic of
- COUNTRIES.add( "332" ); // Haiti, Republic of
- COUNTRIES.add( "334" ); // Heard and McDonald Islands
- COUNTRIES.add( "336" ); // Holy See (Vatican City State)
- COUNTRIES.add( "340" ); // Honduras, Republic of
- COUNTRIES.add( "344" ); // Hong Kong, Special Administrative Region of China
- COUNTRIES.add( "191" ); // Hrvatska (Croatia)
- COUNTRIES.add( "348" ); // Hungary, Hungarian People's Republic
- COUNTRIES.add( "352" ); // Iceland, Republic of
- COUNTRIES.add( "356" ); // India, Republic of
- COUNTRIES.add( "360" ); // Indonesia, Republic of
- COUNTRIES.add( "364" ); // Iran, Islamic Republic of
- COUNTRIES.add( "368" ); // Iraq, Republic of
- COUNTRIES.add( "372" ); // Ireland
- COUNTRIES.add( "376" ); // Israel, State of
- COUNTRIES.add( "380" ); // Italy, Italian Republic
- COUNTRIES.add( "388" ); // Jamaica
- COUNTRIES.add( "392" ); // Japan
- COUNTRIES.add( "400" ); // Jordan, Hashemite Kingdom of
- COUNTRIES.add( "398" ); // Kazakhstan, Republic of
- COUNTRIES.add( "404" ); // Kenya, Republic of
- COUNTRIES.add( "296" ); // Kiribati, Republic of
- COUNTRIES.add( "408" ); // Korea, Democratic People's Republic of
- COUNTRIES.add( "410" ); // Korea, Republic of
- COUNTRIES.add( "414" ); // Kuwait, State of
- COUNTRIES.add( "417" ); // Kyrgyz Republic
- COUNTRIES.add( "418" ); // Lao People's Democratic Republic
- COUNTRIES.add( "428" ); // Latvia
- COUNTRIES.add( "422" ); // Lebanon, Lebanese Republic
- COUNTRIES.add( "426" ); // Lesotho, Kingdom of
- COUNTRIES.add( "430" ); // Liberia, Republic of
- COUNTRIES.add( "434" ); // Libyan Arab Jamahiriya
- COUNTRIES.add( "438" ); // Liechtenstein, Principality of
- COUNTRIES.add( "440" ); // Lithuania
- COUNTRIES.add( "442" ); // Luxembourg, Grand Duchy of
- COUNTRIES.add( "446" ); // Macao, Special Administrative Region of China
- COUNTRIES.add( "807" ); // Macedonia, the former Yugoslav Republic of
- COUNTRIES.add( "450" ); // Madagascar, Republic of
- COUNTRIES.add( "454" ); // Malawi, Republic of
- COUNTRIES.add( "458" ); // Malaysia
- COUNTRIES.add( "462" ); // Maldives, Republic of
- COUNTRIES.add( "466" ); // Mali, Republic of
- COUNTRIES.add( "470" ); // Malta, Republic of
- COUNTRIES.add( "584" ); // Marshall Islands
- COUNTRIES.add( "474" ); // Martinique
- COUNTRIES.add( "478" ); // Mauritania, Islamic Republic of
- COUNTRIES.add( "480" ); // Mauritius
- COUNTRIES.add( "175" ); // Mayotte
- COUNTRIES.add( "484" ); // Mexico, United Mexican States
- COUNTRIES.add( "583" ); // Micronesia, Federated States of
- COUNTRIES.add( "498" ); // Moldova, Republic of
- COUNTRIES.add( "492" ); // Monaco, Principality of
- COUNTRIES.add( "496" ); // Mongolia, Mongolian People's Republic
- COUNTRIES.add( "500" ); // Montserrat
- COUNTRIES.add( "504" ); // Morocco, Kingdom of
- COUNTRIES.add( "508" ); // Mozambique, People's Republic of
- COUNTRIES.add( "104" ); // Myanmar
- COUNTRIES.add( "516" ); // Namibia
- COUNTRIES.add( "520" ); // Nauru, Republic of
- COUNTRIES.add( "524" ); // Nepal, Kingdom of
- COUNTRIES.add( "530" ); // Netherlands Antilles
- COUNTRIES.add( "528" ); // Netherlands, Kingdom of the
- COUNTRIES.add( "540" ); // New Caledonia
- COUNTRIES.add( "554" ); // New Zealand
- COUNTRIES.add( "558" ); // Nicaragua, Republic of
- COUNTRIES.add( "562" ); // Niger, Republic of the
- COUNTRIES.add( "566" ); // Nigeria, Federal Republic of
- COUNTRIES.add( "570" ); // Niue, Republic of
- COUNTRIES.add( "574" ); // Norfolk Island
- COUNTRIES.add( "580" ); // Northern Mariana Islands
- COUNTRIES.add( "578" ); // Norway, Kingdom of
- COUNTRIES.add( "512" ); // Oman, Sultanate of
- COUNTRIES.add( "586" ); // Pakistan, Islamic Republic of
- COUNTRIES.add( "585" ); // Palau
- COUNTRIES.add( "275" ); // Palestinian Territory, Occupied
- COUNTRIES.add( "591" ); // Panama, Republic of
- COUNTRIES.add( "598" ); // Papua New Guinea
- COUNTRIES.add( "600" ); // Paraguay, Republic of
- COUNTRIES.add( "604" ); // Peru, Republic of
- COUNTRIES.add( "608" ); // Philippines, Republic of the
- COUNTRIES.add( "612" ); // Pitcairn Island
- COUNTRIES.add( "616" ); // Poland, Polish People's Republic
- COUNTRIES.add( "620" ); // Portugal, Portuguese Republic
- COUNTRIES.add( "630" ); // Puerto Rico
- COUNTRIES.add( "634" ); // Qatar, State of
- COUNTRIES.add( "638" ); // Reunion
- COUNTRIES.add( "642" ); // Romania, Socialist Republic of
- COUNTRIES.add( "643" ); // Russian Federation
- COUNTRIES.add( "646" ); // Rwanda, Rwandese Republic
- COUNTRIES.add( "654" ); // St. Helena
- COUNTRIES.add( "659" ); // St. Kitts and Nevis
- COUNTRIES.add( "662" ); // St. Lucia
- COUNTRIES.add( "666" ); // St. Pierre and Miquelon
- COUNTRIES.add( "670" ); // St. Vincent and the Grenadines
- COUNTRIES.add( "882" ); // Samoa, Independent State of
- COUNTRIES.add( "674" ); // San Marino, Republic of
- COUNTRIES.add( "678" ); // Sao Tome and Principe, Democratic Republic of
- COUNTRIES.add( "682" ); // Saudi Arabia, Kingdom of
- COUNTRIES.add( "686" ); // Senegal, Republic of
- COUNTRIES.add( "891" ); // Serbia and Montenegro
- COUNTRIES.add( "690" ); // Seychelles, Republic of
- COUNTRIES.add( "694" ); // Sierra Leone, Republic of
- COUNTRIES.add( "702" ); // Singapore, Republic of
- COUNTRIES.add( "703" ); // Slovakia (Slovak Republic)
- COUNTRIES.add( "705" ); // Slovenia
- COUNTRIES.add( "090" ); // Solomon Islands
- COUNTRIES.add( "706" ); // Somalia, Somali Republic
- COUNTRIES.add( "710" ); // South Africa, Republic of
- COUNTRIES.add( "239" ); // South Georgia and the South Sandwich Islands
- COUNTRIES.add( "724" ); // Spain, Spanish State
- COUNTRIES.add( "144" ); // Sri Lanka, Democratic Socialist Republic of
- COUNTRIES.add( "736" ); // Sudan, Democratic Republic of the
- COUNTRIES.add( "740" ); // Suriname, Republic of
- COUNTRIES.add( "744" ); // Svalbard & Jan Mayen Islands
- COUNTRIES.add( "748" ); // Swaziland, Kingdom of
- COUNTRIES.add( "752" ); // Sweden, Kingdom of
- COUNTRIES.add( "756" ); // Switzerland, Swiss Confederation
- COUNTRIES.add( "760" ); // Syrian Arab Republic
- COUNTRIES.add( "158" ); // Taiwan, Province of China
- COUNTRIES.add( "762" ); // Tajikistan
- COUNTRIES.add( "834" ); // Tanzania, United Republic of
- COUNTRIES.add( "764" ); // Thailand, Kingdom of
- COUNTRIES.add( "626" ); // Timor-Leste, Democratic Republic of
- COUNTRIES.add( "768" ); // Togo, Togolese Republic
- COUNTRIES.add( "772" ); // Tokelau (Tokelau Islands)
- COUNTRIES.add( "776" ); // Tonga, Kingdom of
- COUNTRIES.add( "780" ); // Trinidad and Tobago, Republic of
- COUNTRIES.add( "788" ); // Tunisia, Republic of
- COUNTRIES.add( "792" ); // Turkey, Republic of
- COUNTRIES.add( "795" ); // Turkmenistan
- COUNTRIES.add( "796" ); // Turks and Caicos Islands
- COUNTRIES.add( "798" ); // Tuvalu
- COUNTRIES.add( "850" ); // US Virgin Islands
- COUNTRIES.add( "800" ); // Uganda, Republic of
- COUNTRIES.add( "804" ); // Ukraine
- COUNTRIES.add( "784" ); // United Arab Emirates
- COUNTRIES.add( "826" ); // United Kingdom of Great Britain & N. Ireland
- COUNTRIES.add( "581" ); // United States Minor Outlying Islands
- COUNTRIES.add( "840" ); // United States of America
- COUNTRIES.add( "858" ); // Uruguay, Eastern Republic of
- COUNTRIES.add( "860" ); // Uzbekistan
- COUNTRIES.add( "548" ); // Vanuatu
- COUNTRIES.add( "862" ); // Venezuela, Bolivarian Republic of
- COUNTRIES.add( "704" ); // Viet Nam, Socialist Republic of
- COUNTRIES.add( "876" ); // Wallis and Futuna Islands
- COUNTRIES.add( "732" ); // Western Sahara
- COUNTRIES.add( "887" ); // Yemen
- COUNTRIES.add( "894" ); // Zambia, Republic of
- COUNTRIES.add( "716" ); // Zimbabwe
+ COUNTRIES = new HashMap<Integer, String>( COUNTRIES_COUNT );
+ COUNTRIES.put( 4, "Afghanistan" );
+ COUNTRIES.put( 8, "Albania, People's Socialist Republic of" );
+ COUNTRIES.put( 12, "Algeria, People's Democratic Republic of" );
+ COUNTRIES.put( 16, "American Samoa" );
+ COUNTRIES.put( 20, "Andorra, Principality of" );
+ COUNTRIES.put( 24, "Angola, Republic of" );
+ COUNTRIES.put( 660, "Anguilla" );
+ COUNTRIES.put( 10, "Antarctica (the territory South of 60 deg S)" );
+ COUNTRIES.put( 28, "Antigua and Barbuda" );
+ COUNTRIES.put( 32, "Argentina, Argentine Republic" );
+ COUNTRIES.put( 51, "Armenia" );
+ COUNTRIES.put( 533, "Aruba" );
+ COUNTRIES.put( 36, "Australia, Commonwealth of" );
+ COUNTRIES.put( 40, "Austria, Republic of" );
+ COUNTRIES.put( 31, "Azerbaijan, Republic of" );
+ COUNTRIES.put( 44, "Bahamas, Commonwealth of the" );
+ COUNTRIES.put( 48, "Bahrain, Kingdom of" );
+ COUNTRIES.put( 50, "Bangladesh, People's Republic of" );
+ COUNTRIES.put( 52, "Barbados" );
+ COUNTRIES.put( 112, "Belarus" );
+ COUNTRIES.put( 56, "Belgium, Kingdom of" );
+ COUNTRIES.put( 84, "Belize" );
+ COUNTRIES.put( 204, "Benin, People's Republic of" );
+ COUNTRIES.put( 60, "Bermuda" );
+ COUNTRIES.put( 64, "Bhutan, Kingdom of" );
+ COUNTRIES.put( 68, "Bolivia, Republic of" );
+ COUNTRIES.put( 70, "Bosnia and Herzegovina" );
+ COUNTRIES.put( 72, "Botswana, Republic of" );
+ COUNTRIES.put( 74, "Bouvet Island (Bouvetoya)" );
+ COUNTRIES.put( 76, "Brazil, Federative Republic of" );
+ COUNTRIES.put( 86, "British Indian Ocean Territory (Chagos Archipelago)" );
+ COUNTRIES.put( 92, "British Virgin Islands" );
+ COUNTRIES.put( 96, "Brunei Darussalam" );
+ COUNTRIES.put( 100, "Bulgaria, People's Republic of" );
+ COUNTRIES.put( 854, "Burkina Faso" );
+ COUNTRIES.put( 108, "Burundi, Republic of" );
+ COUNTRIES.put( 116, "Cambodia, Kingdom of" );
+ COUNTRIES.put( 120, "Cameroon, United Republic of" );
+ COUNTRIES.put( 124, "Canada" );
+ COUNTRIES.put( 132, "Cape Verde, Republic of" );
+ COUNTRIES.put( 136, "Cayman Islands" );
+ COUNTRIES.put( 140, "Central African Republic" );
+ COUNTRIES.put( 148, "Chad, Republic of" );
+ COUNTRIES.put( 152, "Chile, Republic of" );
+ COUNTRIES.put( 156, "China, People's Republic of" );
+ COUNTRIES.put( 162, "Christmas Island" );
+ COUNTRIES.put( 166, "Cocos (Keeling) Islands" );
+ COUNTRIES.put( 170, "Colombia, Republic of" );
+ COUNTRIES.put( 174, "Comoros, Union of the" );
+ COUNTRIES.put( 180, "Congo, Democratic Republic of" );
+ COUNTRIES.put( 178, "Congo, People's Republic of" );
+ COUNTRIES.put( 184, "Cook Islands" );
+ COUNTRIES.put( 188, "Costa Rica, Republic of" );
+ COUNTRIES.put( 384, "Cote D'Ivoire, Ivory Coast, Republic of the" );
+ COUNTRIES.put( 192, "Cuba, Republic of" );
+ COUNTRIES.put( 196, "Cyprus, Republic of" );
+ COUNTRIES.put( 203, "Czech Republic" );
+ COUNTRIES.put( 208, "Denmark, Kingdom...
[truncated message content] |
|
From: <tri...@us...> - 2009-05-31 10:55:58
|
Revision: 1108
http://equanda.svn.sourceforge.net/equanda/?rev=1108&view=rev
Author: triathlon98
Date: 2009-05-31 10:55:49 +0000 (Sun, 31 May 2009)
Log Message:
-----------
EQ-130 fix SecurityTest for multiple fields (51 tests to go)
Modified Paths:
--------------
branches/EQ-130/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SecurityTest.java
Modified: branches/EQ-130/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SecurityTest.java
===================================================================
--- branches/EQ-130/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SecurityTest.java 2009-05-31 10:18:16 UTC (rev 1107)
+++ branches/EQ-130/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SecurityTest.java 2009-05-31 10:55:49 UTC (rev 1108)
@@ -46,7 +46,7 @@
{
obj.testProc2( "" );
}
- catch ( RuntimeException e )
+ catch ( Exception e )
{
fail( "testProc2 should be accessible to LocalUser" );
}
@@ -63,8 +63,8 @@
obj.testProc1( "" );
fail( "testProc1 should not be accessible to LocalUser" );
}
- catch ( RuntimeException e )
- {}
+ catch ( Exception e )
+ {/*ignore*/}
}
public void testNotAllowRemove()
@@ -78,8 +78,8 @@
obj.removeEntityBean();
fail( "removeEntityBean should not be accessible to LocalUser" );
}
- catch ( RuntimeException e )
- {}
+ catch ( Exception e )
+ {/*ignore*/}
}
public void testNotAllowSelect()
@@ -91,8 +91,8 @@
objSel.selectTestIntAdmin( 1 );
fail( "selectTestIntAdmin should not be accessible to LocalUser" );
}
- catch ( RuntimeException e )
- {}
+ catch ( Exception e )
+ {/*ignore*/}
}
public void testAllowSelect()
@@ -103,7 +103,7 @@
{
objSel.selectTestIntLocalUser( 1 );
}
- catch ( RuntimeException e )
+ catch ( Exception e )
{
fail( "selectTestIntLocalUser should not be accessible to LocalUser" );
}
@@ -118,7 +118,7 @@
sel.buildTestBuildAdmin();
fail( "buildTestBuildAdmin should not be accessible to LocalUser" );
}
- catch ( RuntimeException e )
+ catch ( Exception e )
{/*ignore*/}
sel.remove();
}
@@ -132,7 +132,7 @@
val.setTestIntImmutableLocalUser( 1 );
val.equandaUpdate();
}
- catch ( RuntimeException e )
+ catch ( Exception e )
{
fail( "buildTestBuildLocalUser should be accessible to LocalUser" );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-05-31 10:18:25
|
Revision: 1107
http://equanda.svn.sourceforge.net/equanda/?rev=1107&view=rev
Author: triathlon98
Date: 2009-05-31 10:18:16 +0000 (Sun, 31 May 2009)
Log Message:
-----------
EQ-130 fix StringLengthTest for multiple fields (51+1 tests to go)
Modified Paths:
--------------
branches/EQ-130/equanda-generate/src/main/velocity/ejb3/DMField.java.vm
Modified: branches/EQ-130/equanda-generate/src/main/velocity/ejb3/DMField.java.vm
===================================================================
--- branches/EQ-130/equanda-generate/src/main/velocity/ejb3/DMField.java.vm 2009-05-20 18:53:23 UTC (rev 1106)
+++ branches/EQ-130/equanda-generate/src/main/velocity/ejb3/DMField.java.vm 2009-05-31 10:18:16 UTC (rev 1107)
@@ -35,6 +35,7 @@
import org.equanda.persistence.Uoid;
import org.equanda.persistence.UoidGenerator;
import org.equanda.persistence.EquandaFieldBean;
+import org.equanda.util.StringUtil;
import java.sql.Timestamp;
import javax.persistence.*;
@@ -86,8 +87,36 @@
return ${field.VarName};
}
/** @ejb.interface-method */
- public void set${field.Name}($field.JavaFieldType value)
+ public void set${field.Name}( $field.JavaFieldType ${field.VarName} )
{
- ${field.VarName} = value;
+ #* force strings in field width, and do case conversion *#
+#if ( $field.isString() )
+ if ( $field.VarName != null && ${field.VarName}.length() > $field.Length ) ${field.VarName} = ${field.VarName}.substring( 0, $field.Length );
+#if( $field.hasCaseConversion() )
+ if ( null != ${field.VarName} ) {
+ #if( $field.isCaseConversionUpper() )
+ ${field.VarName} = ${field.VarName}.toUpperCase();
+ #elseif( $field.isCaseConversionLower() )
+ ${field.VarName} = ${field.VarName}.toLowerCase();
+ #else
+ org.equanda.validation.CaseConverter equandaCaseConverter = null;
+ try {
+ equandaCaseConverter = (org.equanda.validation.CaseConverter) Thread.currentThread().getContextClassLoader().loadClass( "${field.CaseConversion.ClassName}" ).newInstance();
+ if ( equandaCaseConverter.isCaseConversionUpper() )
+ {
+ ${field.VarName} = ${field.VarName}.toUpperCase();
+ }
+ else
+ {
+ if ( equandaCaseConverter.isCaseConversionLower() ) ${field.VarName} = ${field.VarName}.toLowerCase();
+ }
+ } catch ( Exception e ) {
+ throw new RuntimeException ("cannot load class ${field.CaseConversion.ClassName}");
+ }
+ #end
+ }
+#end
+#end
+ this.${field.VarName} = ${field.VarName};
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-05-20 18:53:39
|
Revision: 1106
http://equanda.svn.sourceforge.net/equanda/?rev=1106&view=rev
Author: triathlon98
Date: 2009-05-20 18:53:23 +0000 (Wed, 20 May 2009)
Log Message:
-----------
EQ-350 remove "context info"
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-05-20 09:25:03 UTC (rev 1105)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2009-05-20 18:53:23 UTC (rev 1106)
@@ -4,7 +4,7 @@
<t:selectlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<t:parameter name="title">${dollar}{navigationPageTitle}</t:parameter>
<t:parameter name="context">
- <span id="context">context info</span>
+ <span id="context"></span>
</t:parameter>
<t:parameter name="buttons">
<input t:type="submit" value="${dollar}{equanda-message:button.Refresh}" t:id="refresh" class="defaultSubmit" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-05-20 09:25:12
|
Revision: 1105
http://equanda.svn.sourceforge.net/equanda/?rev=1105&view=rev
Author: triathlon98
Date: 2009-05-20 09:25:03 +0000 (Wed, 20 May 2009)
Log Message:
-----------
EQ-348 fix breadwrumbs doc
Modified Paths:
--------------
trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki
Modified: trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki 2009-05-20 08:59:10 UTC (rev 1104)
+++ trunk/equanda-t5navigation/src/site/wiki/breadcrumbs.wiki 2009-05-20 09:25:03 UTC (rev 1105)
@@ -21,7 +21,7 @@
<fieldset>
<legend>breadcrumbs</legend>
<ul>
- <t:loop source="breadcrumbs" value="current" index="index">
+ <t:loop source="breadcrumbs" value="current" index="index" volatile="true">
<li><t:actionlink t:id="breadcrumb" context="index">${current.title}</t:actionlink></li>
</t:loop>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-05-20 08:59:49
|
Revision: 1104
http://equanda.svn.sourceforge.net/equanda/?rev=1104&view=rev
Author: triathlon98
Date: 2009-05-20 08:59:10 +0000 (Wed, 20 May 2009)
Log Message:
-----------
EQ-346 fix script inclusions
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/t5equanda.js
Added Paths:
-----------
trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-04-27 16:20:41 UTC (rev 1103)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-05-20 08:59:10 UTC (rev 1104)
@@ -57,7 +57,7 @@
import org.equanda.t5nav.services.NavigationManager;
$!{engine.getTemplateConfig("page-class-annotation" )}
-@IncludeJavaScriptLibrary( { "classpath:/org/equanda/tapestry5/resources/authandconfig.js" } )
+@IncludeJavaScriptLibrary( { "classpath:/org/equanda/t5gui/authandconfig.js" } )
public class AuthAndConfigTables
implements AuthAndConfigPages
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-04-27 16:20:41 UTC (rev 1103)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-05-20 08:59:10 UTC (rev 1104)
@@ -59,7 +59,8 @@
$!{engine.getTemplateConfig("page-class-annotation" )}
@IncludeJavaScriptLibrary( { "${tapestry.scriptaculous}/prototype.js",
- "classpath:/org/equanda/tapestry5/resources/t5equanda.js" } )
+ "classpath:/org/equanda/tapestry5/resources/t5equanda.js",
+ "classpath:/org/equanda/t5gui/authandconfig.js" } )
public class AuthAndConfig
implements AuthAndConfigPages
{
Added: trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js
===================================================================
--- trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js (rev 0)
+++ trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js 2009-05-20 08:59:10 UTC (rev 1104)
@@ -0,0 +1,309 @@
+/** This file is part of the equanda project, http://equanda.org */
+
+/**
+ * Enabled boxes when another box (write/list/etc) is checked
+ */
+function eqEnableBoxes( readCheck, check1, check2 )
+{
+ if( !readCheck.checked && check1.checked )
+ readCheck.click();
+
+ if( check2.checked && !check1.checked )
+ {
+ if( !readCheck.checked )
+ {
+ readCheck.click();
+ }
+
+ check1.click();
+
+ if( !check2.checked )
+ {
+ // may be reset by on of the clickers
+ check2.click();
+ }
+ }
+
+ if( !readCheck.checked && !check1.checked && check2.checked )
+ {
+ readCheck.click();
+ check1.click();
+ }
+}
+
+/**
+ * Disable all enabled boxes when readCheck is unchecked
+ */
+function eqDisableBoxes( readCheck, writeCheck, listCheck, summaryCheck, printCheck )
+{
+ if( !readCheck.checked )
+ {
+ writeCheck.checked = false;
+ listCheck.checked = false;
+ summaryCheck.checked = false;
+ printCheck.checked = false;
+ }
+
+}
+
+/**
+ * Ensure other components are enabled/disabled when read is checked or unchecked
+ *
+ * @param readBox The read checkbox object (this)
+ * @param writeBoxName The name of the write box to be disabled
+ * @param deleteBoxName The name of the delete box to be disabled
+ * @param trName The name of the tr element that contains the Configure link to be disabled.
+ */
+function eqHandleReadBox( readBox, writeBoxName, deleteBoxName, trName )
+{
+ if( !readBox.checked )
+ {
+ var writeInput = $$( "input#" + writeBoxName );
+ if( writeInput.length != 0 )
+ {
+ if( writeInput[ 0 ].checked )
+ {
+ writeInput[ 0 ].click();
+ }
+ }
+
+ var deleteInput = $$( "input#" + deleteBoxName );
+ if( deleteInput.length != 0 )
+ {
+ if( deleteInput[ 0 ].checked )
+ {
+ deleteInput[ 0 ].click();
+ }
+ }
+ }
+
+ if( trName != null )
+ {
+ var allLinks = $$( 'tr#' + trName + ' a' );
+
+ if( readBox.checked )
+ allLinks[ 0 ].show();
+ else
+ allLinks[ 0 ].hide();
+ }
+}
+
+/**
+ *
+ */
+function eqHandlePageBox( pageReadBox, fieldSetId, inputId, pageWriteCheckStr, pageListCheck, pageSummaryCheck, pagePrintCheck )
+{
+ if( !pageReadBox.checked )
+ {
+ if( anyFieldsChecked( fieldSetId, inputId ) && !allFieldsChecked( fieldSetId, inputId ) )
+ {
+ // if pageCheck=true and is clicked again (thus firing this event),
+ // it enables all field boxes, and stay enabled.
+ pageReadBox.click();
+ setFieldChecks( true, fieldSetId, inputId );
+ }
+ else
+ {
+ // if any field boxes are already enabled, it should uncheck all field boxes
+ setFieldChecks( false, fieldSetId, inputId );
+ }
+
+ // set all page checks off
+ var pageWriteCheck = $$( 'fieldSet#' + fieldSetId + " input#" + pageWriteCheckStr );
+ if( pageWriteCheck.length != 0 )
+ {
+ pageWriteCheck[ 0 ].checked = false;
+ }
+
+ pageListCheck.checked = false;
+ pageSummaryCheck.checked = false;
+ pagePrintCheck.checked = false;
+ }
+ else if( pageReadBox.checked )
+ {
+ if( !anyFieldsChecked( fieldSetId, inputId ) )
+ {
+ // no boxes checked at all - switch them all on
+ setFieldChecks( true, fieldSetId, inputId );
+ }
+ }
+}
+
+/**
+ *
+ */
+function eqHandleFieldReadBox( pageReadCheck, fieldSetId, inputId, fieldReadCheck, fieldWriteCheckStr, fieldListCheck, fieldSummaryCheck, fieldPrintCheck )
+{
+ if( !pageReadCheck.checked && fieldReadCheck.checked )
+ {
+ pageReadCheck.click();
+ }
+ else if( !fieldReadCheck.checked )
+ {
+ var fieldWriteCheck = $$( 'fieldSet#' + fieldSetId + " input#" + fieldWriteCheckStr );
+ if( fieldWriteCheck.length != 0 )
+ {
+ fieldWriteCheck[ 0 ].checked = false;
+ }
+
+ fieldListCheck.checked = false;
+ fieldSummaryCheck.checked = false;
+ fieldPrintCheck.checked = false;
+
+ if( !anyFieldsChecked( fieldSetId, inputId ) )
+ {
+ // all fields are off
+ if( pageReadCheck.checked )
+ {
+ pageReadCheck.click();
+ }
+ }
+ }
+}
+
+/**
+ *
+ */
+function eqHandleFieldBox( pageCheck, fieldReadCheck, fieldCheck, fieldSetId, inputId )
+{
+ // list implies read
+ if( !fieldReadCheck.checked && fieldCheck.checked )
+ {
+ fieldReadCheck.click();
+ }
+
+ // if any fields are checked, the page needs to be checked
+ if( fieldCheck.checked && !pageCheck.checked )
+ {
+ pageCheck.click();
+ }
+
+ // if all field checks are unchecked, then the page check should be off too.
+ if( !fieldCheck.checked )
+ {
+ if( !anyFieldsChecked( fieldSetId, inputId ) && pageCheck.checked )
+ {
+ pageCheck.click();
+ }
+ }
+}
+
+/**
+ * Ensure other components are enabled/disabled when write is checked or unchecked
+ *
+ * @param readBox The read checkbox object
+ * @param writeBox The read checkbox object (this)
+ * @param deleteBox The read checkbox object
+ */
+function eqHandleWriteBox( readBox, writeBox, deleteBox )
+{
+ if( writeBox.checked )
+ {
+ if( !readBox.checked )
+ readBox.click();
+ }
+
+ if( !writeBox.checked )
+ {
+ deleteBox.checked = false ;
+ }
+}
+
+/**
+ * Ensure other components are enabled/disabled when delete is checked or unchecked
+ *
+ * @param readBox The read checkbox object
+ * @param writeBox The read checkbox object (this)
+ * @param deleteBox The read checkbox object
+ */
+function eqHandleDeleteBox( readBox, writeBox, deleteBox )
+{
+ if( deleteBox.checked )
+ {
+ if( !writeBox.checked )
+ writeBox.click();
+ }
+}
+
+/**
+ * Determine if any of the checkbox within the given fieldSetId are checked
+ *
+ * @param fieldSetId The id attribute of the field set
+ * @param inputId The name of the checkboxes that are to be inspected
+ * @return True if there are unchecked boxes
+ * False if all boxes are checked
+ */
+function anyFieldsChecked( fieldSetId, inputId )
+{
+ var allInputs = $$( 'fieldSet#' + fieldSetId + " input" );
+ for( i = 0; i < allInputs.length; i++ )
+ {
+ if( allInputs[ i ].name.match( inputId ) )
+ {
+ if( allInputs[ i ].checked )
+ return true;
+ }
+ }
+ return false;
+}
+
+/**
+ * Determine if all of the checkbox within the given fieldSetId are checked
+ *
+ * @param fieldSetId The id attribute of the field set
+ * @param inputId The name of the checkboxes that are to be inspected
+ * @return boolean True if there all boxes are checked
+
+ */
+function allFieldsChecked( fieldSetId, inputId )
+{
+ var allInputs = $$( 'fieldSet#' + fieldSetId + " input" );
+ for( j = 0; j < allInputs.length; j++ )
+ {
+ if( allInputs[ j ].name.match( inputId ) )
+ {
+ if( !allInputs[ j ].checked )
+ return false;
+ }
+ }
+ return true;
+}
+
+/**
+ * Set all the checkboxes for a given fieldSetId to to given value
+ *
+ * @param value The value to set the boxes to
+ * @param fieldSetId The id attribute of the field set
+ * @param inputId The name of the checkboxes that need to be enabled.
+ */
+function setFieldChecks( value, fieldSetId, inputId )
+{
+ var allInputs = $$( 'fieldSet#' + fieldSetId + " input" );
+ for( x = 0; x < allInputs.length; x++ )
+ {
+ if( allInputs[ x ].name.match( inputId ) )
+ {
+ if( allInputs[ x ].checked != value )
+ allInputs[ x ].click();
+ }
+ }
+}
+
+/**
+ * Allow a "master" checkbox to turn on a number of others.
+ */
+function eqEnableMultiple( masterCheck, identityString )
+{
+ // var allInputs=$$( 'fieldSet#' + identityString + ' input');
+ var allInputs=$$( 'input' );
+ for(y = 0; y < allInputs.length; y++)
+ {
+ var inputNameAttr = allInputs[ y ].attributes.getNamedItem( "name" ).nodeValue;
+ if( inputNameAttr.match( identityString ) )
+ {
+ if( allInputs[ y ].checked != masterCheck.checked ){
+ allInputs[ y ].click();
+ }
+ }
+ }
+}
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/t5equanda.js
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/t5equanda.js 2009-04-27 16:20:41 UTC (rev 1103)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/t5equanda.js 2009-05-20 08:59:10 UTC (rev 1104)
@@ -977,4 +977,4 @@
resize( object );
}
} );
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-27 16:20:51
|
Revision: 1103
http://equanda.svn.sourceforge.net/equanda/?rev=1103&view=rev
Author: triathlon98
Date: 2009-04-27 16:20:41 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
EQ-345 fix equandaRefresh rights
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2009-04-27 16:18:58 UTC (rev 1102)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2009-04-27 16:20:41 UTC (rev 1103)
@@ -515,7 +515,7 @@
/*
* Return a refreshed proxy if it has changed.
*/
- @RolesAllowed({ "LocalUser" ,"LocalAdmin" })
+ #tableSecurityRole( $table )
public ${package}.client.${table.Name} equandaRefresh( Uoid uoid, long version ) throws EquandaException {
if ( uoid == null ) return null;
${table.Name}EJBLocal obj = EquandaGlobal.get${table.Name}Local();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-27 16:19:11
|
Revision: 1102
http://equanda.svn.sourceforge.net/equanda/?rev=1102&view=rev
Author: triathlon98
Date: 2009-04-27 16:18:58 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
EQ-345 fix rights
Modified Paths:
--------------
branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
Modified: branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2009-04-26 18:38:43 UTC (rev 1101)
+++ branches/EQ-130/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2009-04-27 16:18:58 UTC (rev 1102)
@@ -420,7 +420,7 @@
/*
* Return a refreshed proxy if it has changed.
*/
- @RolesAllowed({ "LocalUser" ,"LocalAdmin" })
+ #tableSecurityRole( $table )
public ${package}.client.${table.Name} equandaRefresh( Uoid id, long version ) throws EquandaException {
if ( id == null ) return null;
DM${table.Name} entity = HR${table.Name}.selectId( entityManager, id );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-26 18:38:53
|
Revision: 1101
http://equanda.svn.sourceforge.net/equanda/?rev=1101&view=rev
Author: triathlon98
Date: 2009-04-26 18:38:43 +0000 (Sun, 26 Apr 2009)
Log Message:
-----------
improve archetype docs
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/site/wiki/gettingstarted.wiki
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/site/wiki/gettingstarted.wiki
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/site/wiki/gettingstarted.wiki 2009-04-24 15:20:44 UTC (rev 1100)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/site/wiki/gettingstarted.wiki 2009-04-26 18:38:43 UTC (rev 1101)
@@ -16,7 +16,7 @@
- You should create an empty database file. There are many ways to do this, one is using the firebird isql tool. (When on linux, assure the "firebird" user has read/write rights on the directory where the database will be stored). Change the database location according to your wishes.
{code}
isql -u myusername -p mypassword
-CREATE DATABASE "/home/joachim/data/${artifactId}.fdb" DEFAULT CHARACTER SET UTF8;
+CREATE DATABASE "/home/joachim/data/${artifactId}.fdb" PAGE_SIZE 8192 DEFAULT CHARACTER SET UTF8;
{code}
- Adjust you maven settings file to specify the database location. This is the file .m2/settings.xml under your home directory.
{code}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-24 15:20:50
|
Revision: 1100
http://equanda.svn.sourceforge.net/equanda/?rev=1100&view=rev
Author: triathlon98
Date: 2009-04-24 15:20:44 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
Improve site
Modified Paths:
--------------
trunk/equanda-tapestry5/src/site/site.xml
Removed Paths:
-------------
trunk/equanda-tapestry5/src/site/wiki/breadcrumbs.wiki
Modified: trunk/equanda-tapestry5/src/site/site.xml
===================================================================
--- trunk/equanda-tapestry5/src/site/site.xml 2009-04-22 16:35:25 UTC (rev 1099)
+++ trunk/equanda-tapestry5/src/site/site.xml 2009-04-24 15:20:44 UTC (rev 1100)
@@ -12,6 +12,7 @@
<item name="Accordion" href="accordion.html"/>
<item name="FormActionLink" href="formactionlink.html"/>
<item name="FormSupport" href="formsupport.html"/>
+ <item name="FormTraversal" href="formtraversal.html"/>
<item name="JSPagedLoop" href="jspagedloop.html"/>
<item name="Tabs / MemTabs" href="tabs.html"/>
<item name="TextAreaAutoExpander" href="textareaautoexpander.html"/>
@@ -20,6 +21,9 @@
<item name="Truncate" href="truncate.html"/>
<item name="ValidationTrackerDelegate" href="validationtrackerdelegate.html"/>
</item>
+ <item name="Binding" collapse="false">
+ <item name="Manifest" href="manifest.html"/>
+ </item>
</menu>
</body>
Deleted: trunk/equanda-tapestry5/src/site/wiki/breadcrumbs.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/breadcrumbs.wiki 2009-04-22 16:35:25 UTC (rev 1099)
+++ trunk/equanda-tapestry5/src/site/wiki/breadcrumbs.wiki 2009-04-24 15:20:44 UTC (rev 1100)
@@ -1,49 +0,0 @@
-h1. Breadcrumbs
-
-The breadcrumbs components displays a list of links that have been visited as the user navigates through the tapestry pages. The user can select a previously visited crumb which will take them back to that page without losing any of their session information. When moving to a crumb, this will also reset the breadcrumbs to the state at the time the page was visited.
-
-{code}
- <t:type="equanda/Breadcrumb" t:id="breadcrumb"/>
-{code}
-
-As the user navigates through the pages, the page they are coming from is appended to the end of the breadcrumbs (done by the application code). The breadcrumb name appended is the page title.
-Certain links should clear the breadcrumbs component when clicked. A variant of the pagelink component which has this behaviour should be provided.
-
-*Session retrieval*
-As the list of breadcrumbs grows, it should be possible to select any of the crumbs. When this happens, the current breadcrumb list should be shortened to indicate that the current page is the last crumb in the list. Also, the current state of this page (and the entire web session) should be as it was when the user left it.
-
-To support the latter, a conversation ID must be added as a query on the URL. E.g
-{code}
-http://localhost:8080/eportfolio-dp/assertionedit/srX8M5rTTo1RRn?cid=00112233445566
-{code}
-This will be a 14-digit code (UOID can be used). When a new page is selected, the existing session is serialized (using JBoss serialization library) and added to the EquandaNavigation table. This session can then be retrieved once the CID is known.
-
-h2. Implementation
-
-h3. BreadCrumbs Component
-
-A new BreadCrumbs component will be created. This will store the state in a ASO (application state object).
-This ASO should provide at least the following methods :
-- clear
-- add page : add using a link (with correct handling of the conversation), title and context. The context is used to determine whether the most recent page from the breadcrumb should be replaced or not. This is for example useful when switching between different selector pages for a table.
-
-h3. Conversation filter
-
-The conversation filter serves two purposes.
-- assure the session state is restored when clinking a link in the breadcrumbs.
-- allow multi-tabbed use inside the application (and hopefully also correct back button handling).
-
-The principle is simple, the session state is stored in the EquandaNavigation table (see org.equanda.infrastructure.infrastructure.xml, currently commented).
-When a page is visited, if the conversion id is retrieved, the session state is restored based on the conversation id to assure correct session state.
-
-This should be implementable using a request filter.
-
-When a page request comes in, the conversation id is retrieved. This is done first by looking at the url, and if that fails the "Referer" header is examined to see if that contains a conversaton id.
-If a conversation id was found, the session state is replaced by the stored stated from the conversation.
-The conversation is then investigate to see if it was marked as "starting". In that case a new EquandaNavigation object is created, the session state copied into it and the "starting" state set. A http redirect is then returned with the requesting url with the id of the new navigation object as new location (302 status with "Location" header).
-
-On the outbound path of the page request, the session state should be stored in a new EquandaNavigation object (serialized using JBoss serialization) and the "starting" flag is cleared.
-
-For requests which are not page requests, an attempt should be made to figure out the conversation state from the request and referer url. If a conversation id is found, then the session should be replaced based on that.
-
-It will need to be verified that ajax requests will be fully functional when two conversations are ongoing in different tabs in the browser.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-22 16:35:29
|
Revision: 1099
http://equanda.svn.sourceforge.net/equanda/?rev=1099&view=rev
Author: triathlon98
Date: 2009-04-22 16:35:25 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
fix comment
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/webapp/css/style.css
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/webapp/css/style.css
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/webapp/css/style.css 2009-04-22 16:10:02 UTC (rev 1098)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/webapp/css/style.css 2009-04-22 16:35:25 UTC (rev 1099)
@@ -200,7 +200,7 @@
font-size: 13px;
}
-// fix for "fixed" positioning in IE 6+
+/* fix for "fixed" positioning in IE 6+ */
@media screen
{
* html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-22 16:10:05
|
Revision: 1098
http://equanda.svn.sourceforge.net/equanda/?rev=1098&view=rev
Author: triathlon98
Date: 2009-04-22 16:10:02 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
fix some groupIds
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-04-22 12:13:59 UTC (rev 1097)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-04-22 16:10:02 UTC (rev 1098)
@@ -177,13 +177,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>freemarker</groupId>
+ <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.9</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
<scope>provided</scope>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-22 12:15:32
|
Revision: 1097
http://equanda.svn.sourceforge.net/equanda/?rev=1097&view=rev
Author: triathlon98
Date: 2009-04-22 12:13:59 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
fix title parameter
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml 2009-04-22 12:13:31 UTC (rev 1096)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml 2009-04-22 12:13:59 UTC (rev 1097)
@@ -1,5 +1,5 @@
<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:parameter name="title"${artifactId} application</t:parameter>
+ <t:parameter name="title">${artifactId} application</t:parameter>
<t:parameter name="context">
<span id="context">context info</span>
</t:parameter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-22 12:15:07
|
Revision: 1096
http://equanda.svn.sourceforge.net/equanda/?rev=1096&view=rev
Author: triathlon98
Date: 2009-04-22 12:13:31 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
fix title parameter
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml 2009-04-22 11:22:04 UTC (rev 1095)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/pages/Start.tml 2009-04-22 12:13:31 UTC (rev 1096)
@@ -1,8 +1,5 @@
<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:parameter name="title">
- <meta http-equiv="Content-Language" content="en" />
- <title>${artifactId} application</title>
- </t:parameter>
+ <t:parameter name="title"${artifactId} application</t:parameter>
<t:parameter name="context">
<span id="context">context info</span>
</t:parameter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-22 11:22:27
|
Revision: 1095
http://equanda.svn.sourceforge.net/equanda/?rev=1095&view=rev
Author: triathlon98
Date: 2009-04-22 11:22:04 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
EQ-343 use @Property and reduce code
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/EditLayout.java
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/SelectLayout.java
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/EditLayout.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/EditLayout.java 2009-04-22 10:35:50 UTC (rev 1094)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/EditLayout.java 2009-04-22 11:22:04 UTC (rev 1095)
@@ -5,6 +5,7 @@
package ${srcPackage};
import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.Block;
/**
@@ -15,80 +16,26 @@
public class EditLayout
{
@Parameter
+ @Property
private Block title;
@Parameter
+ @Property
private Block context;
@Parameter
+ @Property
private Block buttons;
@Parameter
+ @Property
private Block reverseLinks;
@Parameter
+ @Property
private Block actions;
@Parameter
+ @Property
private Block help;
-
- public Block getTitle()
- {
- return title;
- }
-
- public void setTitle( Block title )
- {
- this.title = title;
- }
-
- public Block getContext()
- {
- return context;
- }
-
- public void setContext( Block context )
- {
- this.context = context;
- }
-
- public Block getButtons()
- {
- return buttons;
- }
-
- public void setButtons( Block buttons )
- {
- this.buttons = buttons;
- }
-
- public Block getReverseLinks()
- {
- return reverseLinks;
- }
-
- public void setReverseLinks( Block reverseLinks )
- {
- this.reverseLinks = reverseLinks;
- }
-
- public Block getActions()
- {
- return actions;
- }
-
- public void setActions( Block actions )
- {
- this.actions = actions;
- }
-
- public Block getHelp()
- {
- return help;
- }
-
- public void setHelp( Block help )
- {
- this.help = help;
- }
}
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java 2009-04-22 10:35:50 UTC (rev 1094)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java 2009-04-22 11:22:04 UTC (rev 1095)
@@ -9,7 +9,6 @@
import org.apache.tapestry5.Asset;
import org.apache.tapestry5.Block;
import org.apache.tapestry5.RenderSupport;
-import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
@@ -32,22 +31,28 @@
@Inject
@Path( "context:css/style.css" )
+ @Property
private Asset style;
@Inject
@Path( "context:images/logo.png" )
+ @Property
private Asset logo;
@Parameter
+ @Property
private Block sidebar;
@Parameter
+ @Property
private Block context;
@Parameter
+ @Property
private Block title;
@Parameter
+ @Property
private Block buttons;
@Component
@@ -56,66 +61,6 @@
@Inject
private LoginInfoService loginInfoService;
- public Asset getStyle()
- {
- return style;
- }
-
- public void setStyle( Asset style )
- {
- this.style = style;
- }
-
- public Asset getLogo()
- {
- return logo;
- }
-
- public void setLogo( Asset logo )
- {
- this.logo = logo;
- }
-
- public Block getSidebar()
- {
- return sidebar;
- }
-
- public void setSidebar( Block sidebar )
- {
- this.sidebar = sidebar;
- }
-
- public Block getContext()
- {
- return context;
- }
-
- public void setContext( Block context )
- {
- this.context = context;
- }
-
- public Block getTitle()
- {
- return title;
- }
-
- public void setTitle( Block title )
- {
- this.title = title;
- }
-
- public Block getButtons()
- {
- return buttons;
- }
-
- public void setButtons( Block buttons )
- {
- this.buttons = buttons;
- }
-
Object onSubmit()
{
return formSupport.getLinkTarget();
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/SelectLayout.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/SelectLayout.java 2009-04-22 10:35:50 UTC (rev 1094)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/SelectLayout.java 2009-04-22 11:22:04 UTC (rev 1095)
@@ -5,6 +5,7 @@
package ${srcPackage};
import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.Block;
/**
@@ -15,81 +16,26 @@
public class SelectLayout
{
@Parameter
+ @Property
private Block title;
@Parameter
+ @Property
private Block context;
@Parameter
+ @Property
private Block buttons;
@Parameter
+ @Property
private Block parameters;
@Parameter
+ @Property
private Block selectors;
@Parameter
+ @Property
private Block help;
-
- public Block getTitle()
- {
- return title;
- }
-
- public void setTitle( Block title )
- {
- this.title = title;
- }
-
- public Block getContext()
- {
- return context;
- }
-
- public void setContext( Block context )
- {
- this.context = context;
- }
-
- public Block getButtons()
- {
- return buttons;
- }
-
- public void setButtons( Block buttons )
- {
- this.buttons = buttons;
- }
-
- public Block getParameters()
- {
- return parameters;
- }
-
- public void setParameters( Block parameters )
- {
- this.parameters = parameters;
- }
-
- public Block getSelectors()
- {
- return selectors;
- }
-
- public void setSelectors( Block selectors )
- {
- this.selectors = selectors;
- }
-
- public Block getHelp()
- {
- return help;
- }
-
- public void setHelp( Block help )
- {
- this.help = help;
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-22 10:36:30
|
Revision: 1094
http://equanda.svn.sourceforge.net/equanda/?rev=1094&view=rev
Author: triathlon98
Date: 2009-04-22 10:35:50 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
EQ-342 fix AAC links in archetype
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/components/Layout.tml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java 2009-04-22 07:56:24 UTC (rev 1093)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java 2009-04-22 10:35:50 UTC (rev 1094)
@@ -2,23 +2,19 @@
* This file is part of ${artifactId}
*/
-package ${srcPackage};
+package $
-import ${packageName}.dm.client.EquandaUser;
-import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.annotations.Component;
-import org.apache.tapestry5.annotations.Environmental;
-import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
-import org.apache.tapestry5.annotations.Path;
-import org.apache.tapestry5.annotations.Parameter;
+import $;
+import javolution.lang.TextBuilder;
import org.apache.tapestry5.Asset;
import org.apache.tapestry5.Block;
import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
import org.equanda.t5gui.services.LoginInfoService;
import org.equanda.tapestry5.components.FormSupport;
-import javolution.lang.TextBuilder;
/**
* General layout
@@ -144,6 +140,12 @@
return tb.toString();
}
+ public boolean isGuiAdministrator()
+ {
+ LoginInfo li = loginInfoService.getLoginInfo();
+ return li != null && li.isGuiAdministrator();
+ }
+
void beginRender()
{
renderSupport.addScript( "setCssSizes();" );
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/components/Layout.tml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/components/Layout.tml 2009-04-22 07:56:24 UTC (rev 1093)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/resources/components/Layout.tml 2009-04-22 10:35:50 UTC (rev 1094)
@@ -26,8 +26,11 @@
This part is not yet functional<br/>
Logged in user : <a href="#nowhere">${UserName}</a><br/>
<br/><a href="#nowhere">log out</a><br/>
- <a href="#nowhere">change preferences</a><br/>
- <a href="#nowhere">set as start page</a><br/>
+ <t:t5nav.pagelink t:page="AuthAndConfigTables">${equanda-message:layout.UserPreferences}</t:t5nav.pagelink><br/>
+ <t:if test="isGuiAdministrator()">
+ <t:t5nav.pagelink t:page="AuthAndConfigRoles">${equanda-message:layout.RoleConfigurations}</t:t5nav.pagelink><br/>
+ </t:if>
+
</p></div>
</t:parameter>
<t:parameter name="title3">Help</t:parameter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-22 07:56:26
|
Revision: 1093
http://equanda.svn.sourceforge.net/equanda/?rev=1093&view=rev
Author: triathlon98
Date: 2009-04-22 07:56:24 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
EQ-341 archetype ear should have proper name
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/ear/pom.xml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/ear/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/ear/pom.xml 2009-04-21 21:12:50 UTC (rev 1092)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/ear/pom.xml 2009-04-22 07:56:24 UTC (rev 1093)
@@ -14,6 +14,7 @@
<name>ear</name>
<build>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-21 21:13:10
|
Revision: 1092
http://equanda.svn.sourceforge.net/equanda/?rev=1092&view=rev
Author: triathlon98
Date: 2009-04-21 21:12:50 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
better dependencies list
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-04-21 09:32:57 UTC (rev 1091)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/pom.xml 2009-04-21 21:12:50 UTC (rev 1092)
@@ -150,16 +150,30 @@
<version>3.7.10</version>
<scope>provided</scope>
</dependency>
+ <!-- exclude libraries pulled in by tapestry -->
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.9.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- exclude some libraries pulled in by chenillekit -->
+ <dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-hibernate</artifactId>
- <version>#literal()${tapestry-version}#end</version>
+ <version>${tapestry-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
- <version>3.0.1</version>
+ <version>2.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -169,7 +183,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
+ <groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
<scope>provided</scope>
@@ -179,6 +193,12 @@
<artifactId>groovy-all</artifactId>
<version>1.5.4</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-21 09:33:43
|
Revision: 1091
http://equanda.svn.sourceforge.net/equanda/?rev=1091&view=rev
Author: triathlon98
Date: 2009-04-21 09:32:57 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
EQ-340 archetype provide sensible email/url types
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/main/dm/dm.xml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/main/dm/dm.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/main/dm/dm.xml 2009-04-21 09:23:20 UTC (rev 1090)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/src/main/dm/dm.xml 2009-04-21 09:32:57 UTC (rev 1091)
@@ -6,7 +6,8 @@
<type name="externalReferenceString" length="30"/>
<type name="titleString" length="100"/>
<type name="descriptionClob" type="clob" renderer="wiki,lines=10,cols=50"/>
- <type name="uri" length="250"/>
+ <type name="uri" length="250" renderer="url"/>
+ <type name="email" length="150" renderer="email"/>
<table dir="."/>
</equanda>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-21 09:23:31
|
Revision: 1090
http://equanda.svn.sourceforge.net/equanda/?rev=1090&view=rev
Author: triathlon98
Date: 2009-04-21 09:23:20 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
EQ-339 test fixes
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/test/pom.xml
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/test/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/test/pom.xml 2009-04-21 08:40:07 UTC (rev 1089)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/test/pom.xml 2009-04-21 09:23:20 UTC (rev 1090)
@@ -55,6 +55,11 @@
<artifactId>ear</artifactId>
<type>ear</type>
</dependency>
+
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>ddltool</artifactId>
+ </dependency>
</dependencies>
<profiles>
@@ -93,7 +98,7 @@
<database>${${artifactId}.db.url}</database>
<dblogin>${${artifactId}.db.login}</dblogin>
<dbpassword>${${artifactId}.db.password}</dbpassword>
- <dbmap>${${artifactId}}.ddltool.EquandaMap</dbmap>
+ <dbmap>${basePackage}.ddltool.EquandaMap</dbmap>
<ddltargets>update defaults</ddltargets>
</configuration>
<executions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-21 08:40:25
|
Revision: 1089
http://equanda.svn.sourceforge.net/equanda/?rev=1089&view=rev
Author: triathlon98
Date: 2009-04-21 08:40:07 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
add link
Modified Paths:
--------------
trunk/equanda-tapestry5/src/site/wiki/index.wiki
Modified: trunk/equanda-tapestry5/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-04-17 14:35:00 UTC (rev 1088)
+++ trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-04-21 08:40:07 UTC (rev 1089)
@@ -13,6 +13,7 @@
- [Truncate|truncate.html]
- [FormActionLink|formactionlink.html]
- [JSPagedLoop|jspagedloop.html]
+- [TextAreaAutoExpander|textareaautoexpander.html]
- [TextField|textfield.html]
- [TreeTable|treetable.html]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-17 14:35:21
|
Revision: 1088
http://equanda.svn.sourceforge.net/equanda/?rev=1088&view=rev
Author: triathlon98
Date: 2009-04-17 14:35:00 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
move on to 0.9.5-SNAPSHOT
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-dm/pom.xml
trunk/equanda-generate/pom.xml
trunk/equanda-maven-plugin/pom.xml
trunk/equanda-server/pom.xml
trunk/equanda-t5gui/pom.xml
trunk/equanda-t5navigation/pom.xml
trunk/equanda-tapestry5/pom.xml
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-gui-t5-test/pom.xml
trunk/equanda-test/test-t5-ear/pom.xml
trunk/equanda-test/test-t5-gui/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/pom.xml
trunk/equanda-util/pom.xml
trunk/pom.xml
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-client/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-client</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-client</name>
<dependencies>
<dependency>
Modified: trunk/equanda-dm/pom.xml
===================================================================
--- trunk/equanda-dm/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-dm/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-dm</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-dm</name>
<dependencies>
<dependency>
Modified: trunk/equanda-generate/pom.xml
===================================================================
--- trunk/equanda-generate/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-generate/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-generate</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-generate</name>
<build>
<resources>
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-maven-plugin/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<artifactId>equanda</artifactId>
<groupId>org.equanda</groupId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-maven-plugin</name>
<description>
Provide the maven plugins for equanda users.
Modified: trunk/equanda-server/pom.xml
===================================================================
--- trunk/equanda-server/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-server/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-server</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-server</name>
<dependencies>
<dependency>
Modified: trunk/equanda-t5gui/pom.xml
===================================================================
--- trunk/equanda-t5gui/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-t5gui/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-t5gui</name>
<build>
Modified: trunk/equanda-t5navigation/pom.xml
===================================================================
--- trunk/equanda-t5navigation/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-t5navigation/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5navigation</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-t5navigation</name>
<build>
Modified: trunk/equanda-tapestry5/pom.xml
===================================================================
--- trunk/equanda-tapestry5/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-tapestry5/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-tapestry5</name>
<build>
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-test/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,14 +2,14 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<packaging>pom</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-test</name>
<description>tests for equanda</description>
Modified: trunk/equanda-test/test-core/pom.xml
===================================================================
--- trunk/equanda-test/test-core/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-test/test-core/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-core</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>test-core</name>
<description>test core</description>
<build>
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-test/test-ddltool/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-ddltool</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>test-ddltool</name>
<description>test ddltool</description>
Modified: trunk/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t5-test/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-test/test-gui-t5-test/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-gui-t5-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>test-gui-t5-test</name>
<description>test test</description>
Modified: trunk/equanda-test/test-t5-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-ear/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-test/test-t5-ear/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-ear</artifactId>
<packaging>ear</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>test-t5-ear</name>
<description>test ear</description>
<build>
Modified: trunk/equanda-test/test-t5-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-gui/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-test/test-t5-gui/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-gui</artifactId>
<packaging>war</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>test-t5-gui</name>
<description>test gui</description>
<build>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-test/test-test/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>test-test</name>
<description>test test</description>
Modified: trunk/equanda-tool/pom.xml
===================================================================
--- trunk/equanda-tool/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-tool/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-tool</name>
<dependencies>
<dependency>
Modified: trunk/equanda-util/pom.xml
===================================================================
--- trunk/equanda-util/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/equanda-util/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
<packaging>jar</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda-util</name>
<dependencies>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-17 14:30:41 UTC (rev 1087)
+++ trunk/pom.xml 2009-04-17 14:35:00 UTC (rev 1088)
@@ -4,7 +4,7 @@
<artifactId>equanda</artifactId>
<packaging>pom</packaging>
- <version>0.9.4</version>
+ <version>0.9.5-SNAPSHOT</version>
<name>equanda</name>
<description>
@@ -41,9 +41,9 @@
<url>http://jira.equanda.org/</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/branches/0.9.4</connection>
- <developerConnection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/branches/0.9.4</developerConnection>
- <url>http://equanda.svn.sourceforge.net/viewvc/equanda/branches/0.9.4</url>
+ <connection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/trunk</connection>
+ <developerConnection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/trunk</developerConnection>
+ <url>http://equanda.svn.sourceforge.net/viewvc/equanda/trunk</url>
</scm>
<ciManagement>
<system>hudson</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-17 14:31:00
|
Revision: 1087
http://equanda.svn.sourceforge.net/equanda/?rev=1087&view=rev
Author: triathlon98
Date: 2009-04-17 14:30:41 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
release 0.9.4
Added Paths:
-----------
tags/equanda-0.9.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-17 14:02:40
|
Revision: 1086
http://equanda.svn.sourceforge.net/equanda/?rev=1086&view=rev
Author: triathlon98
Date: 2009-04-17 14:02:33 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare branch 0.9.4
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-dm/pom.xml
trunk/equanda-generate/pom.xml
trunk/equanda-maven-plugin/pom.xml
trunk/equanda-server/pom.xml
trunk/equanda-t5gui/pom.xml
trunk/equanda-t5navigation/pom.xml
trunk/equanda-tapestry5/pom.xml
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-gui-t5-test/pom.xml
trunk/equanda-test/test-t5-ear/pom.xml
trunk/equanda-test/test-t5-gui/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/pom.xml
trunk/equanda-util/pom.xml
trunk/pom.xml
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-client/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-client</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-client</name>
<dependencies>
<dependency>
Modified: trunk/equanda-dm/pom.xml
===================================================================
--- trunk/equanda-dm/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-dm/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-dm</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-dm</name>
<dependencies>
<dependency>
Modified: trunk/equanda-generate/pom.xml
===================================================================
--- trunk/equanda-generate/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-generate/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-generate</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-generate</name>
<build>
<resources>
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-maven-plugin/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<artifactId>equanda</artifactId>
<groupId>org.equanda</groupId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-maven-plugin</name>
<description>
Provide the maven plugins for equanda users.
Modified: trunk/equanda-server/pom.xml
===================================================================
--- trunk/equanda-server/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-server/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-server</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-server</name>
<dependencies>
<dependency>
Modified: trunk/equanda-t5gui/pom.xml
===================================================================
--- trunk/equanda-t5gui/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-t5gui/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-t5gui</name>
<build>
Modified: trunk/equanda-t5navigation/pom.xml
===================================================================
--- trunk/equanda-t5navigation/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-t5navigation/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -1,45 +1,45 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.equanda</groupId>
- <artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.equanda</groupId>
- <artifactId>equanda-t5navigation</artifactId>
- <packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
- <name>equanda-t5navigation</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Tapestry-Module-Classes>org.equanda.t5nav.services.NavigationModule</Tapestry-Module-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-core</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda</artifactId>
+ <version>0.9.4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-t5navigation</artifactId>
+ <packaging>jar</packaging>
+ <version>0.9.4</version>
+ <name>equanda-t5navigation</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Tapestry-Module-Classes>org.equanda.t5nav.services.NavigationModule</Tapestry-Module-Classes>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: trunk/equanda-tapestry5/pom.xml
===================================================================
--- trunk/equanda-tapestry5/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-tapestry5/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-tapestry5</name>
<build>
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-test/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,14 +2,14 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<packaging>pom</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-test</name>
<description>tests for equanda</description>
Modified: trunk/equanda-test/test-core/pom.xml
===================================================================
--- trunk/equanda-test/test-core/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-test/test-core/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-core</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>test-core</name>
<description>test core</description>
<build>
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-test/test-ddltool/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-ddltool</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>test-ddltool</name>
<description>test ddltool</description>
Modified: trunk/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t5-test/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-test/test-gui-t5-test/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-gui-t5-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>test-gui-t5-test</name>
<description>test test</description>
Modified: trunk/equanda-test/test-t5-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-ear/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-test/test-t5-ear/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-ear</artifactId>
<packaging>ear</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>test-t5-ear</name>
<description>test ear</description>
<build>
Modified: trunk/equanda-test/test-t5-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-gui/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-test/test-t5-gui/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-gui</artifactId>
<packaging>war</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>test-t5-gui</name>
<description>test gui</description>
<build>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-test/test-test/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>test-test</name>
<description>test test</description>
Modified: trunk/equanda-tool/pom.xml
===================================================================
--- trunk/equanda-tool/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-tool/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-tool</name>
<dependencies>
<dependency>
Modified: trunk/equanda-util/pom.xml
===================================================================
--- trunk/equanda-util/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/equanda-util/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
<packaging>jar</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda-util</name>
<dependencies>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
+++ trunk/pom.xml 2009-04-17 14:02:33 UTC (rev 1086)
@@ -4,7 +4,7 @@
<artifactId>equanda</artifactId>
<packaging>pom</packaging>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.4</version>
<name>equanda</name>
<description>
@@ -41,9 +41,9 @@
<url>http://jira.equanda.org/</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/trunk</connection>
- <developerConnection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/trunk</developerConnection>
- <url>http://equanda.svn.sourceforge.net/viewvc/equanda/</url>
+ <connection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/branches/0.9.4</connection>
+ <developerConnection>scm:svn:https://equanda.svn.sourceforge.net/svnroot/equanda/branches/0.9.4</developerConnection>
+ <url>http://equanda.svn.sourceforge.net/viewvc/equanda/branches/0.9.4</url>
</scm>
<ciManagement>
<system>hudson</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-04-17 13:54:56
|
Revision: 1085
http://equanda.svn.sourceforge.net/equanda/?rev=1085&view=rev
Author: triathlon98
Date: 2009-04-17 13:54:52 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
prepare for release of 0.9.4
Modified Paths:
--------------
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-t5navigation/src/site/wiki/index.wiki
trunk/equanda-tapestry5/src/site/wiki/index.wiki
trunk/src/site/wiki/gettingstarted.wiki
trunk/src/site/wiki/plugin/archetype.wiki
trunk/src/site/wiki/roadmap.wiki
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-04-17 13:27:54 UTC (rev 1084)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-04-17 13:54:52 UTC (rev 1085)
@@ -477,7 +477,7 @@
</profiles>
<properties>
- <equanda-version>0.9.3</equanda-version>
+ <equanda-version>0.9.4</equanda-version>
<staticwiki-version>0.9</staticwiki-version>
<tapestry-version>5.1.0.3</tapestry-version>
<chenillekit-version>1.0.0</chenillekit-version>
Modified: trunk/equanda-t5navigation/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-04-17 13:27:54 UTC (rev 1084)
+++ trunk/equanda-t5navigation/src/site/wiki/index.wiki 2009-04-17 13:54:52 UTC (rev 1085)
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5navigation</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4</version>
</dependency>
{code}
For this to work, you need to also include the [PROGS|http://www.progs.be/] maven repository.
Modified: trunk/equanda-tapestry5/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-04-17 13:27:54 UTC (rev 1084)
+++ trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-04-17 13:54:52 UTC (rev 1085)
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
- <version>0.9.3</version>
+ <version>0.9.4</version>
</dependency>
{code}
For this to work, you need to also include the [PROGS|http://www.progs.be/] maven repository.
Modified: trunk/src/site/wiki/gettingstarted.wiki
===================================================================
--- trunk/src/site/wiki/gettingstarted.wiki 2009-04-17 13:27:54 UTC (rev 1084)
+++ trunk/src/site/wiki/gettingstarted.wiki 2009-04-17 13:54:52 UTC (rev 1085)
@@ -5,7 +5,7 @@
{code}
mvn equanda:archetype
-DgroupId=org.equanda.example -DartifactId=example
- -DarchetypeVersion=0.9.3 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin -DremoteRepositories=http://maven.progs.be/m2repo
+ -DarchetypeVersion=0.9.4 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin -DremoteRepositories=http://maven.progs.be/m2repo
{code}
This will create a mostly empty example project in the "example" subdirectory. The base package for the classes is "org.equanda.example".
Modified: trunk/src/site/wiki/plugin/archetype.wiki
===================================================================
--- trunk/src/site/wiki/plugin/archetype.wiki 2009-04-17 13:27:54 UTC (rev 1084)
+++ trunk/src/site/wiki/plugin/archetype.wiki 2009-04-17 13:54:52 UTC (rev 1085)
@@ -9,7 +9,7 @@
{code}
mvn equanda:archetype
-DgroupId=com.mycompany -DartifactId=example
- -DarchetypeVersion=0.9.3 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin
+ -DarchetypeVersion=0.9.4 -DarchetypeGroupId=org.equanda -DarchetypeArtifactId=equanda-maven-plugin
{code}
All the parameters on the last line are used internally by maven.
Modified: trunk/src/site/wiki/roadmap.wiki
===================================================================
--- trunk/src/site/wiki/roadmap.wiki 2009-04-17 13:27:54 UTC (rev 1084)
+++ trunk/src/site/wiki/roadmap.wiki 2009-04-17 13:54:52 UTC (rev 1085)
@@ -5,12 +5,14 @@
With 0.9.1 a lot of improvements were made to make it more feature complete and more reliable.
Version 0.9.2 included fine grained access control configurations, a lot of user interface improvements, new unique-for constraint, new TreeTable component, ajax enabled textfield component.
For 0.9.3 the major change is the introduction of the t5navigation module.
+Version 0.9.4 is mostly a bugfix and minor improvements release.
For changes see the release notes
- changes in [0.9|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10001&styleName=Html&projectId=10000&Create=Create]
- changes in [0.9.1|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10020&styleName=Html&projectId=10000&Create=Create]
- changes in [0.9.2|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10024&styleName=Html&projectId=10000&Create=Create]
- changes in [0.9.3|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10030&styleName=Html&projectId=10000&Create=Create]
+- changes in [0.9.4|http://jira.equanda.org/secure/ReleaseNote.jspa?version=10031&styleName=Html&projectId=10000&Create=Create]
This version is very useable and reliable, however we still have a lot of stuff we want to implement before we can call it version 1.0.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
