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...> - 2008-01-06 21:17:50
|
Revision: 236
http://equanda.svn.sourceforge.net/equanda/?rev=236&view=rev
Author: triathlon98
Date: 2008-01-06 13:17:45 -0800 (Sun, 06 Jan 2008)
Log Message:
-----------
fix cargo configuration
Modified Paths:
--------------
equanda-example/example-test/pom.xml
Modified: equanda-example/example-test/pom.xml
===================================================================
--- equanda-example/example-test/pom.xml 2008-01-05 01:24:41 UTC (rev 235)
+++ equanda-example/example-test/pom.xml 2008-01-06 21:17:45 UTC (rev 236)
@@ -33,17 +33,17 @@
<wait>${cargo.wait}</wait>
<container>
<containerId>jboss4x</containerId>
- <home>${jboss.appserver.home}</home>
+ <home>${example.jboss.appserver}</home>
</container>
<configuration>
<type>existing</type>
<home>${example.jboss.home}\server\${example.jboss.config}\</home>
<properties>
- <cargo.hostname>${jboss.host}</cargo.hostname>
- <cargo.servlet.port>${jboss.port}</cargo.servlet.port>
- <cargo.jboss.configuration>${jboss.configuration}</cargo.jboss.configuration>
- <cargo.jvmargs>${jboss.jvmargs}</cargo.jvmargs>
- <cargo.logging>${jboss.logging}</cargo.logging>
+ <cargo.hostname>${example.jboss.host}</cargo.hostname>
+ <cargo.servlet.port>${example.jboss.port}</cargo.servlet.port>
+ <cargo.jboss.configuration>${example.jboss.configuration}</cargo.jboss.configuration>
+ <cargo.jvmargs>${example.jboss.jvmargs}</cargo.jvmargs>
+ <cargo.logging>${example.jboss.logging}</cargo.logging>
</properties>
</configuration>
</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@pr...> - 2008-01-05 01:42:52
|
See http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/132/changes |
|
From: <tri...@us...> - 2008-01-05 01:24:43
|
Revision: 235
http://equanda.svn.sourceforge.net/equanda/?rev=235&view=rev
Author: triathlon98
Date: 2008-01-04 17:24:41 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
EQ-53 partial code to improve xml parsing of domain model
Modified Paths:
--------------
trunk/equanda-generate/src/main/resources/equanda.dtd
Added Paths:
-----------
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Build.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Choice.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DomainModel.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Field.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Group.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Hide.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/ImmutableIf.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Include.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/MutableEvenIf.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/OverwriteDefault.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Page.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Parameter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Select.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Selection.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Set.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/SubSelect.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Suggest.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Table.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Template.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Type.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/CaseConversionValue.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/CaseConversionValueConverter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultType.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DefaultTypeConverter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/ExpectedAmount.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/ExpectedAmountConverter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/ImplicitBooleanConverter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SelectOperator.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SelectOperatorConverter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SingleMultipleConverter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SubSelectOperator.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/SubSelectOperatorConvertor.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/YesNoConverter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/transform/
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/transform/CascadeKeep.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/transform/RootTable.java
trunk/equanda-generate/src/test/java/org/equanda/domain/
trunk/equanda-generate/src/test/java/org/equanda/domain/xml/
trunk/equanda-generate/src/test/java/org/equanda/domain/xml/ParseDocumentTest.java
trunk/equanda-generate/src/test/java/org/equanda/domain/xml/XStreamTestAdapter.java
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/AbstractSelect.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,286 @@
+/**
+ * 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.domain.xml;
+
+import java.util.List;
+
+/**
+ * Common code for Select and SubSelect (helper functions for the templates)
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public abstract class AbstractSelect
+{
+ private int numberOfParameters = -1;
+
+ public abstract List<Selection> getSelections();
+
+ public abstract boolean hasQuery();
+
+ public abstract String getQuery();
+
+ public abstract boolean hasSubSelects();
+
+ public abstract List<SubSelect> getSubSelects();
+
+ public abstract String getOperator();
+
+ public int getNumberOfParameters()
+ {
+ if ( numberOfParameters >= 0 )
+ {
+ return numberOfParameters;
+ }
+ numberOfParameters = 0;
+ for ( int i = 0; i < getSelections().size() ; i++ )
+ {
+ if ( ( getSelections().get( i ) ).isTestComparison() )
+ {
+ numberOfParameters++;
+ }
+ }
+ return numberOfParameters;
+ }
+
+ /*
+ String getParameters( boolean includeLimit, boolean includeType, boolean checkSelectionIsParameter,
+ String prefix, String sufix )
+ {
+ TextBuilder params = TextBuilder.newInstance();
+ char sep = ' ';
+ for ( int i = 0; i < getSelections().size() ; i++ )
+ {
+ Selection selection = getSelections().get( i );
+ if ( selection.isTestComparison() )
+ {
+ if ( selection.isParameter() || !checkSelectionIsParameter )
+ {
+ params.append( sep );
+ if ( includeType )
+ {
+ if ( selection.getField().isLink() )
+ {
+ params.append( gen.getPackage() );
+ params.append( ".client." );
+ }
+ params.append( selection.getField().getJavaFieldType() );
+
+ params.append( ' ' );
+ }
+ if ( prefix == null )
+ {
+ params.append( selection.getVarName() );
+ }
+ else
+ {
+ params.append( prefix );
+ params.append( selection.getName() );
+ }
+ if ( sufix != null )
+ {
+ params.append( sufix );
+ }
+ sep = ',';
+ }
+ }
+ }
+ if ( includeLimit )
+ {
+ params.append( sep );
+ if ( includeType )
+ {
+ params.append( "int equandaLimit" );
+ }
+ else
+ {
+ params.append( "equandaLimit" );
+ }
+ }
+ return params.toString();
+ }
+ */
+
+ /**
+ * Calculates query for jboss.query
+ *
+ * @param order different order fields
+ * @param ascending indication for each order field whether it is ascending
+ * @param limit should limit be included
+ * @return jboss query
+ */
+ /*
+ String getJbossQuery( ArrayList<String> order, ArrayList<Boolean> ascending, boolean limit )
+ {
+ if ( hasQuery() ) return getQuery();
+ TextBuilder jbossQuery = TextBuilder.newInstance();
+ jbossQuery.append( getEjbQlQuery() );
+
+ if ( order != null && order.size() > 0 )
+ {
+ String sep = "";
+ jbossQuery.append( " ORDER BY " );
+ for ( int i = 0; i < order.size() ; i++ )
+ {
+ String o = order.get( i );
+ jbossQuery.append( sep );
+ jbossQuery.append( "o." );
+ jbossQuery.append( o );
+ if ( !ascending.get( i ) ) jbossQuery.append( " DESC " );
+ sep = ", ";
+ }
+ }
+
+ if ( limit )
+ {
+ //jbossQuery.append( " LIMIT :equandaLimit" );
+ //jbossQuery.append( getNumberOfParameters() + 1 );
+ }
+
+ return jbossQuery.toString();
+ }
+ */
+
+ /**
+ * Calculates signature for jboss.query and ejb.selector
+ *
+ * @param prefix prefix (PP in "selectPPName")
+ * @param limit should limit be included
+ * @return query selector signature
+ */
+ /*
+ String getSignature( String prefix, boolean limit )
+ {
+ TextBuilder signature = TextBuilder.newInstance();
+
+ signature.append( "Collection select" );
+ if ( prefix != null ) signature.append( prefix );
+ signature.append( getName() );
+ signature.append( '(' );
+
+ char sep = ' ';
+ int cnt = 1;
+ for ( int i = 0; i < getSelections().size() ; i++ )
+ {
+ Selection selection = getSelections().get( i );
+ if ( selection.isTestComparison() )
+ {
+ signature.append( sep );
+ if ( selection.getField().isLink() )
+ {
+ signature.append( gen.getPackage() );
+ signature.append( ".client." );
+ }
+ signature.append( selection.getField().getJavaFieldType() );
+ signature.append( ' ' );
+ signature.append( selection.getField().varName );
+ signature.append( cnt );
+ sep = ',';
+ cnt++;
+ }
+ }
+
+ if ( limit )
+ {
+ signature.append( sep );
+ signature.append( "int limit" );
+ signature.append( cnt );
+ }
+ signature.append( ')' );
+
+ return signature.toString();
+ }
+ */
+
+ /**
+ * Calculates query for ejb.selector
+ *
+ * @return ejbql query
+ */
+ /*
+ public String getEjbQlQuery()
+ {
+ if ( hasQuery() ) return getQuery();
+ TextBuilder ejbQlQuery = TextBuilder.newInstance();
+
+ ejbQlQuery.append( "SELECT o FROM DM" );
+ ejbQlQuery.append( getRootTable().getName() );
+ ejbQlQuery.append( "Bean" );
+ ejbQlQuery.append( " o" );
+
+ for ( Selection sel : getSelections() )
+ {
+ if ( !sel.getFrom().equals( "" ) )
+ {
+ ejbQlQuery.append( ", " );
+ ejbQlQuery.append( sel.getFrom() );
+ }
+ }
+
+ if ( !hasSubselects() )
+ {
+ String qsep = " WHERE ";
+ for ( int i = 0; i < getSelections().size() ; i++ )
+ {
+ Selection sel = getSelections().get( i );
+ String test;
+ if ( sel.isTestComparison() )
+ {
+ test = sel.convertTest( ":" + sel.getVarName() );
+ }
+ else
+ {
+ test = sel.getTest();
+ }
+
+ ejbQlQuery.append( qsep );
+
+ ejbQlQuery.append( " ( " );
+ ejbQlQuery.append( sel.getBase() );
+ if ( !sel.getBase().equals( "" ) ) ejbQlQuery.append( '.' );
+ ejbQlQuery.append( sel.getQlPath() );
+ ejbQlQuery.append( sel.getField().getVarName() );
+ ejbQlQuery.append( ' ' );
+ ejbQlQuery.append( test );
+ ejbQlQuery.append( " ) " );
+
+ qsep = getOperator();
+ }
+ }
+ else
+ {
+ String qsep = " WHERE ";
+ for ( int i = 0; i < getSubSelects().size() ; i++ )
+ {
+ ejbQlQuery.append( qsep );
+ ejbQlQuery.append( " ( " );
+ ejbQlQuery.append( ( getSubSelects().get( i ) ).getEjbQlSubQuery() );
+ ejbQlQuery.append( " ) " );
+ qsep = getOperator();
+ }
+ }
+ return ejbQlQuery.toString();
+ }
+ */
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Action.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,206 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
+import javolution.lang.TextBuilder;
+import org.equanda.util.xml.tree.XMLTreeException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * representation of <action> <p/> Contributor(s):
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "action" )
+public class Action
+{
+ @XStreamAsAttribute
+ private String name;
+ @XStreamAsAttribute
+ @XStreamAlias( "return" )
+ private String rettype = "void";
+
+ private String description = "";
+ @XStreamImplicit
+ private List<Parameter> parameters;
+ @XStreamAlias( "security-role" )
+ private String securityRole;
+ private Hide hide;
+
+ @XStreamOmitField
+ boolean partOfRoot; // prevent adding of select twice to root-table
+ @XStreamOmitField
+ private Table table; // table with current action
+ @XStreamOmitField
+ private String tableName; // tableName for current action
+ @XStreamOmitField
+ private String parametersList;
+ @XStreamOmitField
+ private String parametersListWithTypes;
+
+ public void setAttribute( CharSequence name, CharSequence value )
+ throws XMLTreeException
+ {
+ if ( name.equals( "name" ) )
+ {
+ this.name = value.toString();
+ }
+ else if ( name.equals( "return" ) )
+ {
+ this.rettype = value.toString();
+ }
+ else
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "attribute " + name + " value " + value + " not allowed" );
+ }
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getReturn()
+ {
+ return rettype;
+ }
+
+ public List<Parameter> getParameters()
+ {
+ return parameters;
+ }
+
+ public String toString()
+ {
+ return "<action name=\"" + getName() + "\" ... />\n";
+ }
+
+ /*
+ public void transform()
+ {
+ // Here we do some major preprocessing by building root-tables
+ // root-tables are basicly tables which include the fields and selectors for all the child tables
+
+ if ( !partOfRoot )
+ {
+ // get the table definition
+ Node parent = this;
+ while ( !( parent instanceof Table ) ) parent = parent.getParentNode();
+ Table table = (Table) parent;
+
+ this.table = table;
+ this.tableName = table.getName();
+
+ // make sure the root table exists and add this field
+ RootTable root = table.getRoot();
+ root.addAction( this );
+ }
+ }
+ */
+
+ public boolean hasSecurityRole()
+ {
+ return getSecurityRole() != null && !getSecurityRole().equals( "NONE" );
+ }
+
+ public String getSecurityRole()
+ {
+ if ( securityRole == null ) return table.getSecurityRole();
+ return securityRole;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public boolean isHidden()
+ {
+ return hide != null && hide.getHideIfClass() == null;
+ }
+
+ public boolean isHiddenIf()
+ {
+ return hide != null && hide.getHideIfClass() != null;
+ }
+
+ public String getHideIfClass()
+ {
+ if ( hide == null ) return null;
+ return hide.getHideIfClass();
+ }
+
+ public String getParametersList()
+ {
+ if ( parametersList != null )
+ {
+ return parametersList;
+ }
+ TextBuilder params = TextBuilder.newInstance();
+ for ( int i = 0; i < getParameters().size() ; i++ )
+ {
+ if ( i != 0 ) params.append( ',' );
+ params.append( "param" );
+ params.append( i );
+ }
+ parametersList = params.toString();
+ return parametersList;
+ }
+
+ public String getParametersListWithTypes()
+ {
+ if ( parametersListWithTypes != null )
+ {
+ return parametersListWithTypes;
+ }
+ TextBuilder params = TextBuilder.newInstance();
+ for ( int i = 0; i < getParameters().size() ; i++ )
+ {
+ if ( i != 0 ) params.append( ',' );
+ params.append( ( (Parameter) getParameters().get( i ) ).getType() );
+ params.append( " param" );
+ params.append( i );
+ }
+ parametersListWithTypes = params.toString();
+ return parametersListWithTypes;
+ }
+
+ public Table getOMTable()
+ {
+ return table;
+ }
+
+ public String getTableName()
+ {
+ return tableName;
+ }
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Build.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Build.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Build.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,194 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import javolution.lang.TextBuilder;
+
+import java.util.ArrayList;
+
+
+/**
+ * representation of a <build> node. Allows special builder objects to be generated which can have extra
+ * functionality.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "build" )
+public class Build
+{
+
+ private String name = "";
+ boolean partOfRoot; // prevent adding of build twice to root-table
+ private String securityRole;
+ private String description = "";
+ @XStreamImplicit
+ private ArrayList<String> parameters;
+ private String parametersList;
+ private String parametersListWithTypes;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ /*
+ public ArrayList<Set> getActions()
+ {
+ NodeList nl = getChildNodes();
+ ArrayList<Set> list = new ArrayList<Set>( nl.getLength() );
+ for ( int i = 0; i < nl.getLength() ; i++ )
+ {
+ if ( nl.item( i ) instanceof Set )
+ {
+ list.add( (Set)nl.item( i ) );
+ }
+ }
+ return list;
+ }
+ */
+
+ public String toString()
+ {
+ return "<build name=\"" + getName() + "\" ... />";
+ }
+
+ /*
+ public void transform()
+ {
+ // Here we do some major preprocessing by building root-tables
+ // root-tables are basicly tables which include the fields and selectors for all the child tables
+
+ if ( !partOfRoot )
+ {
+ // get the table definition
+ Node parent = this;
+ while ( !( parent instanceof Table ) ) parent = parent.getParentNode();
+ Table table = (Table) parent;
+
+ // make sure the root table exists and add this field
+ RootTable root = table.getRoot();
+ root.addBuild( this );
+ }
+ }
+
+ public boolean hasSecurityRole()
+ {
+ return getSecurityRole() != null && !getSecurityRole().equals( "NONE" );
+ }
+ */
+
+ void setSecurityRole( String securityRole )
+ {
+ this.securityRole = securityRole;
+ }
+
+ /*
+ public String getSecurityRole()
+ {
+ if ( securityRole == null )
+ {
+ RootTable root = (RootTable) getParentNode();
+ return root.getSecurityRole();
+ }
+ return securityRole;
+ }
+ */
+
+ /**
+ * Get description for this builder.
+ *
+ * @return the description
+ */
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Does the builder have a name, an anonymous builder is created by default.
+ *
+ * @return true if builder has a name
+ */
+ public boolean hasName()
+ {
+ return !"".equals( name );
+ }
+
+ /**
+ * Were parameters specified for this builder ?
+ *
+ * @return true if it has parameters
+ */
+ public boolean hasParameters()
+ {
+ return parameters.size() > 0;
+ }
+
+ /**
+ * Get the collection with parameter types for the builder
+ *
+ * @return a list of parameters
+ */
+ public ArrayList<String> getParameters()
+ {
+ return parameters;
+ }
+
+ public String getParametersList()
+ {
+ if ( parametersList == null )
+ {
+ TextBuilder params = TextBuilder.newInstance();
+ for ( int i = 0; i < getParameters().size() ; i++ )
+ {
+ if ( i != 0 ) params.append( ',' );
+ params.append( "param" );
+ params.append( i );
+ }
+ parametersList = params.toString();
+ }
+ return parametersList;
+ }
+
+ public String getParametersListWithTypes()
+ {
+ if ( parametersListWithTypes == null )
+ {
+ TextBuilder params = TextBuilder.newInstance();
+ for ( int i = 0; i < getParameters().size() ; i++ )
+ {
+ if ( i != 0 ) params.append( ',' );
+ params.append( getParameters().get( i ) );
+ params.append( " param" );
+ params.append( i );
+ }
+ parametersListWithTypes = params.toString();
+ }
+ return parametersListWithTypes;
+ }
+
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/CaseConversion.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,67 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import org.equanda.domain.xml.aid.CaseConversionValue;
+import org.equanda.domain.xml.aid.CaseConversionValueConverter;
+
+/**
+ * case conversion tag
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "case" )
+public class CaseConversion
+{
+ @XStreamAsAttribute
+ @XStreamConverter( CaseConversionValueConverter.class )
+ private CaseConversionValue value;
+ @XStreamAsAttribute
+ @XStreamAlias( "class" )
+ private String className;
+
+ public CaseConversionValue getValue()
+ {
+ return value;
+ }
+
+ public String getClassName()
+ {
+ return className;
+ }
+
+ public boolean isUpper()
+ {
+ return className == null && CaseConversionValue.UPPER.equals( value );
+ }
+
+ public boolean isLower()
+ {
+ return className == null && CaseConversionValue.LOWER.equals( value );
+ }
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Choice.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Choice.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Choice.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,180 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+
+/**
+ * representation of a <choice> node
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "choice" )
+public class Choice
+{
+ @XStreamAsAttribute
+ private String name;
+ @XStreamAsAttribute
+ private String value;
+ @XStreamAsAttribute
+ @XStreamAlias( "class" )
+ private String choiceClass;
+
+ private String description = "";
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ /*
+ public boolean isFromClass()
+ {
+ return isFromClass;
+ }
+ */
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public boolean hasDescription()
+ {
+ return !description.equals( "" );
+ }
+
+ /*
+ public void transform()
+ {
+ Field field = (Field) getParentNode();
+ Node node = field.getParentNode();
+ String tableName;
+ while ( !( node instanceof Table ) && !( node instanceof RootTable ) ) node = node.getParentNode();
+ if ( node instanceof Table )
+ {
+ tableName = ( (Table) node ).getName();
+ }
+ else
+ {
+ tableName = ( (RootTable) node ).getName();
+ }
+
+ // verify if one of class | name was provided
+ if ( name == null )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Choice in field " + tableName + "." + field.getName() +
+ " - you have to specify choice class or choice name and choice value " );
+ return;
+ }
+ if ( !isFromClass && value == null )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Choice in field " + tableName + "." + field.getName() + " - you have to specify a choice value" );
+ return;
+ }
+ // verify if field type allows choices:
+ if ( field.isDate() )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Choice in field " + tableName + "." + field.getName() + " is date so it cannot have choices" );
+ return;
+ }
+ if ( field.isTimestamp() )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Choice in field " + tableName + "." + field.getName() + " is timestamp so it cannot have choices" );
+ return;
+ }
+ if ( field.isLink() )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Choice in field " + tableName + "." + field.getName() + " is link so it cannot have choices" );
+ return;
+ }
+ // verify format:
+ if ( !isFromClass )
+ {
+ if ( field.isInt() )
+ {
+ try
+ {
+ Integer.parseInt( value );
+ }
+ catch ( NumberFormatException e )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Choice in field " + tableName + "." + field.getName() +
+ " - value for choice is not an integer (" +
+ value +
+ ")" );
+ return;
+ }
+ }
+ if ( field.isBoolean() )
+ {
+ if ( ( !value.equals( "true" ) ) && ( !value.equals( "false" ) ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Choice in field " + tableName + "." + field.getName() +
+ " - value for choice is not boolean (" +
+ value +
+ ")" );
+ return;
+ }
+ }
+ if ( field.isDouble() )
+ {
+ try
+
+ {
+ Double.parseDouble( value );
+ }
+ catch ( NumberFormatException e )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Choice in field " + tableName + "." + field.getName() +
+ " - value for choice is not a double (" +
+ value +
+ ")" );
+ return;
+ }
+ }
+ }
+ }
+ */
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,99 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
+
+/**
+ * helper class to model Compare constraint
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "compare" )
+public class Compare
+{
+ @XStreamAsAttribute
+ private String test;
+ @XStreamAsAttribute
+ private String value;
+ @XStreamAsAttribute
+ private String left;
+ @XStreamAsAttribute
+ private String right;
+
+ @XStreamOmitField
+ private boolean fieldLevel;
+ @XStreamOmitField
+ private Field field;
+
+ public Compare( String t, String v, boolean fl )
+ {
+ test = t;
+ value = v;
+ fieldLevel = fl;
+ }
+
+ public String getTest()
+ {
+ return test;
+ }
+
+ public void setTest( String test )
+ {
+ this.test = test;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue( String value )
+ {
+ this.value = value;
+ }
+
+ public Field getField()
+ {
+ return field;
+ }
+
+ public boolean getFieldLevel()
+ {
+ return fieldLevel;
+ }
+
+ public String getLeft()
+ {
+ return left;
+ }
+
+ public String getRight()
+ {
+ return right;
+ }
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,83 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import org.equanda.domain.xml.aid.ImplicitBooleanConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Representation of "constraints" node.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "constraints" )
+public class Constraints
+{
+ // @todo unique
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean required;
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean immutable;
+ @XStreamImplicit
+ @XStreamAlias( "immutable-if" )
+ private List<ImmutableIf> immutableIf;
+ @XStreamImplicit
+ @XStreamAlias( "mutable-even-if" )
+ private List<MutableEvenIf> mutableEvenIf;
+ @XStreamImplicit
+ private List<Compare> compare;
+ // @todo value-when-null
+ // @todo value-when-zero
+
+ public boolean isRequired()
+ {
+ return required;
+ }
+
+ public boolean isImmutable()
+ {
+ return immutable;
+ }
+
+ public List<ImmutableIf> getImmutableIf()
+ {
+ return immutableIf;
+ }
+
+ public List<MutableEvenIf> getMutableEvenIf()
+ {
+ return mutableEvenIf;
+ }
+
+ public List<Compare> getCompare()
+ {
+ return compare;
+ }
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,53 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+/**
+ * Implementation for data-filter
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "data-filter" )
+public class DataFilter
+{
+ @XStreamAsAttribute
+ private String name;
+
+ @XStreamAlias( "" )
+ private String value;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Default.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,62 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import org.equanda.domain.xml.aid.DefaultType;
+
+/**
+ * default value handling
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "default" )
+public class Default
+{
+ @XStreamAsAttribute
+ private DefaultType defaultType = DefaultType.VALUE;
+
+ @XStreamAlias( "" )
+ private String value;
+
+ public Default() {}
+
+ public Default( DefaultType defaultType, String value )
+ {
+ this.defaultType = defaultType;
+ this.value = value;
+ }
+
+ public DefaultType getDefaultType()
+ {
+ return defaultType;
+ }
+
+ public void setValue( String value )
+ {
+ this.value = value;
+ }
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DomainModel.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DomainModel.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DomainModel.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,70 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
+import org.equanda.domain.xml.transform.RootTable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * root node for the XML tree
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "equanda" )
+public class DomainModel
+{
+ @XStreamImplicit
+ private List<Type> types;
+ @XStreamImplicit
+ private List<Table> tables;
+ @XStreamOmitField
+ private List<RootTable> rootTables;
+
+ public List<Type> getTypes()
+ {
+ return types;
+ }
+
+ public List<Table> getTables()
+ {
+ return tables;
+ }
+
+ public List<RootTable> getRootTables()
+ {
+ return rootTables;
+ }
+
+ public void addRootTable( RootTable rootTable )
+ {
+ rootTables.add( rootTable );
+ }
+}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Field.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Field.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Field.java 2008-01-05 01:24:41 UTC (rev 235)
@@ -0,0 +1,2021 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import org.equanda.domain.xml.aid.CaseConversionValue;
+import org.equanda.domain.xml.aid.ImplicitBooleanConverter;
+import org.equanda.domain.xml.transform.RootTable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * a node for processing the XML tree
+ * <p/>
+ * Contributor(s):
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@XStreamAlias( "field" )
+public class Field
+{
+ @XStreamAsAttribute
+ private String name;
+
+ private String description = "";
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean internal;
+ @XStreamAlias( "link-name" )
+ private String linkName; // name for link (to allow bi-directional links, not obligatory)
+ @XStreamImplicit
+ private List<Choice> choices;
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean multiple; // are several values allowed in this field?
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean owner; // this field is the owner in a bidirectional link
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean embedded;
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean auto;
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean calculated;
+ // .....
+ private Constraints constraints;
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean display; // show field in short reference to object?
+ private Hide hide;
+ // .....
+ @XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean indexed;
+ @XStreamAlias( "case" )
+ private CaseConversion caseConversion;
+ // .....
+
+
+ public static final int TYPE_STRING = 1;
+ public static final int TYPE_BOOLEAN = 2;
+ public static final int TYPE_DATE = 3;
+ public static final int TYPE_TIMESTAMP = 4;
+ public static final int TYPE_INT = 5;
+ public static final int TYPE_DOUBLE = 6;
+ public static final int TYPE_BLOB = 7;
+ public static final int TYPE_CLOB = 8;
+ public static final int TYPE_LINK = 9;
+
+ public static final int OTHER_SIDE_UNKNOWN = 1;
+ public static final int OTHER_SIDE_SINGLE = 2;
+ public static final int OTHER_SIDE_MULTIPLE = 3;
+
+ // general info
+ String parentName; // name of the parent (a table name or include-data) - used for providing clear error messages
+ String varName, dbName;
+ String singular;
+ String defaultValue; // default value for field, including assignment operator
+ int type = TYPE_STRING, length, displayLength;
+ String linkTableName; // name for linked table
+ RootTable linkTable; // table which is linked to
+ Field linkField; // opposite field, if this field is a bidirectional link
+ boolean inherited; // indicates whether this is a inherited field
+ boolean cloneable = true;
+ Table table; // table in which this field is originally defined
+ private String wsValue = "UOID"; // field to serialize for ws queries for linked fields
+ private String wsRole = "|all|"; // roles which can get this field when serializing for ws queries
+ private String securityRole;
+ private int otherSideMultiplicity = OTHER_SIDE_UNKNOWN; // multiplicity of other side (for links only)
+ private boolean bidirectional; //is link bidirectional?
+ private String defaultType; // type of default: value, auto, class
+ private boolean cascadeDelete;
+ private boolean cascadeKeep;
+ private boolean allowDelete = true;
+ private boolean allowDeleteSpecified;
+ private boolean useRelationTable;
+ private boolean fieldReference;
+ private boolean fieldDescription;
+ private Suggest suggest;
+ String equandaType; // the type just as it is given in the table descriptors (needed later in the gui-descriptors)
+ String renderer;
+
+ // constraints
+ boolean immutable;
+ boolean unique;
+ String uniqueConverter = null;
+ boolean compared;
+ boolean valueWhenNull;
+ boolean valueWhenZero;
+ ArrayList<ImmutableIf> immutableIf, mutableEvenIf;
+ ArrayList<Compare> compare;
+ String delegateField;
+ String delegatePath;
+ private boolean immutableIfConverted, mutableEvenIfConverted, compareConverted;
+ private int priority;
+
+ /*
+ public void setAttribute( CharSequence name, CharSequence value )
+ throws XMLTreeException
+ {
+ String val = value.toString();
+ if ( table == null )
+ {
+ Node node = this.getParentNode();
+ while ( !( node instanceof Table ) && node != null ) node = node.getParentNode();
+ table = (Table) node;
+ }
+ if ( name.equals( "type" ) )
+ {
+ equandaType = value.toString();
+ type = TYPE_LINK;
+ if ( "string".equals( equandaType ) )
+ {
+ type = TYPE_STRING;
+ }
+ else if ( "boolean".equals( equandaType ) )
+ {
+ type = TYPE_BOOLEAN;
+ }
+ else if ( "date".equals( equandaType ) )
+ {
+ type = TYPE_DATE;
+ }
+ else if ( "timestamp".equals( equandaType ) )
+ {
+ type = TYPE_TIMESTAMP;
+ }
+ else if ( "int".equals( equandaType ) )
+ {
+ type = TYPE_INT;
+ defaultValue = "0";
+ }
+ else if ( "double".equals( equandaType ) )
+ {
+ type = TYPE_DOUBLE;
+ defaultValue = "0.0";
+ }
+ else if ( "blob".equals( equandaType ) )
+ {
+ type = TYPE_BLOB;
+ }
+ else if ( "clob".equals( equandaType ) )
+ {
+ type = TYPE_CLOB;
+ }
+ if ( type == TYPE_LINK ) linkTableName = value.toString();
+ }
+ else if ( name.equals( "length" ) )
+ {
+ try
+ {
+ length = Integer.parseInt( value.toString() );
+ }
+ catch ( NumberFormatException nfe )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Field " + getParentName() + '.' + this.name +
+ " - length parameter should be integer" );
+ }
+ }
+ else if ( name.equals( "display-length" ) )
+ {
+ try
+ {
+ displayLength = Integer.parseInt( value.toString() );
+ }
+ catch ( NumberFormatException nfe )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Field " + getParentName() + '.' + this.name +
+ " - display length parameter should be integer" );
+ }
+ }
+ else if ( name.equals( "renderer" ) )
+ {
+ renderer = value.toString();
+ }
+ else if ( name.equals( "name" ) )
+ {
+ dbName = value.toString();
+ if ( dbName.length() == 0 )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Field " + getParentName() + '.' + value +
+ " - field name can not be 0 in length" );
+ }
+ char charsName[] = dbName.toCharArray();
+ if ( !Character.isUpperCase( cha...
[truncated message content] |
|
From: <jo...@pr...> - 2008-01-04 21:11:55
|
See http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/131/changes ------------------------------------------ [INFO] ---------------------------------------------------------------------------- [INFO] Building equanda-generate [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/target [INFO] [cobertura:clean {execution: clean}] [INFO] [antrun:run {execution: remove-logs}] [INFO] Executing tasks [delete] Deleting: http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/errors.txt [delete] Deleting: http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/velocity.log [INFO] Executed tasks [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] [INFO] Compiling 47 source files to http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/target/classes [HUDSON] Archiving http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Compilation failure http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java :[32,30] cannot find symbol symbol : class OverwriteDefault location: package org.equanda.domain.xml http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java :[47,8] cannot find symbol symbol : class OverwriteDefault location: class org.equanda.domain.xml.aid.OverwriteDefaultConverter http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java :[47,34] cannot find symbol symbol : class OverwriteDefault location: class org.equanda.domain.xml.aid.OverwriteDefaultConverter http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java :[55,8] cannot find symbol symbol : class OverwriteDefault location: class org.equanda.domain.xml.aid.OverwriteDefaultConverter http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java :[55,35] cannot find symbol symbol : class OverwriteDefault location: class org.equanda.domain.xml.aid.OverwriteDefaultConverter http://hudson.equanda.org/job/equanda/org.equanda$equanda-generate/ws/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java :[63,28] cannot find symbol symbol : class OverwriteDefault location: class org.equanda.domain.xml.aid.OverwriteDefaultConverter [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 15 seconds [INFO] Finished at: Fri Jan 04 22:02:15 GMT+01:00 2008 [INFO] Final Memory: 29M/199M [INFO] ------------------------------------------------------------------------ |
|
From: <tri...@us...> - 2008-01-04 20:37:43
|
Revision: 234
http://equanda.svn.sourceforge.net/equanda/?rev=234&view=rev
Author: triathlon98
Date: 2008-01-04 12:37:40 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
fixes in templates for date and double fields and for non-failing temporary links
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
Added Paths:
-----------
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java 2008-01-04 20:37:40 UTC (rev 234)
@@ -0,0 +1,65 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.domain.xml.aid;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import org.equanda.domain.xml.OverwriteDefault;
+
+/**
+ * Converter for overwrite-default node.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class OverwriteDefaultConverter
+ implements Converter
+{
+ private static final String ATTRIBUTE_FIELD = "field";
+
+ public void marshal( Object source, HierarchicalStreamWriter writer,
+ MarshallingContext context )
+ {
+ OverwriteDefault value = (OverwriteDefault) source;
+ writer.addAttribute( ATTRIBUTE_FIELD, value.getField() );
+ writer.setValue( value.getValue() );
+ }
+
+ public Object unmarshal( HierarchicalStreamReader reader,
+ UnmarshallingContext context )
+ {
+ OverwriteDefault res = new OverwriteDefault();
+ res.setField( reader.getAttribute( ATTRIBUTE_FIELD ) );
+ res.setValue( reader.getValue() );
+ return res;
+ }
+
+ public boolean canConvert( Class type )
+ {
+ return type.equals( OverwriteDefault.class );
+ }
+}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2008-01-04 14:19:47 UTC (rev 233)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2008-01-04 20:37:40 UTC (rev 234)
@@ -1,2 +1,2 @@
-<t:label for="birthdate"/>
-<input t:type="DateField" t:label="Birthdate" t:id="birthdate" t:value="value.Birthdate"/>
+<t:label for="${field.VarName}"/>
+<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm 2008-01-04 14:19:47 UTC (rev 233)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm 2008-01-04 20:37:40 UTC (rev 234)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="TextField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2008-01-04 14:19:47 UTC (rev 233)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2008-01-04 20:37:40 UTC (rev 234)
@@ -15,7 +15,7 @@
#if( !$table.LinkedSelects.isEmpty() )
<ul>
#foreach( $select in $table.LinkedSelects )
- <li><a href="nowhere">Find By $select.Name</a></li>
+ <li><a href="#nowhere-yet">Find By $select.Name</a></li>
#end
</ul>
<hr/>
@@ -23,7 +23,7 @@
#if( !$table.MoreLinkedSelects.isEmpty() )
<ul>
#foreach( $select in $table.MoreLinkedSelects )
- <li><a href="nowhere">Find By $select.Name</a></li>
+ <li><a href="#nowhere-yet">Find By $select.Name</a></li>
#end
</ul>
<hr/>
@@ -32,7 +32,7 @@
<t:parameter name="actions">
<ul>
#foreach( $action in $table.Actions )
- <li><a href="nowhere">Action ${action.Name}</a></li>
+ <li><a href="#nowhere-yet">Action ${action.Name}</a></li>
#end
</ul>
</t:parameter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-04 14:19:50
|
Revision: 233
http://equanda.svn.sourceforge.net/equanda/?rev=233&view=rev
Author: triathlon98
Date: 2008-01-04 06:19:47 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
fix spelling
Modified Paths:
--------------
trunk/src/site/wiki/gettingstarted.wiki
Modified: trunk/src/site/wiki/gettingstarted.wiki
===================================================================
--- trunk/src/site/wiki/gettingstarted.wiki 2008-01-04 11:17:55 UTC (rev 232)
+++ trunk/src/site/wiki/gettingstarted.wiki 2008-01-04 14:19:47 UTC (rev 233)
@@ -2,7 +2,7 @@
We have a simple example application which is built using equanda and which can be used as template to build your own stuff.
The following shows how to get up and running with this sample application.
-For the demonstation, we deploy this using [firebird|http://www.firebirdsql.org] as database. It should also work with other databases (equanda uses EJB3 after all), hut the ddltool does not have support them (patches are welcome).
+For the demonstation, we deploy this using [firebird|http://www.firebirdsql.org] as database. It should also work with other databases (equanda uses EJB3 after all), but the ddltool does not have support for them (patches are welcome).
h2. Get all the stuff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-04 11:17:58
|
Revision: 232
http://equanda.svn.sourceforge.net/equanda/?rev=232&view=rev
Author: triathlon98
Date: 2008-01-04 03:17:55 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
fix version reference
Modified Paths:
--------------
equanda-example/example-ddltool/pom.xml
Modified: equanda-example/example-ddltool/pom.xml
===================================================================
--- equanda-example/example-ddltool/pom.xml 2007-12-30 17:38:01 UTC (rev 231)
+++ equanda-example/example-ddltool/pom.xml 2008-01-04 11:17:55 UTC (rev 232)
@@ -40,7 +40,7 @@
<artifactItem>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>${equanda-version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/classes
@@ -137,7 +137,7 @@
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
- <version>0.8-SNAPSHOT</version>
+ <version>${equanda-version}</version>
</dependency>
<dependency>
<groupId>org.equanda</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-30 17:38:04
|
Revision: 231
http://equanda.svn.sourceforge.net/equanda/?rev=231&view=rev
Author: triathlon98
Date: 2007-12-30 09:38:01 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
remove reports template, they are quite useless anyway
Removed Paths:
-------------
trunk/equanda-generate/src/main/velocity/reports/
trunk/equanda-generate/src/main/velocity/reports.ini
Deleted: trunk/equanda-generate/src/main/velocity/reports.ini
===================================================================
--- trunk/equanda-generate/src/main/velocity/reports.ini 2007-12-30 17:37:25 UTC (rev 230)
+++ trunk/equanda-generate/src/main/velocity/reports.ini 2007-12-30 17:38:01 UTC (rev 231)
@@ -1,6 +0,0 @@
-[config]
-path=reports
-
-[root-table]
-output1=${outputDir}report_${table}.jrxml
-template1=report_table.xml.vm
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-30 17:37:32
|
Revision: 230
http://equanda.svn.sourceforge.net/equanda/?rev=230&view=rev
Author: triathlon98
Date: 2007-12-30 09:37:25 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
documentation improvements
Modified Paths:
--------------
trunk/equanda-generate/src/site/wiki/index.wiki
trunk/equanda-generate/src/site/wiki/templates/ddltool.wiki
trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki
trunk/equanda-generate/src/site/wiki/templates/import.wiki
trunk/equanda-generate/src/site/wiki/templates/login.wiki
trunk/equanda-generate/src/site/wiki/templates/t5gui.wiki
trunk/src/site/site.xml
trunk/src/site/wiki/config.wiki
trunk/src/site/wiki/dm.wiki
trunk/src/site/wiki/history.wiki
trunk/src/site/wiki/index.wiki
trunk/src/site/wiki/persistence.wiki
trunk/src/site/wiki/presentation.wiki
trunk/src/site/wiki/roadmap.wiki
Removed Paths:
-------------
trunk/equanda-generate/src/site/wiki/templates/gui-descriptors.wiki
trunk/equanda-generate/src/site/wiki/templates/reports.wiki
trunk/src/site/wiki/lazy.wiki
trunk/src/site/wiki/navigation.wiki
trunk/src/site/wiki/suggest.wiki
Modified: trunk/equanda-generate/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/index.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/index.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -0,0 +1,11 @@
+h1. Generating based on domain model
+
+This model handled the code generation based on the domain model.
+
+Templates are provided for the following aspects.
+- [ejb3|ejb3.wiki] : EJB3 persistence layer
+- [t5gui|t5gui.html] : tapestry5 user interface
+- [login|login.html] : user management support
+- [import|import.html] : import data
+- [ddltool|ddltool.html] : ddltool
+- [docs|docs.html] : domain model documentation
Modified: trunk/equanda-generate/src/site/wiki/templates/ddltool.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/ddltool.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/templates/ddltool.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1 +1,3 @@
-h1. dlltool templates
\ No newline at end of file
+h1. dlltool templates
+
+This allows generation of a tool which handles database update (and optionally partial cleanup).
Modified: trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1 +1,21 @@
h1. ejb3 templates
+
+Domain model description options
+- (multiple) inheritance
+- declarative constraints
+- programmed constraints
+- int, double, string, blob, clob fields
+- fields with multiple values
+- hard linked records (normal db links)
+- soft linked records (using an ordinary field reference, the linked record may not exist)
+- field values can be limited (choices) either statically (xml description) or programmatically (validation)
+- for removing records cascade-delete, cascade-keep (don't delete when there are references to the record) or normal null all references behaviour can be used
+- field templates can be used
+
+Implementation
+- powerful proxies are used which make objects available remotely. Similar to detached objects, but completely transparent (no need to instantiate)
+- lazy collection instantiation, when a selector contains lots of objects, the results are still batched (and counting works too)
+- inheritance sensitive selectors
+- filters and sort orders can be defined on the selectors
+
+As a bonus, when your client only uses the proxies, it is straightforward to replace the backend (this way the data could for example be based on webservices instead of EJB3 entity beans).
Deleted: trunk/equanda-generate/src/site/wiki/templates/gui-descriptors.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/gui-descriptors.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/templates/gui-descriptors.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,4 +0,0 @@
-h1. gui-descriptors templates
-
-This template generates xml user interface descriptions which are used by the tapestry4 gui rendering code to build a user interface for the domain model.
-This is no longer supported as the power and configurability (not to mention developer friendlyness) of the newer tapestry5 user interface is much higher.
\ No newline at end of file
Modified: trunk/equanda-generate/src/site/wiki/templates/import.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/import.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/templates/import.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1 +1,4 @@
h1. import templates
+
+It is possible to generate code which can be used to import data from a CVS-like text file.
+
Modified: trunk/equanda-generate/src/site/wiki/templates/login.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/login.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/templates/login.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1 +1,3 @@
-h1. login templates
\ No newline at end of file
+h1. login templates
+
+equanda uses an internal mechanism to configure the very granular access rights for the user interface. This is based on user information in the database. This module allows you to generate a login module which prevents duplication of user information between the application and the JAAS module.
Deleted: trunk/equanda-generate/src/site/wiki/templates/reports.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/reports.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/templates/reports.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1 +0,0 @@
-h1. reports templates
\ No newline at end of file
Modified: trunk/equanda-generate/src/site/wiki/templates/t5gui.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/t5gui.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/equanda-generate/src/site/wiki/templates/t5gui.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1 +1,20 @@
h1. t5gui templates
+
+- thin client, all browsers, no need for ActiveX activation of client side java
+- easy/efficient keyboard navigation
+- powerful automatic cross linking of records
+- fields can be distributed over (tab) pages with some fields be visible on all tabs
+- fields can be grouped
+- setting links using suggest values (*)
+- powerful user management with customization of rights (*)
+- possible choice of visible fields per user (*)
+- possible printout (pdf doc) of the result of selectors, with user configurable fields (screen and pdf), and column width (pdf) (*)
+- inclusion of reporting in the user interface (*)
+- generated components can be used to build custom pages
+- highly customizeably, layout components define how things are combined on screen
+- possible to change the components used for a specific type or field or on a case by case basis
+
+(*) ^Items marked like this were available in the old tapestry4 version and will be available again for the tapestry5 version.^
+
+
+h2. configuring how forms are generated
\ No newline at end of file
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/site.xml 2007-12-30 17:37:25 UTC (rev 230)
@@ -19,6 +19,7 @@
<menu name="equanda">
<item name="Introduction" href="index.html"/>
+ <item name="Getting Started" href="gettingstarted.html"/>
<item name="Vision" href="vision.html"/>
<item name="Documentation" collapse="false">
<item name="Persistence" href="persistence.html"/>
@@ -27,7 +28,6 @@
<item name="Configuration" href="config.html"/>
<item name="Developers" href="developers.html"/>
</item>
- <item name="Getting Started" href="gettingstarted.html"/>
<item name="Roadmap" href="roadmap.html"/>
<item name="License" href="license.html"/>
</menu>
Modified: trunk/src/site/wiki/config.wiki
===================================================================
--- trunk/src/site/wiki/config.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/config.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -21,7 +21,7 @@
generateAll=false
[ejb3]
-package=mypackage.myapp.om
+package=mypackage.myapp.dm
[ddltool]
package=mypackage.myapp.ddltool
@@ -45,7 +45,7 @@
skip-jalopy=true
skip-xml-check=true
security-domain=myapp
-ejb-package=mypackage.myapp.om
+ejb-package=mypackage.myapp.dm
default-role=LocalUser
[database,myapp]
@@ -76,7 +76,7 @@
h2. Maven plugin configuration
-Depending on the module, the configuration is different for the maven build plugin. For the main module, the documentation is generated. It can be included in the report plugin by having a link to "om/index.html".
+Depending on the module, the configuration is different for the maven build plugin. For the main module, the documentation is generated. It can be included in the report plugin by having a link to "dm/index.html".
The defaults assume that the domain model is stored in the "src/main/dm" directory, and the generation configuration file is called "dm.ini".
{code}
...
@@ -87,7 +87,7 @@
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
- <outputDirectory>target/site/om</outputDirectory>
+ <outputDirectory>target/site/dm</outputDirectory>
<template>docs</template>
</configuration>
<executions>
@@ -110,7 +110,7 @@
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<outputDirectory>?</outputDirectory>
<template>ejb3,import,login</template>
<verifyLanguages>en;nl</verifyLanguages>
@@ -136,7 +136,7 @@
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
<resources>true</resources>
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<outputDirectory>?</outputDirectory>
<template>gui-descriptors</template>
</configuration>
@@ -159,7 +159,7 @@
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
<!-- generate ddltool parameters -->
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<template>ddltool</template>
<!-- run ddltool parameters -->
<database>${synca.db.url}</database>
Modified: trunk/src/site/wiki/dm.wiki
===================================================================
--- trunk/src/site/wiki/dm.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/dm.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,53 +1,21 @@
h1. Domain model
-The base for most of the generation done in equanda is the domain model description.
+The domain model is described in a set of xml files. Everything which is generated is based on the definition of the domain model.
+The definition can be split over multiple files. There are a few methods to include extra files in the overall definition.
+For starters, the declaration of a table can be done by refering to a file or directory. In the latter case all "*.table" files in that directory are included.
+Alternatively, the "include" tag can be used to include xml excepts from a file.
-
-
-<!--
- This file is part of the equanda project.
-
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Code generated by applying this template can be freely used.
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
-
- This is the dtd for the XML description of the data model for the application
-
- Contributor(s):
- Joachim Van der Auwera (jo...@pr...)
- NetRom team
- -->
-
+{code}
<!ENTITY % integer "CDATA">
<!-- a <integer>, for lack of more accurate description -->
-<!ENTITY % param.tag 'if'>
-
<!-- a equanda description can be split into multiple files, the main file always has a "equanda" root element -->
-<!ELEMENT equanda ((type)*,(database|%param.tag;)*, (user-interface)?)>
+<!ELEMENT equanda ((type)*,(database)*)>
<!-- define the tables which are part of a physical database -->
-<!ELEMENT database (table|%param.tag;)*>
+<!ELEMENT database (table)*>
<!ATTLIST database
name CDATA #REQUIRED>
@@ -65,20 +33,20 @@
-->
<!ELEMENT table (
(description)?,
- (template|%param.tag;)*,
+ (template)*,
(include)*,
(data-filter)*,
(default-instance)?,
(security-role)?,
(security-role-remove)?,
(cascade-keep)?,
- (page|%param.tag;)*,
+ (page)*,
(cloneable|not-cloneable)?,
- (constraints|%param.tag;)?,
+ (constraints)?,
(hide|no-hide)?,
- (select|%param.tag;)*,
- (build|%param.tag;)*,
- (action|%param.tag;)*
+ (select)*,
+ (build)*,
+ (action)*
)>
<!ATTLIST table
name CDATA #IMPLIED
@@ -97,7 +65,7 @@
are implicitly copied.
In the templates, it is possible to overwrite default values for fields.
-->
-<!ELEMENT template (overwrite-default|%param.tag;)*>
+<!ELEMENT template (overwrite-default)*>
<!ATTLIST template
parent CDATA #REQUIRED>
@@ -138,7 +106,7 @@
A table is always split into at least one page.
This is a visual separation, indicating typically the tab page which contains the field.
-->
-<!ELEMENT page ((description)?,(field|group|include|%param.tag;)*, (hide|no-hide)?)>
+<!ELEMENT page ((description)?,(field|group|include)*, (hide|no-hide)?)>
<!ATTLIST page
name CDATA #IMPLIED>
@@ -151,7 +119,7 @@
<!-- Allow grouping of fields. In a GUI this could be represented by a box around the items. -->
-<!ELEMENT group ((description)?,(field|group|include|%param.tag;)*, (hide|no-hide)?)>
+<!ELEMENT group ((description)?,(field|group|include)*, (hide|no-hide)?)>
<!ATTLIST group
name CDATA "">
@@ -184,7 +152,7 @@
default?,
suggest?,
(cloneable|not-cloneable)?,
- (constraints|%param.tag;)?,
+ (constraints)?,
(display|no-display)?,(hide|no-hide)?,
(ws-value)?, (ws-role)?,
(indexed)?,
@@ -217,7 +185,7 @@
(cascade-delete|cascade-keep|allow-delete)?,
default?,
suggest?,
- (constraints|%param.tag;)?,
+ (constraints)?,
(display|no-display)?,(hide|no-hide)?,
(ws-value)?, (ws-role)?,
(indexed)?,
@@ -387,7 +355,7 @@
<!ELEMENT internal EMPTY>
<!ELEMENT link-name (#PCDATA)>
-<!ELEMENT constraints (unique|required|immutable|immutable-if|mutable-even-if|compare|value-when-null|value-when-zero|%param.tag;)*>
+<!ELEMENT constraints (unique|required|immutable|immutable-if|mutable-even-if|compare|value-when-null|value-when-zero)*>
<!--
Unique fields are not allowed to be multiple, calculated, link.
@@ -470,8 +438,8 @@
"limit" and "order" are not allowed for selects of type "single".
-->
<!ELEMENT select ( (description)?,
- (subselect|%param.tag;)*,
- (selection|%param.tag;)*,
+ (subselect)*,
+ (selection)*,
(query)?,
(security-role)?,
(hide|no-hide)?,
@@ -485,8 +453,8 @@
limit (no|yes) "no">
<!ELEMENT subselect ( (description)?,
- (subselect|%param.tag;)*,
- (selection|%param.tag;)*,
+ (subselect)*,
+ (selection)*,
(query)?
)>
<!ATTLIST subselect
@@ -530,7 +498,7 @@
-->
<!ELEMENT view-filter (#PCDATA)>
-<!ELEMENT build ((description)?,(parameter|%param.tag;)*,(set|%param.tag;)*,security-role?)>
+<!ELEMENT build ((description)?,(parameter)*,(set)*,security-role?)>
<!ATTLIST build
name CDATA #REQUIRED>
@@ -545,7 +513,7 @@
An action can have parameters. The type of these has to be defined as well.
Parameters should be either simple types, of fully qualified
-->
-<!ELEMENT action ((description)?, (parameter|%param.tag;)*, security-role?, (hide|no-hide)?)>
+<!ELEMENT action ((description)?, (parameter)*, security-role?, (hide|no-hide)?)>
<!ATTLIST action
name CDATA #REQUIRED
return CDATA "void"
@@ -585,62 +553,4 @@
table CDATA #IMPLIED
value-list CDATA #IMPLIED
>
-
-
-
-
-<!--
- Definition of the standard user-interface for the application.
-
- The "start" attribute defines the start window (after the login screen of course).
-
- In general, the ui consists of windows which can be defined. Each window has a menu
- (in the Cocoon GUI this is displayed on the left). Each window can have its own menu,
- but by default the menu from the parent structure is used (if nothing else is defined).
-
- Therefore, the <menu> defined under <user-interface> is the default menu for all windows in IC-trace.
-
- A menu can contain several menu-item objects.
- A menu item typically has a label. The name of the label is used to search the i18n text.
- The contents of the label tag are the default value for the label (as put in the messages.xml file).
- A menu-item can optionally have an icon image. This image is assumed to be 64x64 in size.
- The picture needs to be stored in a place where it can be retrieved by Cocoon (some picture resources directory).
- The action defines what has to happen when the item is indicated.
- The "window" attribute means that a new window needs to be opened (a link for Cocoon GUI).
- For other types of objects etc, this could also point to a class which contains an action method or something.
-
- Similar to the table definitions, windows can either be defined inline (as is the case for the "main" window,
- or can be included individually (file attribute) or in batch (dir attribute, extension "window").
-
- The current GUI, which is generated from the database definition already contains many windows.
- To make these useable and properly integrated a consistent naming scheme for the windows
- (this will most likely match URLs, with an alias of index for the "start" page).
- I suggest prefixing all the current pages with "equanda-" and making that reserved
- (so not allowing that prefix in the window name).
- To access the reports, a fixed name has to be provided for those as well, with a prefix like "equandaReport-".
-
- To make it all work consistently, I also suggest splitting up the sitemap in three parts.
- There currently are already two parts for the gui and for the reporting.
- The pages/windows which are defined in the definition file could probably best be placed in a third sitemap file
- (making that file generated and the other two fixed).
-
- When there is no "user-interface" definition in the definition file, than the default start page could be
- what it is now (what I called "equanda-Database").
--->
-<!ELEMENT user-interface ((description)?, menu?)>
-<!ATTLIST user-interface
-start CDATA #IMPLIED>
-
-<!ELEMENT menu ((description)?, (menu-item)*)>
-
-<!ELEMENT menu-item ((description)?, (label), (icon), (menu-action))>
-
-<!ELEMENT menu-action EMPTY>
-<!ATTLIST menu-action
-window CDATA #REQUIRED>
-
-<!ELEMENT label (#PCDATA)>
-<!ATTLIST label
-name CDATA #REQUIRED>
-
-<!ELEMENT icon (#PCDATA)>
+{code}
\ No newline at end of file
Modified: trunk/src/site/wiki/history.wiki
===================================================================
--- trunk/src/site/wiki/history.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/history.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,13 +1,13 @@
h1. equanda history
-equanda as a framework has been long in the making. The first ideas and concepts were conceived many years ago, but it took some before before these ideas were mature enough and the opportunity arose to start developping.
+equanda as a framework has been long in the making. The first ideas and concepts were conceived many years ago, but it took some time before these ideas were mature enough and the opportunity arose to start developing.
-In 200x development started as [Uni-d|http://sf.net/projects/uni-d/] and the sourceforge project was created.
+In 2003 development started as [Uni-d|http://sf.net/projects/uni-d/] and the sourceforge project was created.
In the original version EJB2 was used for the persistence layer and [Cocoon|http://cocoon.apache.org/] for the presentation. However, it became clear that generating complex forms using Cocoon was far from trivial an thus this was re-evaluted.
The presentation layer was redone from scratch, changing framework from Cocoon to [tapestry|http://tapestry.apache.org/] 3. This proved to be much more productive. About a year and a half later, when the dust settled around the nex version, this was migrated towards tapestry4 to allow using the ajax features which were more easily available there.
-At some point, it appeared that there were some problems with the EJB2 implementation which was used in the main projects which applied the principles. As EJB3 was then close to being finalized and it was clear that EJB2 was being abandoned, so the bold (and too early) move was made to EJB3. This did however have some serious side effects on the value objects which were in use at that time. (These value objects are no longer part of equanda). The proxies made their entrance into equanda to fix this and make the framework easier to use.
+At some point, it appeared that there were some problems with the EJB2 implementation which was used in the main projects which applied the principles. As EJB3 was then close to being finalized and it was clear that EJB2 was being abandoned (as in development stopped), so the bold (and too early) move was made to EJB3. This did however have some serious side effects on the value objects which were in use at that time (these value objects are no longer part of equanda). The proxies made their entrance into equanda to fix this and make the framework easier to use.
-It did however become clear that Uni-d has some flaws, and as that project is heavily relied on by some other projects, just changing it to make it better was not possible. So a new project, equanda was created which started with a copy of the Uni-d code base, but which is being cleaned up. Many parts have been removed to make it all more consistent, large bits rewritten to make the code more performant, shorter, cleaner. The end result should make equanda a viable project for the future.
+It did however become clear that Uni-d has some flaws, and as that project is heavily relied on by some other projects, just changing it to make it better was not possible. So mid 2007 a new project, equanda, was created which started with a copy of the Uni-d code base, but which is being cleaned up. Many parts have been removed to make it all more consistent, large bits rewritten to make the code more performant, shorter, cleaner. The end result should make equanda a viable project for the future.
Modified: trunk/src/site/wiki/index.wiki
===================================================================
--- trunk/src/site/wiki/index.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/index.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -7,7 +7,7 @@
equanda is a tool which should help you to build enterprise grade (J2EE based) application with minimal effort, focussing not only on the initial version, but considering that most of the cost will be in maintaining and evolving the application.
-This is done by generating as much as possible directly from an XML description of the the data and interactions (the _[domain model|dm.html]_ "om"). Some more thoughts about the concept (generation) can be found [here|http://blog.progs.be/?p=29].
+This is done by generating as much as possible directly from an XML description of the the data and interactions (the _[domain model|dm.html]_ "dm"). Some more thoughts about the concept (generation) can be found [here|http://blog.progs.be/?p=29].
There are many ways to enhance/improve the generated application, but this is always done in such a way that most changes in the domain model don't cause any problems. You just recompile (which re-generates all the files which needs modifying) and all the manual changes are preserved.
@@ -114,7 +114,7 @@
- [tool|equanda-tool/index.html] : tool provided for import, export, remote printing of reports
- [util|equanda-util/index.html] : contains several utility classes containing (amongst others) ean128 barcode support, [FScript|http://fscript.sf.net/] extensions, useful Swing classes
- test : this module is used to do integration testing. It is only included when the "-Dfulltest" switch is used in maven.
-- tapestry4, t4-template : modules for generated tapestry4 user interface, this is no longer really supported
+- tapestry4, t4-template : modules for generated tapestry4 user interface, these will be removed before v1.0.
h2. Technology
@@ -137,5 +137,5 @@
h2. Thanks to
- Equanda is based on [Uni-d|http://sf.net/projects/uni-d], for which the development was sponsored by [CAB-software|http://www.cab-software.be/]. The principles have proven themselves there for the implementation of [IC-trace|http://ic-trace.org].
-- The development is supported by [synergetics|http://www.synergetics.be/]
+- The development is supported by [synergetics|http://www.synergetics.be/] where equanda is used for the development of the competency analyzer.
Deleted: trunk/src/site/wiki/lazy.wiki
===================================================================
--- trunk/src/site/wiki/lazy.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/lazy.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,7 +0,0 @@
-All selectors with multiple results return LazyCollection objects. LazyCollection features:
-- fetching is done as objects are needed
-- when hasNext is called and the next iterator object(UOID) is not fetched, a new page is fetched
-- when hasNext is called and the next object is already fetched, get is used to obtain the value/proxy or bean
-- when hasNext is used for iterator and the collection size was modified, hasNext returns false
-- when get is called and the collection was modified, ConcurrentModificationException is thrown
-- when a collection is not (yet) fully instantiated, then count() will run a count query on the database
\ No newline at end of file
Deleted: trunk/src/site/wiki/navigation.wiki
===================================================================
--- trunk/src/site/wiki/navigation.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/navigation.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,7 +0,0 @@
-h1. User interface navigation
-
-Easy/efficient field navigation in user interface using only keyboard:
--- pressing <Tab> or <Enter> changes focus to the next input field
--- pressing <Shift+Tab> changes focus to the previous input field
--- submit data by pressing <Ctrl+Enter> no matter focus field
--- submit data by pressing <Enter> on submit buttons which are set as submit buttons. Setting a submit button is done by adding a class named "submitButton"
Modified: trunk/src/site/wiki/persistence.wiki
===================================================================
--- trunk/src/site/wiki/persistence.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/persistence.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,2 +1,19 @@
h1. equanda persistence layer features
+h3. lazy collections as selector results
+
+All selectors with multiple results return LazyCollection objects. LazyCollection features:
+- fetching is done in batches as objects are needed
+- when a collection is not (yet) fully instantiated, then count() will run a count query on the database
+- when hasNext is called and the next iterator object is not fetched, a new batch is fetched
+- when hasNext is called and the next object is already fetched, the object is refreshed if it is "old" (the time is configurable)
+
+{private}
+h3. suggest values
+
+Searching records for suggest and link fields can be done using suggest values if the link table has reference or description/name field.
+-- searching for reference start can be done by entering the string value followed by '-' character and pressing <Tab> or <Enter> after
+-- searching for description start can be done by entering the string value followed by '--' characters and pressing <Tab> or <Enter> after
+-- searching for description part can be done by entering the string value followed by '?' character and pressing <Tab> or <Enter> after
+-- for links selecting a matching reference is possible by entering the reference and pressing <Tab> or <Enter>
+{private}
\ No newline at end of file
Modified: trunk/src/site/wiki/presentation.wiki
===================================================================
--- trunk/src/site/wiki/presentation.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/presentation.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,2 +1,12 @@
h1. equanda presentation layer features
+h3. Keyboard friendly form handling
+
+Easy/efficient field navigation in user interface using only keyboard:
+- pressing <tab> or <enter> changes focus to the next input field or link
+- pressing <shift+tab> changes focus to the previous input field
+- submit data by pressing <ctrl+enter> no matter which field has focus (the submit button which is called is typically highlighted by bold text).
+- submit data by pressing <enter> on buttons
+- in tabbed forms, when <tab> or <enter> is used on the last input element of a tab page, then the next tab page is automatically selected
+- in tabbed forms, when <shift+tab> is used on the first input element of a tab page, then the previous tab page is automatically selected
+
Modified: trunk/src/site/wiki/roadmap.wiki
===================================================================
--- trunk/src/site/wiki/roadmap.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/roadmap.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -4,12 +4,16 @@
This version is very useable and reliable, however we do still have some big changes we want to incorporate before we can call it version 1.0.
+- assure the user can choose which automatically generated key is used. This currently uses a custom UOID, but using a more standard UUID should also be possible
- migrate user interface to tapestry5
-- there are some problems with the user management and it should become a lot more powerful
-- user defineable component to render fields should be supported
- integrate with SSO (single sign on)
- import needs some rework to make it a lot more powerful
-- various small improvements as mentioned in JIRA.
+- various small improvements as mentioned in JIRA
+- remove some more stuff which we don't want to support going forward (like the old user interface stuff)
+- migrate the domain model parsing to not rely on custom xml parsing be on more generic xml handling using xstream (that custom xml parsing utility code will also be removed)
+
Other features/improvements may also be included.
For details and the current status, check the [equanda JIRA pages|http://jira.equanda.org/browse/EQ/].
\ No newline at end of file
Deleted: trunk/src/site/wiki/suggest.wiki
===================================================================
--- trunk/src/site/wiki/suggest.wiki 2007-12-30 11:22:27 UTC (rev 229)
+++ trunk/src/site/wiki/suggest.wiki 2007-12-30 17:37:25 UTC (rev 230)
@@ -1,7 +0,0 @@
-!Suggest values
-
-Searching records for suggest and link fields can be done using suggest values if the link table has reference or description/name field.
--- searching for reference start can be done by entering the string value followed by '-' character and pressing <Tab> or <Enter> after
--- searching for description start can be done by entering the string value followed by '--' characters and pressing <Tab> or <Enter> after
--- searching for description part can be done by entering the string value followed by '?' character and pressing <Tab> or <Enter> after
--- for links selecting a matching reference is possible by entering the reference and pressing <Tab> or <Enter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-30 11:22:31
|
Revision: 229
http://equanda.svn.sourceforge.net/equanda/?rev=229&view=rev
Author: triathlon98
Date: 2007-12-30 03:22:27 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
EQ-120 rename INIFile to IniFile
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/export/Export.java
trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java
trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java
trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java
trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java
trunk/equanda-util/src/main/java/org/equanda/util/script/DMExtension.java
Added Paths:
-----------
trunk/equanda-util/src/main/java/org/equanda/util/IniFile.java
Removed Paths:
-------------
trunk/equanda-generate/src/main/velocity/docs/om.mm.vm
trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java
trunk/equanda-util/src/main/java/org/equanda/util/script/OMExtension.java
Modified: trunk/equanda-client/src/main/java/org/equanda/export/Export.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -27,7 +27,7 @@
import org.equanda.persistence.UOID;
import org.equanda.persistence.EquandaProxy;
import org.equanda.util.Base64;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.StringSplitter;
import org.equanda.util.StringUtil;
import javolution.lang.TextBuilder;
@@ -69,7 +69,7 @@
*/
private String dir = "";
- public void export( Collection col, org.equanda.util.INIFile ini )
+ public void export( Collection col, IniFile ini )
throws ExportException
{
for ( Object obj : col )
@@ -78,7 +78,7 @@
}
}
- public void export( Collection col, INIFile ini, Map tableMap )
+ public void export( Collection col, IniFile ini, Map tableMap )
throws ExportException
{
Class previous = null;
@@ -94,25 +94,25 @@
}
}
- public void export( Object refForName, Collection col, INIFile ini )
+ public void export( Object refForName, Collection col, IniFile ini )
throws ExportException
{
export( refForName, col, ini, null, true, null );
}
- public void export( Object refForName, Object objectToExport, INIFile ini )
+ public void export( Object refForName, Object objectToExport, IniFile ini )
throws ExportException
{
export( refForName, objectToExport, ini, null, true, null );
}
- public void export( Object refForName, Collection col, INIFile ini, Map tableMap )
+ public void export( Object refForName, Collection col, IniFile ini, Map tableMap )
throws ExportException
{
export( refForName, col, ini, tableMap, true, null );
}
- public boolean export( Object refForName, Collection col, INIFile ini, Map tableMap, boolean writeDirective,
+ public boolean export( Object refForName, Collection col, IniFile ini, Map tableMap, boolean writeDirective,
Map<String, String> fileMoveMap )
throws ExportException
{
@@ -131,7 +131,7 @@
return ( previous == null ) && writeDirective;
}
- public boolean export( Object refForName, Object objectToExport, INIFile ini, Map tableMap, boolean writeDirective,
+ public boolean export( Object refForName, Object objectToExport, IniFile ini, Map tableMap, boolean writeDirective,
Map<String, String> fileMoveMap )
throws ExportException
{
@@ -146,7 +146,7 @@
}
}
- private void exportInternal( Object refForName, Object objectToExport, INIFile ini, Map tableMap,
+ private void exportInternal( Object refForName, Object objectToExport, IniFile ini, Map tableMap,
boolean writeDirective, Map<String, String> fileMoveMap )
throws ExportException
{
Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/db/CodebaseConvert.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.domain.db;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import java.io.IOException;
@@ -39,17 +39,17 @@
extends Convert
{
public static final String FILE = "CodebaseConversion.txt";
- INIFile convert;
+ IniFile convert;
public void init()
{
try
{
- convert = new INIFile( FILE, true );
+ convert = new IniFile( FILE, true );
}
catch ( IOException e )
{
- convert = new INIFile( true );
+ convert = new IniFile( true );
}
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/AntTask.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
@@ -40,7 +40,7 @@
{
private String appDir;
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
private boolean generateAll;
// The method executing the task
Modified: trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/generate/Generator.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -33,7 +33,7 @@
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.equanda.persistence.xml.*;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import org.equanda.util.StringSplitter;
import org.equanda.util.xml.XMLParser;
@@ -58,8 +58,8 @@
*/
public class Generator
{
- INIFile ini; // how to parse
- INIFile templateDefinition; // definition of what to generate
+ IniFile ini; // how to parse
+ IniFile templateDefinition; // definition of what to generate
long lastModified; // most recent last modification date
boolean failed; // has generation failed?
String appDir = ""; // directory where input files can be found
@@ -86,7 +86,7 @@
{
try
{
- Generator gen = new Generator( new INIFile( args[ 0 ] ), "" );
+ Generator gen = new Generator( new IniFile( args[ 0 ] ), "" );
gen.generate();
System.exit( gen.getFailed() ? 1 : 0 );
}
@@ -105,7 +105,7 @@
* @param ini project parameters
* @param defDir directory wehere definition is stored
*/
- public Generator( INIFile ini, String defDir )
+ public Generator( IniFile ini, String defDir )
{
this.ini = ini;
@@ -267,7 +267,7 @@
{
templateDefinitionFile = templateDefinitionFile.substring( "classpath://".length() );
}
- templateDefinition = new INIFile();
+ templateDefinition = new IniFile();
try
{
InputStream is = new EquandaResourceLoader().getResourceStream( templateDefinitionFile + ".ini" );
@@ -277,7 +277,7 @@
failed = true;
return;
}
- templateDefinition = new INIFile( is );
+ templateDefinition = new IniFile( is );
}
catch ( Exception e )
{
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/CodebaseConvert.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.persistence.xml;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import java.io.IOException;
@@ -39,17 +39,17 @@
extends Convert
{
public static final String FILE = "CodebaseConversion.txt";
- INIFile convert;
+ IniFile convert;
public void init()
{
try
{
- convert = new INIFile( FILE, true );
+ convert = new IniFile( FILE, true );
}
catch ( IOException e )
{
- convert = new INIFile( true );
+ convert = new IniFile( true );
}
}
Deleted: trunk/equanda-generate/src/main/velocity/docs/om.mm.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/om.mm.vm 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/main/velocity/docs/om.mm.vm 2007-12-30 11:22:27 UTC (rev 229)
@@ -1,90 +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/
- *
- * Code generated by applying this template can be freely used.
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * @author Joachim Van der Auwera
- *
- *#<map version="0.9.0_Beta_8">
-<attribute_registry>
- <attribute_name NAME="multiple">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="other-side-multiple">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="required">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="auto">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="dibirectional">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="calculated">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="cascade-keep">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="cascade-delete">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="type">
- </attribute_name>
- <attribute_name NAME="renderer">
- </attribute_name>
- <attribute_name NAME="length">
- </attribute_name>
- <attribute_name NAME="displayed">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="hidden">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="reference">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="description">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="embedded">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="immutable">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="indexed">
- <attribute_value VALUE=""/>
- </attribute_name>
- <attribute_name NAME="unique">
- <attribute_value VALUE=""/>
- </attribute_name>
-</attribute_registry>
-<node ID="root" TEXT="object model">
-#foreach( $table in $tables )
-#parse( "mm_table.vm" )
-#end
-</node>
-</map>
\ No newline at end of file
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/CaseConversionTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import junit.framework.TestCase;
/**
@@ -35,7 +35,7 @@
public class CaseConversionTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ChoicesTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/CompareTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
public class CompareTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DefaultTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/DisplayTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -36,7 +36,7 @@
public class DisplayTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/FailOnInvalidDefinitionTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ImmutableAndMutableTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
/**
* test case for immutable/mutable constraints in a parent table depending on fields from a child table
@@ -35,7 +35,7 @@
public class ImmutableAndMutableTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/LinksTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/LobTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import junit.framework.TestCase;
/**
@@ -35,7 +35,7 @@
public class LobTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/MultipleTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/NamesTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/SelectTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/TableIncludeAndTypeTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.xml.tree.Document;
import org.equanda.util.xml.tree.Node;
import org.equanda.persistence.xml.*;
@@ -38,7 +38,7 @@
public class TableIncludeAndTypeTest
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueNameTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/UniqueTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.generate;
import junit.framework.TestCase;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
/**
@@ -37,7 +37,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-generate/src/test/java/org/equanda/generate/ValueWhenNullTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.generate;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import junit.framework.TestCase;
@@ -38,7 +38,7 @@
extends TestCase
{
- private INIFile ini = new INIFile();
+ private IniFile ini = new IniFile();
protected void setUp()
throws Exception
Modified: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -29,7 +29,7 @@
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.generate.Generator;
import java.util.Locale;
@@ -134,11 +134,11 @@
// build directories etc
- INIFile ini;
+ IniFile ini;
String iniName = sourceDirectory + File.separatorChar + configurationFile;
try
{
- ini = new INIFile( iniName );
+ ini = new IniFile( iniName );
}
catch ( IOException ioe )
{
Modified: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -34,7 +34,7 @@
import java.util.ArrayList;
import org.equanda.generate.Generator;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
/**
* Maven plugin for equanda code generation.
@@ -160,11 +160,11 @@
// build directories etc
- INIFile ini;
+ IniFile ini;
String iniName = sourceDirectory + File.separatorChar + configurationFile;
try
{
- ini = new INIFile( iniName );
+ ini = new IniFile( iniName );
}
catch ( IOException ioe )
{
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -30,7 +30,7 @@
import org.equanda.persistence.UOID;
import org.equanda.test.dm.client.*;
import org.equanda.test.xejb.TestAdapter;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.ymport.ImportUtil;
import org.joda.time.chrono.ISOChronology;
@@ -143,7 +143,7 @@
// export cocoonMan
CocoonMan cmv = cocoonManEJB.getEquanda();
- INIFile cmIni = createCocoonManINI();
+ IniFile cmIni = createCocoonManINI();
exp.export( cmv, cmv, cmIni, map, true, null );
// first save the proxies for tests
@@ -214,7 +214,7 @@
Export exp = new Export();
// build ini
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "Car" );
ini.addValue( "Car", "file", EXPORT_OUTPUT_FILENAME_CAR );
ini.addValue( "Car", "1", "UOID" );
@@ -252,7 +252,7 @@
Export exp = new Export();
// build ini
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "Vehicle" );
ini.addValue( "Vehicle", "file", EXPORT_OUTPUT_FILENAME_VEHICLE );
ini.addValue( "Vehicle", "1", "EquandaType" );
@@ -299,7 +299,7 @@
Export exp = new Export();
// build ini
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "Car" );
ini.addValue( "Car", "file", EXPORT_OUTPUT_FILENAME_CAR_WITH_OWNER );
ini.addValue( "Car", "1", "Brand" );
@@ -478,9 +478,9 @@
*
* @return ini file
*/
- private INIFile createCocoonManINI()
+ private IniFile createCocoonManINI()
{
- INIFile ini = new INIFile();
+ IniFile ini = new IniFile();
ini.addSection( "CocoonMan" );
ini.addValue( "CocoonMan", "file", EXPORT_OUTPUT_FILENAME_COCOONMAN );
ini.addValue( "CocoonMan", "1", "FirstName" );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -28,7 +28,7 @@
import org.equanda.tool.export.object.SelectorList;
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -70,7 +70,7 @@
private SelectorList selectorList;
- public ExportSectionObject( INIFile ini, String sectionPrefix )
+ public ExportSectionObject( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -82,13 +82,13 @@
selectorList = new SelectorList();
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
selectorList = loadSelectorList( ini, resolvedSectionId );
}
- public SelectorList loadSelectorList( INIFile ini, String resolvedSectionId )
+ public SelectorList loadSelectorList( IniFile ini, String resolvedSectionId )
throws ToolException
{
ObjectSelector primary;
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.io.IOException;
import java.util.ArrayList;
@@ -58,11 +58,11 @@
private long scanPeriod;
private String exportInfo;
- private INIFile exportIni;
+ private IniFile exportIni;
private String exportDirectory;
private Collection<String> evalScripts;
- public ExportSectionSettings( INIFile ini, String sectionPrefix )
+ public ExportSectionSettings( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -77,7 +77,7 @@
exportDirectory = ".";
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
@@ -104,7 +104,7 @@
{
try
{
- exportIni = new INIFile( value, true );
+ exportIni = new IniFile( value, true );
}
catch ( IOException e )
{
@@ -151,7 +151,7 @@
return exportInfo;
}
- public INIFile getExportIni()
+ public IniFile getExportIni()
{
return exportIni;
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -27,7 +27,7 @@
import org.equanda.export.Export;
import org.equanda.tool.export.configuration.ExportSectionSettings;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -56,7 +56,7 @@
static Log log = LogFactory.getLog( "org.equanda.tool.export.object.ExportHelper" );
private static Map exportInfo; // Map used by export
- private static INIFile exportIni;
+ private static IniFile exportIni;
private static final Export export = new Export();
public static final Hashtable<String, Class> classesMap = new Hashtable<String, Class>();
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionScan.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -50,7 +50,7 @@
private ArrayList<String> classes;
- public PrintSectionScan( INIFile ini, String sectionPrefix )
+ public PrintSectionScan( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -62,7 +62,7 @@
classes = new ArrayList<String>( 5 );
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/configuration/PrintSectionSettings.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
import org.equanda.tool.shared.configuration.SectionGeneral;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.net.MalformedURLException;
import java.net.URL;
@@ -56,7 +56,7 @@
private String printer;
private URL reportURL;
- public PrintSectionSettings( INIFile ini, String sectionPrefix, SectionGeneral cfg )
+ public PrintSectionSettings( IniFile ini, String sectionPrefix, SectionGeneral cfg )
throws ToolException
{
super( ini, sectionPrefix );
@@ -71,7 +71,7 @@
printer = ""; // default to system printer
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
@@ -93,7 +93,7 @@
if ( value != null ) printer = value;
}
- private void initURL( SectionGeneral cfg, INIFile ini, String resolvedSectionId )
+ private void initURL( SectionGeneral cfg, IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationExtraImpl.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Enumeration;
@@ -64,7 +64,7 @@
return mainCfg;
}
- public INIFile getIni()
+ public IniFile getIni()
{
return mainCfg.getIni();
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.io.IOException;
import java.util.Hashtable;
@@ -53,14 +53,14 @@
/**
* ini file
*/
- private INIFile ini;
+ private IniFile ini;
public ConfigurationMain( String iniFileName )
throws ToolException
{
try
{
- ini = new INIFile( iniFileName, true );
+ ini = new IniFile( iniFileName, true );
}
catch ( IOException e )
{
@@ -69,7 +69,7 @@
init();
}
- public ConfigurationMain( INIFile ini_ )
+ public ConfigurationMain( IniFile ini_ )
{
ini = ini_;
init();
@@ -97,7 +97,7 @@
if ( sectionOM == null ) sectionOM = new SectionOM( getIni(), null );
}
- public INIFile getIni()
+ public IniFile getIni()
{
return ini;
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/Section.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import javolution.lang.TextBuilder;
import java.lang.reflect.Field;
@@ -42,7 +42,7 @@
protected static final String EMPTY_STRING = "";
- public Section( INIFile ini, String sectionPrefix )
+ public Section( IniFile ini, String sectionPrefix )
throws ToolException
{
if ( ini == null ) throw new ToolException( "Ini file is null" );
@@ -53,7 +53,7 @@
public abstract void initDefaults()
throws ToolException;
- public abstract void loadSection( INIFile ini, String resolvedSectionId )
+ public abstract void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException;
public abstract String getSectionId();
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionConfig.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Hashtable;
import java.util.Map;
@@ -50,7 +50,7 @@
private Map<String, String> config;
- public SectionConfig( INIFile ini, String sectionPrefix )
+ public SectionConfig( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -62,7 +62,7 @@
config = new Hashtable<String, String>();
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionDataBase.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.SaveException;
import java.sql.Connection;
@@ -58,7 +58,7 @@
private String dbDefault;
- public SectionDataBase( INIFile ini, String sectionPrefix )
+ public SectionDataBase( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -71,7 +71,7 @@
dbDefault = EMPTY_STRING;
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionGeneral.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Hashtable;
@@ -75,7 +75,7 @@
private String protocol;
private String alertProxyName;
- public SectionGeneral( INIFile ini, String sectionPrefix )
+ public SectionGeneral( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -96,7 +96,7 @@
protocol = "http";
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/SectionOM.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.shared.configuration;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -51,7 +51,7 @@
private ArrayList<String> omConnections;
- public SectionOM( INIFile ini, String sectionPrefix )
+ public SectionOM( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -63,7 +63,7 @@
omConnections = new ArrayList<String>();
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,8 +24,6 @@
package org.equanda.tool.translationsEditor;
-import org.equanda.util.INIFile;
-
/**
* Configuration settings for the TranslationsEditor tool
*
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/IniConfiguration.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -24,7 +24,7 @@
package org.equanda.tool.translationsEditor;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
/**
* ...
@@ -68,8 +68,8 @@
public IniConfiguration( String iniFilePath )
throws Exception
{
- INIFile ini;
- ini = new INIFile( iniFilePath );
+ IniFile ini;
+ ini = new IniFile( iniFilePath );
if ( ini.isEmpty() ) throw new RuntimeException( "Ini file is empty or missing !!! file = " + iniFilePath );
appdir = ini.getValue( INI_SECTION_UNI_D, INI_SECTION_UNI_D_KEY_APPDIR );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -25,7 +25,7 @@
package org.equanda.tool.translationsEditor;
import org.equanda.generate.Generator;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import org.equanda.util.ExceptionGroup;
import org.equanda.util.xml.tree.Document;
import org.equanda.util.xml.tree.NodeList;
@@ -476,7 +476,7 @@
{
if ( database == null )
{
- INIFile generatorIni = new INIFile();
+ IniFile generatorIni = new IniFile();
generatorIni.addValue( "config", "definition", config.getDefinition() );
generatorIni.addValue( "extra", "infrastructure", Boolean.toString( config.getInfrastructure() ) );
Generator gen = new Generator( generatorIni, config.getAppdir() );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionMail.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.configuration.Section;
import org.equanda.tool.shared.ToolException;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.Hashtable;
@@ -68,7 +68,7 @@
private int connectionTimeout;
private int socketTimeout;
- public ImportSectionMail( INIFile ini, String sectionPrefix )
+ public ImportSectionMail( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -79,7 +79,7 @@
return INI_SECTION_MAIL;
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScan.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -57,7 +57,7 @@
private ArrayList<String> filePatterns;
private ArrayList<String> scriptFiles;
- public ImportSectionScan( INIFile ini, String sectionPrefix )
+ public ImportSectionScan( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -72,7 +72,7 @@
scriptFiles = new ArrayList<String>( 5 );
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionScript.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -26,7 +26,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -53,7 +53,7 @@
private ArrayList<String> scripts;
private boolean debug;
- public ImportSectionScript( INIFile ini, String sectionPrefix )
+ public ImportSectionScript( IniFile ini, String sectionPrefix )
throws ToolException
{
super( ini, sectionPrefix );
@@ -65,7 +65,7 @@
scripts = new ArrayList<String>( 5 );
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportSectionSettings.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -27,7 +27,7 @@
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.configuration.Section;
import org.equanda.tool.shared.configuration.SectionGeneral;
-import org.equanda.util.INIFile;
+import org.equanda.util.IniFile;
import java.net.MalformedURLException;
import java.net.URL;
@@ -65,7 +65,7 @@
private URL importURL;
- public ImportSectionSettings( INIFile ini, String sectionPrefix, SectionGeneral cfg )
+ public ImportSectionSettings( IniFile ini, String sectionPrefix, SectionGeneral cfg )
throws ToolException
{
super( ini, sectionPrefix );
@@ -81,7 +81,7 @@
deepSearch = false;
}
- public void loadSection( INIFile ini, String resolvedSectionId )
+ public void loadSection( IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable<String, String> section = ini.getSection( resolvedSectionId );
@@ -114,7 +114,7 @@
}
}
- private void initURL( SectionGeneral cfg, INIFile ini, String resolvedSectionId )
+ private void initURL( SectionGeneral cfg, IniFile ini, String resolvedSectionId )
throws ToolException
{
Hashtable section = ini.getSection( resolvedSectionId );
Deleted: trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java 2007-12-29 01:18:51 UTC (rev 228)
+++ trunk/equanda-util/src/main/java/org/equanda/util/INIFile.java 2007-12-30 11:22:27 UTC (rev 229)
@@ -1,401 +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.util;
-
-import javolution.lang.TextBuilder;
-
-import java.io.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- * Class to manipulate .ini files.
- * Keys can be case dependent or case independent.
- * Comments are discarded.
- * File is kept in memory and needs to be explicitly saved.
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- */
-public class INIFile
-{
- private Hashtable<String, Hashtable<String, String>> sections = new Hashtable<String, Ha...
[truncated message content] |
|
From: <tri...@us...> - 2007-12-29 01:18:56
|
Revision: 228
http://equanda.svn.sourceforge.net/equanda/?rev=228&view=rev
Author: triathlon98
Date: 2007-12-28 17:18:51 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
improve docs
Modified Paths:
--------------
trunk/src/site/wiki/gettingstarted.wiki
Modified: trunk/src/site/wiki/gettingstarted.wiki
===================================================================
--- trunk/src/site/wiki/gettingstarted.wiki 2007-12-29 00:53:47 UTC (rev 227)
+++ trunk/src/site/wiki/gettingstarted.wiki 2007-12-29 01:18:51 UTC (rev 228)
@@ -8,7 +8,7 @@
- Install [maven|http://maven.apache.org/]. It has been tested with v2.07, higher versions should also work, not sure about lower versions.
- Download and install [firebird|http://www.firebirdsql.org].
-- Download the jboss, it is easiest to use this [equanda tuned configuration|http://www.progs.be/equandajboss-4.2.2.zip] of 4.2.2GA. Unzip at a location of your choice. Or you can [tune your own|jbosstuning.html] copy.
+- Download jboss, it is easiest to use this [equanda tuned configuration|http://www.progs.be/equandajboss-4.2.2.zip] of 4.2.2GA. Unzip at a location of your choice. Or you can [tune your own|jbosstuning.html] copy.
- Download the example application at [http://www.progs.be/equanda-example.tgz] (or get it from svn). Unzip at a location of your choice.
h2. Prepare the deployment
@@ -18,14 +18,83 @@
isql -u myusername -p mypassword
CREATE DATABASE "/home/joachim/data/example-data.fdb" DEFAULT CHARACTER SET UTF8;
{code}
-- Adjust you maven settings file to specify the database location
+- Adjust you maven settings file to specify the database location. This is the file .m2/settings.xml under your home directory.
{code}
-.....
+<settings>
+ <profiles>
+ <profile>
+ <id>mine</id>
+ <properties>
+ <!-- selenium properties-->
+ <firefox.path>firefox /usr/lib/firefox/firefox-bin</firefox.path>
+
+ <!-- example app -->
+ <example.db.url>jdbc:firebirdsql:localhost/3050:/home/joachim/data/example.fdb</example.db.url>
+ <example.db.login>sysdba</example.db.login>
+ <example.db.password>masterkey</example.db.password>
+ <example.db.location>/home/joachim/data/example.fdb</example.db.location>
+ <example.db.empty>/home/joachim/data/example-empty.fdb</example.db.empty>
+ <example.cargo.wait>true</example.cargo.wait>
+ <example.jboss.home>/home/joachim/java/examplejboss</example.jboss.home>
+ <example.jboss.config>equanda</example.jboss.config>
+ <example.jboss.host>localhost</example.jboss.host>
+ <example.jboss.port>8080</example.jboss.port>
+ <example.jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </example.jboss.jvmargs>
+ <example.jboss.logging>medium</example.jboss.logging>
+
+ </properties>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>mine</activeProfile>
+ </activeProfiles>
+ <pluginGroups>
+ <pluginGroup>org.equanda</pluginGroup>
+ </pluginGroups>
+
+</settings>
{code}
-- Assure that the data source as defined in jboss is correct.
+You need to check all the settings, but specifically the "example.db.url" contains the database location and "example.jboss.home" contains the jboss location.
+- Assure that the data source as defined in jboss is correct. This is part of the server/equanda/deploy/equanda-example-ds.xml file.
{code}
-.....
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connection-factories>
+
+<local-tx-datasource>
+ <jndi-name>exampleDS</jndi-name>
+
+ <connection-url>jdbc:firebirdsql:localhost/3050:/home/joachim/data/example.fdb</connection-url>
+ <driver-class>org.firebirdsql.jdbc.FBDriver</driver-class>
+ <transaction-isolation>TRANSACTION_REPEATABLE_READ</transaction-isolation>
+ <connection-property name="lc_ctype" type="java.lang.String">UNICODE_FSS</connection-property>
+ <connection-property name="maxStatements">10</connection-property>
+ <user-name>SYSDBA</user-name>
+ <password>masterkey</password>
+
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>200</max-pool-size>
+ <blocking-timeout-millis>5000</blocking-timeout-millis>
+ <idle-timeout-minutes>15</idle-timeout-minutes>
+
+ <check-valid-connection-sql>SELECT CAST(1 as INTEGER) FROM rdb$database</check-valid-connection-sql>
+ <exception-sorter-class-name>be.unid.util.FirebirdExceptionSorter</exception-sorter-class-name>
+
+ <track-statements>false</track-statements>
+ <prepared-statement-cache-size>0</prepared-statement-cache-size>
+
+ <metadata>
+ <type-mapping>Firebird</type-mapping>
+ </metadata>
+</local-tx-datasource>
+
+</connection-factories>
{code}
+Specifically, the contents of the "connection-url" tag may need changing.
h2. Deploy and run
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@pr...> - 2007-12-29 01:12:17
|
See http://hudson.equanda.org/job/equanda/org.equanda$equanda-util/124/changes |
|
From: <tri...@us...> - 2007-12-29 00:53:48
|
Revision: 227
http://equanda.svn.sourceforge.net/equanda/?rev=227&view=rev
Author: triathlon98
Date: 2007-12-28 16:53:47 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
EQ-118 change references to "object model" into "domain model"
Modified Paths:
--------------
equanda-example/example-core/pom.xml
equanda-example/example-core/src/main/java/myapp/example/dm/server/OrganizationMediator.java
equanda-example/example-core/src/main/java/myapp/example/dm/server/UserMediator.java
equanda-example/example-ddltool/pom.xml
equanda-example/example-gui/pom.xml
Added Paths:
-----------
equanda-example/example-core/src/main/java/myapp/example/dm/
equanda-example/src/main/dm/
equanda-example/src/main/dm/dm.ini
equanda-example/src/main/dm/dm.xml
Removed Paths:
-------------
equanda-example/example-core/src/main/java/myapp/example/om/
equanda-example/example-gui/src/main/webapp/css/example.css
equanda-example/src/main/dm/om.ini
equanda-example/src/main/dm/om.xml
equanda-example/src/main/om/
Modified: equanda-example/example-core/pom.xml
===================================================================
--- equanda-example/example-core/pom.xml 2007-12-29 00:34:54 UTC (rev 226)
+++ equanda-example/example-core/pom.xml 2007-12-29 00:53:47 UTC (rev 227)
@@ -20,7 +20,7 @@
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<outputDirectory>?</outputDirectory>
<template>ejb3,import,login</template>
<verifyLanguages>en;nl</verifyLanguages>
Copied: equanda-example/example-core/src/main/java/myapp/example/dm (from rev 217, equanda-example/example-core/src/main/java/myapp/example/om)
Modified: equanda-example/example-core/src/main/java/myapp/example/dm/server/OrganizationMediator.java
===================================================================
--- equanda-example/example-core/src/main/java/myapp/example/om/server/OrganizationMediator.java 2007-12-24 13:09:47 UTC (rev 217)
+++ equanda-example/example-core/src/main/java/myapp/example/dm/server/OrganizationMediator.java 2007-12-29 00:53:47 UTC (rev 227)
@@ -2,9 +2,9 @@
* This file is part of equanda example
*/
-package myapp.example.om.server;
+package myapp.example.dm.server;
-import org.equanda.persistence.om.EquandaPersistenceException;
+import org.equanda.persistence.EquandaPersistenceException;
/**
* Mediator for User object
Modified: equanda-example/example-core/src/main/java/myapp/example/dm/server/UserMediator.java
===================================================================
--- equanda-example/example-core/src/main/java/myapp/example/om/server/UserMediator.java 2007-12-24 13:09:47 UTC (rev 217)
+++ equanda-example/example-core/src/main/java/myapp/example/dm/server/UserMediator.java 2007-12-29 00:53:47 UTC (rev 227)
@@ -3,11 +3,11 @@
*
*/
-package myapp.example.om.server;
+package myapp.example.dm.server;
-import myapp.example.om.server.pm.DMOrganizationBean;
-import org.equanda.persistence.om.EquandaPersistenceException;
-import org.equanda.persistence.om.SelectorsState;
+import myapp.example.dm.server.pm.DMOrganizationBean;
+import org.equanda.persistence.EquandaPersistenceException;
+import org.equanda.persistence.SelectorsState;
import org.apache.log4j.Logger;
/**
Modified: equanda-example/example-ddltool/pom.xml
===================================================================
--- equanda-example/example-ddltool/pom.xml 2007-12-29 00:34:54 UTC (rev 226)
+++ equanda-example/example-ddltool/pom.xml 2007-12-29 00:53:47 UTC (rev 227)
@@ -66,7 +66,7 @@
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
<!-- generate ddltool parameters -->
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<template>ddltool</template>
<!-- run ddltool parameters -->
<database>${example.db.url}</database>
@@ -101,7 +101,7 @@
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
<!-- generate ddltool parameters -->
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<template>ddltool</template>
<!-- run ddltool parameters -->
<database>${example.db.url}</database>
Modified: equanda-example/example-gui/pom.xml
===================================================================
--- equanda-example/example-gui/pom.xml 2007-12-29 00:34:54 UTC (rev 226)
+++ equanda-example/example-gui/pom.xml 2007-12-29 00:53:47 UTC (rev 227)
@@ -31,7 +31,7 @@
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<configuration>
- <sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
+ <sourceDirectory>${basedir}/../src/main/dm</sourceDirectory>
<outputDirectory>?</outputDirectory>
<template>t5gui</template>
</configuration>
Deleted: equanda-example/example-gui/src/main/webapp/css/example.css
===================================================================
--- equanda-example/example-gui/src/main/webapp/css/example.css 2007-12-29 00:34:54 UTC (rev 226)
+++ equanda-example/example-gui/src/main/webapp/css/example.css 2007-12-29 00:53:47 UTC (rev 227)
@@ -1,76 +0,0 @@
-body {
- font-family: tahoma, verdana, arial, sans-serif;
- font-size: 13px;
-}
-
-.borderLogin {
- font-size: 10px;
- text-align: right;
- border: 0;
-}
-
-.borderFooter {
- font-size: 9px;
- text-align: right;
- padding-top: 5px
-}
-
-.submitButton {
- font-weight: bold;
-}
-
-.borderContents {
- padding-top: 4px;
- padding-bottom: 4px;
- text-align: center;
- font-size: 13px;
-}
-
-th {
- font-size: 10px;
- font-weight: bold;
-}
-
-.borderTitleBar {
- background: #EFEFDE;
- color: black;
- text-align: center;
-}
-
-.borderMenuLink {
- float: left;
-}
-
-.borderTitle {
- font-weight: bold;
-}
-
-.reportList {
- -moz-column-count: 2;
- column-count: 2;
-}
-
-.tableList {
- -moz-column-count: 2;
- column-count: 2;
-}
-
-.tableManagerList {
- -moz-column-count: 2;
- column-count: 2;
-}
-
-.displayError {
- background-color: red;
- color: black;
-}
-
-.buttonGroup {
- text-align: center;
- display: block;
-}
-
-.tableRightsSection {
- font-size: 10px;
- text-align: center;
-}
\ No newline at end of file
Copied: equanda-example/src/main/dm (from rev 217, equanda-example/src/main/om)
Copied: equanda-example/src/main/dm/dm.ini (from rev 217, equanda-example/src/main/om/om.ini)
===================================================================
--- equanda-example/src/main/dm/dm.ini (rev 0)
+++ equanda-example/src/main/dm/dm.ini 2007-12-29 00:53:47 UTC (rev 227)
@@ -0,0 +1,42 @@
+[config]
+definition=dm.xml
+generateAll=false
+
+[ejb3]
+package=myapp.example.dm
+
+[t5gui]
+package=myapp.example.gui
+
+[ddltool]
+package=myapp.example.ddltool
+
+[import]
+package=myapp.example.ymport
+
+[login]
+package=myapp.example.login
+
+[extra]
+datasource=java:/exampleDS
+datasource-mapping=Firebird
+security-role=LocalUser,LocalAdmin
+security-role-embedded=LocalUser,LocalAdmin
+security-role-merge-model=LocalUser,LocalAdmin
+security-role-remove=LocalUser,LocalAdmin
+infrastructure=true
+lazylist-cache-capacity=100
+lazylist-cache-expiration=3000
+fetch-batch-size=100
+link-fetch-batch-size=100
+multiple-fetch-batch-size=100
+entity-manager-name=example-em
+skip-jalopy=true
+skip-xml-check=true
+security-domain=example
+ejb-package=myapp.example.dm
+default-role=LocalUser
+
+[database,example]
+type=firebird
+convert=org.equanda.domain.db.Max31Convert
Copied: equanda-example/src/main/dm/dm.xml (from rev 217, equanda-example/src/main/om/om.xml)
===================================================================
--- equanda-example/src/main/dm/dm.xml (rev 0)
+++ equanda-example/src/main/dm/dm.xml 2007-12-29 00:53:47 UTC (rev 227)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE equanda SYSTEM "equanda.dtd">
+
+<equanda>
+ <database name="example">
+ <table dir="."/>
+ </database>
+
+ <type name="referenceString" length="30"/>
+ <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"/>
+</equanda>
Deleted: equanda-example/src/main/dm/om.ini
===================================================================
--- equanda-example/src/main/om/om.ini 2007-12-24 13:09:47 UTC (rev 217)
+++ equanda-example/src/main/dm/om.ini 2007-12-29 00:53:47 UTC (rev 227)
@@ -1,42 +0,0 @@
-[config]
-definition=om.xml
-generateAll=false
-
-[ejb3]
-package=myapp.example.om
-
-[t5gui]
-package=myapp.example.gui
-
-[ddltool]
-package=myapp.example.ddltool
-
-[import]
-package=myapp.example.ymport
-
-[login]
-package=myapp.example.login
-
-[extra]
-datasource=java:/exampleDS
-datasource-mapping=Firebird
-security-role=LocalUser,LocalAdmin
-security-role-embedded=LocalUser,LocalAdmin
-security-role-merge-model=LocalUser,LocalAdmin
-security-role-remove=LocalUser,LocalAdmin
-infrastructure=true
-lazylist-cache-capacity=100
-lazylist-cache-expiration=3000
-fetch-batch-size=100
-link-fetch-batch-size=100
-multiple-fetch-batch-size=100
-entity-manager-name=example-em
-skip-jalopy=true
-skip-xml-check=true
-security-domain=example
-ejb-package=myapp.example.om
-default-role=LocalUser
-
-[database,example]
-type=firebird
-convert=org.equanda.domain.db.Max31Convert
Deleted: equanda-example/src/main/dm/om.xml
===================================================================
--- equanda-example/src/main/om/om.xml 2007-12-24 13:09:47 UTC (rev 217)
+++ equanda-example/src/main/dm/om.xml 2007-12-29 00:53:47 UTC (rev 227)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE equanda SYSTEM "equanda.dtd">
-
-<equanda>
- <database name="example">
- <table dir="."/>
- </database>
-
- <type name="referenceString" length="30"/>
- <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"/>
-</equanda>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@pr...> - 2007-12-29 00:41:34
|
See http://hudson.equanda.org/job/equanda/org.equanda$equanda-util/123/changes |
|
From: <tri...@us...> - 2007-12-29 00:34:57
|
Revision: 226
http://equanda.svn.sourceforge.net/equanda/?rev=226&view=rev
Author: triathlon98
Date: 2007-12-28 16:34:54 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/src/site/wiki/om.wiki
Deleted: trunk/src/site/wiki/om.wiki
===================================================================
--- trunk/src/site/wiki/om.wiki 2007-12-29 00:34:14 UTC (rev 225)
+++ trunk/src/site/wiki/om.wiki 2007-12-29 00:34:54 UTC (rev 226)
@@ -1,646 +0,0 @@
-h1. Object model
-
-The base for most of the generation done in equanda is the object model description.
-
-
-
-
-<!--
- This file is part of the equanda project.
-
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Code generated by applying this template can be freely used.
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
-
- This is the dtd for the XML description of the data model for the application
-
- Contributor(s):
- Joachim Van der Auwera (jo...@pr...)
- NetRom team
- -->
-
-<!ENTITY % integer "CDATA">
-<!-- a <integer>, for lack of more accurate description -->
-
-<!ENTITY % param.tag 'if'>
-
-
-<!-- a equanda description can be split into multiple files, the main file always has a "equanda" root element -->
-<!ELEMENT equanda ((type)*,(database|%param.tag;)*, (user-interface)?)>
-
-<!-- define the tables which are part of a physical database -->
-<!ELEMENT database (table|%param.tag;)*>
-<!ATTLIST database
-name CDATA #REQUIRED>
-
-<!--
- Table definition. this can be internal in the XML file, or defined in (a) separate file(s).
- When defined in separate file(s) the "file" or "dir" attribute should be used
- "file" indicates the name of the file containing the table definition
- "dir" indicates the directory. All *.table files will be added as table definitions
- When this is the actual table definition, then
- "name" is the name for this table, an error should be reported when not unique
- "type" is a four letter string which is used as table identifier. This should be unique within the
- tree of tables which share the same root table.
- "extends" is the name a a Java type which should be used as base object
- "expected-amount" is an info about the expected number of records for this table. This is used in GUI.
--->
-<!ELEMENT table (
- (description)?,
- (template|%param.tag;)*,
- (include)*,
- (data-filter)*,
- (default-instance)?,
- (security-role)?,
- (security-role-remove)?,
- (cascade-keep)?,
- (page|%param.tag;)*,
- (cloneable|not-cloneable)?,
- (constraints|%param.tag;)?,
- (hide|no-hide)?,
- (select|%param.tag;)*,
- (build|%param.tag;)*,
- (action|%param.tag;)*
- )>
-<!ATTLIST table
-name CDATA #IMPLIED
-file CDATA #IMPLIED
-dir CDATA #IMPLIED
-extends CDATA #IMPLIED
-type CDATA #IMPLIED
-expected-amount (small|medium|large) "large"
-category CDATA #IMPLIED
->
-
-<!--
- Template table definition.
- This is actually a kind of inheritance. As Java only supports single inheritance, the inheritance on the
- generated mediators is only for the first template. For the other templates all fields and constraints
- are implicitly copied.
- In the templates, it is possible to overwrite default values for fields.
--->
-<!ELEMENT template (overwrite-default|%param.tag;)*>
-<!ATTLIST template
-parent CDATA #REQUIRED>
-
-<!ELEMENT overwrite-default (#PCDATA)>
-<!ATTLIST overwrite-default
-field CDATA #REQUIRED>
-
-<!--
- Specify that this table type is the default instance type.
- POssibly give a class to indicate the default type.
- You can set whether it is forced that all instanced are of default type.
- There should only be one default-instance tag in a table hierarchy.
- This only has effect for the generated pages and components.
--->
-<!ELEMENT default-instance (#PCDATA)>
-<!ATTLIST default-instance
-class CDATA #IMPLIED
-force (true|false) "false">
-
-
-<!--
- Comma separated list of roles which can access the enclosing entity (field/table/selector/...)
- There is a special security-role (NONE), meaning the corresponding ejb methods for that entity
- will be unchecked.
- For entities other than tables, if the security-role is missing, the one from the root table is
- used.
- -->
-<!ELEMENT security-role (#PCDATA)>
-
-<!--
- Comma seperated list of roles which can access the function removeEntity.
- If missing, this method will not be generated.
--->
-<!ELEMENT security-role-remove (#PCDATA)>
-
-
-<!--
- A table is always split into at least one page.
- This is a visual separation, indicating typically the tab page which contains the field.
--->
-<!ELEMENT page ((description)?,(field|group|include|%param.tag;)*, (hide|no-hide)?)>
-<!ATTLIST page
-name CDATA #IMPLIED>
-
-<!--
- These are filters which are applied to all the selectors.
- When the value is comma seperated, this is treated the same as having one tag for each.
--->
-<!ELEMENT data-filter (#PCDATA)>
-
-
-
-<!-- Allow grouping of fields. In a GUI this could be represented by a box around the items. -->
-<!ELEMENT group ((description)?,(field|group|include|%param.tag;)*, (hide|no-hide)?)>
-<!ATTLIST group
-name CDATA "">
-
-<!--
- Definition of a database field.
- For multiple fields, you can also define the name in singular (default is the name without trailing
- "s" if any). This name is used for add and remove methods.
- Some of the constraints need extra explications.
- An internal field is not available for read or write to the outside.
- A calculated field has no DB representation and is calculated when requested. It has no setter.
- A "auto" field has no setter, but is set by as a side-effect of some actions (much like an internal
- field, except this there is a getter for this).
- "length" is the maximum size of string fields, and the maximum number of digits for int and double fields in GUI.
- "display-length" is the number of characters used in GUI for the textbox of this field. Can be different from "length".
- of the widget for that field. Default length for strings is 50. Default length
- for dates and timestamps is 10. Default length for int and double is 5.
- renderer is extra info for rendering the field in GUI.
- -->
-<!ELEMENT field ( (description)?,
- (internal)?,
- (link-name)?,
- (choice)*,
- (multiple)?,
- (owner)?,
- (embedded)?,
- (auto|calculated)?,
- (other-side-multiple|other-side-single)?,
- (use-relation-table|use-relation-field)?,
- (cascade-delete|cascade-keep|allow-delete)?,
- default?,
- suggest?,
- (cloneable|not-cloneable)?,
- (constraints|%param.tag;)?,
- (display|no-display)?,(hide|no-hide)?,
- (ws-value)?, (ws-role)?,
- (indexed)?,
- (case)?,
- (security-role)?,
- (is-reference)?,
- (is-description)?,
- (include)*
- )>
-<!ATTLIST field
-name CDATA #REQUIRED
-singular CDATA #IMPLIED
-type CDATA "string"
-length %integer; #IMPLIED
-display-length %integer; #IMPLIED
-renderer CDATA #IMPLIED
-priority %integer; "5"
->
-
-<!-- simple type definition, which allows certain field settings to be filled automatically -->
-<!ELEMENT type (
- (internal)?,
- (choice)*,
- (multiple)?,
- (owner)?,
- (embedded)?,
- (auto|calculated)?,
- (other-side-multiple|other-side-single)?,
- (use-relation-table|use-relation-field)?,
- (cascade-delete|cascade-keep|allow-delete)?,
- default?,
- suggest?,
- (constraints|%param.tag;)?,
- (display|no-display)?,(hide|no-hide)?,
- (ws-value)?, (ws-role)?,
- (indexed)?,
- (case)?,
- (security-role)?,
- (is-reference)?,
- (is-description)?
- )>
-<!ATTLIST type
-name CDATA #REQUIRED
-type CDATA "string"
-length %integer; #IMPLIED
-display-length %integer; #IMPLIED
-renderer CDATA #IMPLIED
->
-
-<!--
- This node will be replaced by the content of the file specified by "file"
- File must exist if the attribute "required" is set to true
--->
-<!ELEMENT include EMPTY>
-<!ATTLIST include
-file CDATA #REQUIRED
-required CDATA #IMPLIED
->
-
-
-<!--
- Not allowed for date and timestamp fields
- Not allowed for for auto and calculated, and multiple.
- class, if specified, must extend org.equanda.validation.Choices
--->
-
-<!ELEMENT choice (description)?>
-<!ATTLIST choice
-class CDATA #IMPLIED
-name CDATA #IMPLIED
-value CDATA #IMPLIED>
-
-<!ELEMENT description (#PCDATA)>
-
-<!--
- Not allowed for int and double fields
--->
-<!ELEMENT multiple EMPTY>
-
-<!--
- Indicates that this field is a reference or description field, to allow searching using "-", "\-\-" and "?" constructs.
--->
-<!ELEMENT is-reference EMPTY>
-<!ELEMENT is-description EMPTY>
-
-
-<!--
- Requires a bidirectional link and removes the posibility to have an unlinked
- record on the other side of the link
--->
-<!ELEMENT embedded EMPTY>
-
-<!--
- Indicates the owner of the relationship.Alowed only on bidirectional links.
- For 1-N and N-1 this is defaulted to the 1 side.
- For 1-1 and N-N this has to be specified.
--->
-<!ELEMENT owner EMPTY>
-
-<!--
- Indication of multiplicity for linked fields. By default 1-N or N-1 link.
--->
-<!ELEMENT other-side-multiple EMPTY>
-<!ELEMENT other-side-single EMPTY>
-
-<!--
- Indication, for the 1 side of a bidirectional 1-N link, that a relation table should be created or not.
--->
-<!ELEMENT use-relation-table EMPTY>
-<!ELEMENT use-relation-field EMPTY>
-
-<!--
- Indication that for a link field, to delete referenced items when the parent is deleted
- The link field must be single and bidirectional.
--->
-<!ELEMENT cascade-delete EMPTY>
-
-<!--
- Indication that for a link field, do not delete when there is a referenced record.
- This works on the reverse side. When table A has a link to table B which is marked as cascade-keep,
- then attempts to delete a record from B which is linked in A will fail.
--->
-<!ELEMENT cascade-keep EMPTY>
-
-<!--
- Indication for a link field, to allow delete without any checks.
--->
-<!ELEMENT allow-delete EMPTY>
-
-<!--
- Specify the default value for a field.
- The default value can be calculated in the mediator (type="auto"), similar to auto variables,
- or can be calculated using a specific class (implementation of org.equanda.validation.Default).
--->
-<!ELEMENT default (#PCDATA)>
-<!ATTLIST default
-type (value|auto|class) "value">
-
-<!--
- auto fields are calculated by the application and stored in the database. They have no setter.
- not that auto fields are not cloneable by default (but this can be overwritten)
--->
-<!ELEMENT auto EMPTY>
-
-<!-- calculated fields are calculated when requested, they are not stored in the database -->
-<!ELEMENT calculated EMPTY>
-
-<!ELEMENT cloneable EMPTY>
-<!ELEMENT not-cloneable EMPTY>
-
-<!--
- ws-value allow replacement of a UOID with one of the referenced (string) fields for the WS interface
- Only for link fields.
- -->
-<!ELEMENT ws-value (#PCDATA)>
-
-<!--
- Indicate the roles which may view this value, default is "all".
- Other possible values are "none", or a
- space or comma seperated list of roles
--->
-<!ELEMENT ws-role (#PCDATA)>
-
-<!--
- <display> marks a field for display in a list which represents the object,
- in the data (eg xml) for the object when referenced, etc.
-
- <hide> indicates that the field should not be displayed in the user interface
- A hidden field gets a default ws-role of "none" (only if the "if-class" attribute is null).
- The attribute if-class indicates a class which is used at runtime to determine if the field should be visible or not.
-
- When both "display" and "hide" are indicated, then "hide" should have precedence.
-
- no-display and no-hide are used allow you to make default values explicit
-
- default values are no-display and no-hide, except for <internal> fields, where the default is hide
--->
-<!ELEMENT display EMPTY>
-<!ELEMENT hide EMPTY>
-<!ATTLIST hide
-if-class CDATA #IMPLIED>
-
-<!ELEMENT no-display EMPTY>
-<!ELEMENT no-hide EMPTY>
-
-<!-- Indicates whether there should be a databaase index for this field -->
-<!ELEMENT indexed EMPTY>
-
-<!-- Indicates a conversion for String fields
- Value can be one of "upper", "lower", "mixed"
- Class is a class name, indicating an implementation of org.equanda.validation.CaseConverter
- Not allowed for calculated and auto fields.
- -->
-<!ELEMENT case EMPTY>
-<!ATTLIST case
-value CDATA #IMPLIED
-class CDATA #IMPLIED>
-
-
-<!ELEMENT internal EMPTY>
-<!ELEMENT link-name (#PCDATA)>
-
-<!ELEMENT constraints (unique|required|immutable|immutable-if|mutable-even-if|compare|value-when-null|value-when-zero|%param.tag;)*>
-
-<!--
- Unique fields are not allowed to be multiple, calculated, link.
--->
-<!ELEMENT unique EMPTY>
-<!ATTLIST unique
-convert-class CDATA #IMPLIED>
-
-
-<!ELEMENT immutable EMPTY>
-<!ELEMENT required EMPTY>
-
-<!ELEMENT immutable-if EMPTY>
-<!ATTLIST immutable-if
-field CDATA #REQUIRED>
-
-<!ELEMENT mutable-even-if EMPTY>
-<!ATTLIST mutable-even-if
-field CDATA #REQUIRED
-when CDATA #IMPLIED>
-
-<!--
- Constraint where fields need to be compared. Can be defined at field or table level.
- test can be one of: =,!=,<,>,<=,>=
- For boolean fields, only "=" and "!=" are allowed as tests for compare.
- Not allowed for compare for auto and calculated, and multiple.
- If defined at table level, left can not be immutable
--->
-<!ELEMENT compare EMPTY>
-<!ATTLIST compare
-test CDATA #REQUIRED
-value CDATA #IMPLIED
-left CDATA #IMPLIED
-right CDATA #IMPLIED>
-
-<!--
- Replace the value which is returned by the value of another field when the value for this field is null.
-
- Only allowed for string, timestamp and date fields, but not for multiple fields.
-
- Path (if specified) is the name of a field linked to a table which contains the specified field. Otherwise, the field
- should be in the current table.
- -->
-<!ELEMENT value-when-null EMPTY>
-<!ATTLIST value-when-null
-field CDATA #REQUIRED
-path CDATA #IMPLIED
->
-
-
-<!--
- Replace the value which is returned by the value of another field when the value for this field is zero.
-
- Only allowed for int and double and boolean fields, but not for multiple fields.
-
- Path (if specified) is the name of a field linked to a table which contains the specified field. Otherwise, the field
- should be in the current table.
- -->
-<!ELEMENT value-when-zero EMPTY>
-<!ATTLIST value-when-zero
-field CDATA #REQUIRED
-path CDATA #IMPLIED
->
-
-
-<!--
- define a selector method which selects records based on the selection criteria
- A select can either define criteria (selection tags), or define a list of subselects.
- Subselects are a way to build brackets in the selection. The operator which has to be used can be specified.
- The "TRY" operator is special. The subselects are tried in order.
- When there was no result, the next subselect is executed.
- The "ADD" operator is similar, but the result is a combination of the results of the subselects.
- Though not specified by this model, a (sub)select should have either subselect of selection children,
- not a combination.
- "TRY" and "ADD" are not allowed for selects with direct selections (no subselects)
- "order" is the name of the field, to be used in a order by clause. EQUANDA_MODIFIED is also supported.
- The field used for order is not allowed to be one of multiple, boolean, link.
- You may indicate "-field" to have descending order or just "field" for ascending order.
- "limit"="yes" means the query will have a limit clause too. (Parameter for "limit" is variable).
- "limit" and "order" are not allowed for selects of type "single".
--->
-<!ELEMENT select ( (description)?,
- (subselect|%param.tag;)*,
- (selection|%param.tag;)*,
- (query)?,
- (security-role)?,
- (hide|no-hide)?,
- (view-filter)?
- )>
-<!ATTLIST select
-name CDATA #REQUIRED
-type (single|multiple) "multiple"
-operator (AND|OR|TRY|ADD) "AND"
-order CDATA #IMPLIED
-limit (no|yes) "no">
-
-<!ELEMENT subselect ( (description)?,
- (subselect|%param.tag;)*,
- (selection|%param.tag;)*,
- (query)?
- )>
-<!ATTLIST subselect
-operator (AND|OR) "AND">
-
-<!--
- field is used for the field to select on
- EQUANDA_MODIFIED can be used as a selection too.
- field cannot be link or calculated.
- table if the (root) table this field is part of, defaults to the table in which the selector is defined
- path is the path which is used to get from the current table to the other table, defaults to the table attribute
- name is the variable name for the parameter on the selector method (defaults to the fields name)
- from in a possible extra part for the from clause in the EJB-QL statement
- base is the base object which is added before the path (default "o")
- test can be one of: =,!=,<,>,<=,>=,is null,is not null,like
- is null, is not null are not allowed for int, boolean and double fields.
- like is (partialy) supported. For strings only, you can use an expression "like _?%" (with wildcard), as test. For
- the rest of types, the substring after "like" is currently neglected.
- parameter indicates whether this is a parameter to the method or not (allows you to reuse a parameter more than once)
--->
-<!ELEMENT selection (suggest)?>
-<!ATTLIST selection
-field CDATA #REQUIRED
-table CDATA #IMPLIED
-path CDATA #IMPLIED
-name CDATA #IMPLIED
-from CDATA #IMPLIED
-base CDATA #IMPLIED
-test CDATA #IMPLIED
-parameter (true|false) "true">
-
-<!--
- Query allow you to explicitly define the EJB-QL query which needs to be used for a selector.
- The (order and type of the) parameters are defined using the preceding selection tags.
--->
-<!ELEMENT query (#PCDATA)>
-
-
-<!--
- Comma separated list of filter names. The select is only visible in gui if NONE of these filters is active.
--->
-<!ELEMENT view-filter (#PCDATA)>
-
-<!ELEMENT build ((description)?,(parameter|%param.tag;)*,(set|%param.tag;)*,security-role?)>
-<!ATTLIST build
-name CDATA #REQUIRED>
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-field CDATA #REQUIRED>
-
-<!--
- An action can be defined on a table. These actions always have to be coded in the Mediator class
- It is advised (but not enforced) that action names do not clash with field names.
-
- An action can have parameters. The type of these has to be defined as well.
- Parameters should be either simple types, of fully qualified
--->
-<!ELEMENT action ((description)?, (parameter|%param.tag;)*, security-role?, (hide|no-hide)?)>
-<!ATTLIST action
-name CDATA #REQUIRED
-return CDATA "void"
->
-
-<!ELEMENT parameter ((description)?, (suggest)?, (case)?)>
-<!ATTLIST parameter
-type CDATA #REQUIRED
-name CDATA #IMPLIED
->
-
-
-<!--
- Suggest is something used in GUI, to show a default for a parameter of an action or selector.
- For selectors and fields, the variants with field and field-with-path are not usable (there is no "current" object,
- so you could reference a value of a field in it).
-
- It can be:
- - a value (a value of the type of the parameter).
- - a field (a field in the current table).
- - a field and a path (path is a field in the current table, field is in the path table).
- - a table and a field (a table name and a field in that table).
- - a list of values (shown in gui as a choice field), sepparated by comma
-
- Field and Path cannot be multiple
- Field cannot be a link.
- Path should always be a link.
-
- Suggest is only used for parameters of type string, boolean, int, double, date, timestamp
- -->
-<!ELEMENT suggest EMPTY>
-
-<!ATTLIST suggest
-value CDATA #IMPLIED
-field CDATA #IMPLIED
-path CDATA #IMPLIED
-table CDATA #IMPLIED
-value-list CDATA #IMPLIED
->
-
-
-
-
-<!--
- Definition of the standard user-interface for the application.
-
- The "start" attribute defines the start window (after the login screen of course).
-
- In general, the ui consists of windows which can be defined. Each window has a menu
- (in the Cocoon GUI this is displayed on the left). Each window can have its own menu,
- but by default the menu from the parent structure is used (if nothing else is defined).
-
- Therefore, the <menu> defined under <user-interface> is the default menu for all windows in IC-trace.
-
- A menu can contain several menu-item objects.
- A menu item typically has a label. The name of the label is used to search the i18n text.
- The contents of the label tag are the default value for the label (as put in the messages.xml file).
- A menu-item can optionally have an icon image. This image is assumed to be 64x64 in size.
- The picture needs to be stored in a place where it can be retrieved by Cocoon (some picture resources directory).
- The action defines what has to happen when the item is indicated.
- The "window" attribute means that a new window needs to be opened (a link for Cocoon GUI).
- For other types of objects etc, this could also point to a class which contains an action method or something.
-
- Similar to the table definitions, windows can either be defined inline (as is the case for the "main" window,
- or can be included individually (file attribute) or in batch (dir attribute, extension "window").
-
- The current GUI, which is generated from the database definition already contains many windows.
- To make these useable and properly integrated a consistent naming scheme for the windows
- (this will most likely match URLs, with an alias of index for the "start" page).
- I suggest prefixing all the current pages with "equanda-" and making that reserved
- (so not allowing that prefix in the window name).
- To access the reports, a fixed name has to be provided for those as well, with a prefix like "equandaReport-".
-
- To make it all work consistently, I also suggest splitting up the sitemap in three parts.
- There currently are already two parts for the gui and for the reporting.
- The pages/windows which are defined in the definition file could probably best be placed in a third sitemap file
- (making that file generated and the other two fixed).
-
- When there is no "user-interface" definition in the definition file, than the default start page could be
- what it is now (what I called "equanda-Database").
--->
-<!ELEMENT user-interface ((description)?, menu?)>
-<!ATTLIST user-interface
-start CDATA #IMPLIED>
-
-<!ELEMENT menu ((description)?, (menu-item)*)>
-
-<!ELEMENT menu-item ((description)?, (label), (icon), (menu-action))>
-
-<!ELEMENT menu-action EMPTY>
-<!ATTLIST menu-action
-window CDATA #REQUIRED>
-
-<!ELEMENT label (#PCDATA)>
-<!ATTLIST label
-name CDATA #REQUIRED>
-
-<!ELEMENT icon (#PCDATA)>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-29 00:34:17
|
Revision: 225
http://equanda.svn.sourceforge.net/equanda/?rev=225&view=rev
Author: triathlon98
Date: 2007-12-28 16:34:14 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java
Deleted: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java 2007-12-29 00:33:30 UTC (rev 224)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java 2007-12-29 00:34:14 UTC (rev 225)
@@ -1,162 +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.plugin;
-
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
-import org.equanda.util.INIFile;
-import org.equanda.generate.Generator;
-
-import java.util.Locale;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Create reports with the object model in various formats (html, mm (freemind), ...)
- *
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- * @goal omreport
- * @phase site
- * @description equanda maven plugin to generate site report for object model description
- */
-public class OmReportPlugin
- extends AbstractMavenReport
-{
- /**
- * Location where generated html will be created.
- *
- * @parameter expression="${project.reporting.outputDirectory}"
- */
- private String outputDirectory;
-
- /**
- * Doxia Site Renderer
- *
- * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
- * @required @readonly
- */
- private SiteRenderer siteRenderer;
-
- /**
- * Maven Project
- *
- * @parameter expression="${project}"
- * @required @readonly
- */
- private MavenProject project;
-
- /**
- * The filename to use for the report.
- *
- * @parameter expression="${outputName}" default-value="omdoc"
- * @required
- */
- private String outputName;
-
- /**
- * @parameter expression="${basedir}/src/main/om"
- * @required
- */
- private String sourceDirectory;
-
- /**
- * @parameter expression="om.ini"
- * @required
- */
- private String configurationFile;
-
- /**
- * @parameter expression="docs"
- */
- private String template;
-
- protected String getOutputDirectory()
- {
- return outputDirectory;
- }
-
- protected SiteRenderer getSiteRenderer()
- {
- return siteRenderer;
- }
-
- protected MavenProject getProject()
- {
- return project;
- }
-
- public String getDescription( Locale locale )
- {
- return "Object Model (om) description";
- }
-
- public String getName( Locale locale )
- {
- return "omreport";
- }
-
- public String getOutputName()
- {
- return outputName;
- }
-
- protected void executeReport( Locale locale )
- throws MavenReportException
- {
- String outFiles = outputDirectory;
- if ( !outFiles.endsWith( File.separator ) ) outFiles += File.separatorChar;
- outFiles += outputName;
-
- // build directories etc
-
- INIFile ini;
- String iniName = sourceDirectory + File.separatorChar + configurationFile;
- try
- {
- ini = new INIFile( iniName );
- }
- catch ( IOException ioe )
- {
- throw new MavenReportException( "Could not read configuration file", ioe );
- }
- ini.addValue( "config", "outputdir", outFiles );
- ini.addValue( "config", "template", template );
-
- Generator generator = new Generator( ini, sourceDirectory );
- generator.generate();
- if ( generator.getFailed() )
- {
- throw new MavenReportException( "equanda generation failed" );
- }
-
- // include project main page
- String mainPage = "<html><head><title>om-doc</title></head><body>object model documents</body>";
- Sink sink = getSink();
- sink.rawText( mainPage );
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-29 00:33:33
|
Revision: 224
http://equanda.svn.sourceforge.net/equanda/?rev=224&view=rev
Author: triathlon98
Date: 2007-12-28 16:33:30 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/equanda-util/src/test/java/org/equanda/util/OMExtensionTest.java
Deleted: trunk/equanda-util/src/test/java/org/equanda/util/OMExtensionTest.java
===================================================================
--- trunk/equanda-util/src/test/java/org/equanda/util/OMExtensionTest.java 2007-12-28 23:34:51 UTC (rev 223)
+++ trunk/equanda-util/src/test/java/org/equanda/util/OMExtensionTest.java 2007-12-29 00:33:30 UTC (rev 224)
@@ -1,77 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.util;
-
-import junit.framework.TestCase;
-
-import java.util.ArrayList;
-
-import org.equanda.util.script.DMExtension;
-import murlen.util.fscript.FSFastExtension;
-
-public class OMExtensionTest
- extends TestCase
-{
- private static final String TEST_TIME1 = "2005-08-01 16:05:12.0";
- private static final String TEST_TSTR1 = "20050801160512.000";
- private static final String TEST_TIME2 = "2003-01-21 11:01:24.514";
- private static final String TEST_TSTR2 = "20030121110124.514";
- private static final String TEST_TIME3 = "2005-12-28 18:10:30.29";
- private static final String TEST_TSTR3 = "20051228181030.290";
- private static final String TEST_TSTR3I = "20051228181030290";
-
- public void testBuilder()
- throws Exception
- {
- DMExtension ome = new DMExtension();
- FSFastExtension fe = new FSFastExtension();
- ome.addExtension( fe );
-
- ArrayList par = new ArrayList();
- par.add( "" );
- Object res;
-
- par.set( 0, TEST_TSTR1 );
- res=fe.callFunction( "OMTimestamp", par );
- assertEquals( TEST_TIME1, res.toString());
- par.set( 0, res );
- res = fe.callFunction( "OMTimestamp", par );
- assertEquals( TEST_TSTR1, res );
-
- par.set( 0, TEST_TSTR2 );
- res=fe.callFunction( "OMTimestamp", par );
- assertEquals( TEST_TIME2, res.toString());
- par.set( 0, res );
- res = fe.callFunction( "OMTimestamp", par );
- assertEquals( TEST_TSTR2, res );
-
- par.set( 0, TEST_TSTR3I );
- res=fe.callFunction( "OMTimestamp", par );
- assertEquals( TEST_TIME3, res.toString());
- par.set( 0, res );
- res = fe.callFunction( "OMTimestamp", par );
- assertEquals( TEST_TSTR3, res );
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@pr...> - 2007-12-29 00:11:37
|
See http://hudson.equanda.org/job/equanda/org.equanda$equanda-util/122/changes |
|
From: <jo...@pr...> - 2007-12-28 23:42:50
|
See http://hudson.equanda.org/job/equanda/org.equanda$equanda-util/121/changes |
|
From: <tri...@us...> - 2007-12-28 23:34:52
|
Revision: 223
http://equanda.svn.sourceforge.net/equanda/?rev=223&view=rev
Author: triathlon98
Date: 2007-12-28 15:34:51 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
EQ-118 replace all "object model" by "domain model"
assure testcases rely on jboss4.2.2 and work with that version
Modified Paths:
--------------
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java
Added Paths:
-----------
trunk/equanda-util/src/test/java/org/equanda/util/DMExtensionTest.java
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java 2007-12-28 23:21:37 UTC (rev 222)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java 2007-12-28 23:34:51 UTC (rev 223)
@@ -69,8 +69,8 @@
importCredentials = new ImportCredentials( login, paswd );
-// SecurityAssociation.setPrincipal( new SimplePrincipal( login ) );
-// SecurityAssociation.setCredential( paswd.toCharArray() );
+ SecurityAssociation.setPrincipal( new SimplePrincipal( login ) );
+ SecurityAssociation.setCredential( paswd.toCharArray() );
}
catch ( IOException ioe )
{
Copied: trunk/equanda-util/src/test/java/org/equanda/util/DMExtensionTest.java (from rev 222, trunk/equanda-util/src/test/java/org/equanda/util/OMExtensionTest.java)
===================================================================
--- trunk/equanda-util/src/test/java/org/equanda/util/DMExtensionTest.java (rev 0)
+++ trunk/equanda-util/src/test/java/org/equanda/util/DMExtensionTest.java 2007-12-28 23:34:51 UTC (rev 223)
@@ -0,0 +1,77 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.util;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+
+import org.equanda.util.script.DMExtension;
+import murlen.util.fscript.FSFastExtension;
+
+public class DMExtensionTest
+ extends TestCase
+{
+ private static final String TEST_TIME1 = "2005-08-01 16:05:12.0";
+ private static final String TEST_TSTR1 = "20050801160512.000";
+ private static final String TEST_TIME2 = "2003-01-21 11:01:24.514";
+ private static final String TEST_TSTR2 = "20030121110124.514";
+ private static final String TEST_TIME3 = "2005-12-28 18:10:30.29";
+ private static final String TEST_TSTR3 = "20051228181030.290";
+ private static final String TEST_TSTR3I = "20051228181030290";
+
+ public void testBuilder()
+ throws Exception
+ {
+ DMExtension ome = new DMExtension();
+ FSFastExtension fe = new FSFastExtension();
+ ome.addExtension( fe );
+
+ ArrayList par = new ArrayList();
+ par.add( "" );
+ Object res;
+
+ par.set( 0, TEST_TSTR1 );
+ res=fe.callFunction( "DMTimestamp", par );
+ assertEquals( TEST_TIME1, res.toString());
+ par.set( 0, res );
+ res = fe.callFunction( "DMTimestamp", par );
+ assertEquals( TEST_TSTR1, res );
+
+ par.set( 0, TEST_TSTR2 );
+ res=fe.callFunction( "DMTimestamp", par );
+ assertEquals( TEST_TIME2, res.toString());
+ par.set( 0, res );
+ res = fe.callFunction( "DMTimestamp", par );
+ assertEquals( TEST_TSTR2, res );
+
+ par.set( 0, TEST_TSTR3I );
+ res=fe.callFunction( "DMTimestamp", par );
+ assertEquals( TEST_TIME3, res.toString());
+ par.set( 0, res );
+ res = fe.callFunction( "DMTimestamp", par );
+ assertEquals( TEST_TSTR3, res );
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-28 23:21:40
|
Revision: 222
http://equanda.svn.sourceforge.net/equanda/?rev=222&view=rev
Author: triathlon98
Date: 2007-12-28 15:21:37 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
EQ-118 replace all "object model" by "domain model"
assure testcases rely on jboss4.2.2 and work with that version
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-client/src/main/java/org/equanda/export/Export.java
trunk/equanda-client/src/main/java/org/equanda/export/ExportField.java
trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java
trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQuery.java
trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java
trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJBUtil.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
trunk/equanda-generate/src/main/velocity/docs/index.html.vm
trunk/equanda-generate/src/main/velocity/docs.ini
trunk/equanda-generate/src/main/velocity/ejb3/DMFieldBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/EquandaGlobal.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/LazyEJBList.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/LazyProxyList.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/Mediator.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorHelper.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorHelperBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectType.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ProxyObjectUpdater.java.vm
trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm
trunk/equanda-generate/src/main/velocity/import/FieldMap.java.vm
trunk/equanda-generate/src/main/velocity/import/ImportObjectProxy.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginEJBUtil.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/SelectComponentBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/SelectPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm
trunk/equanda-generate/src/site/wiki/templates/gui-descriptors.wiki
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/GeneratePlugin.java
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/TranslatePlugin.java
trunk/equanda-maven-plugin/src/site/wiki/generate.wiki
trunk/equanda-server/pom.xml
trunk/equanda-server/src/main/java/org/equanda/attachment/AttachmentServlet.java
trunk/equanda-server/src/main/java/org/equanda/validation/UniqueConverter.java
trunk/equanda-server/src/main/java/org/equanda/validation/UniqueConverterAdapter.java
trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java
trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java
trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java
trunk/equanda-t5gui/pom.xml
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaGridDataSource.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/translators/UoidTranslator.java
trunk/equanda-t5gui/src/main/site/wiki/index.wiki
trunk/equanda-tapestry4/pom.xml
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/binder/BasicFieldBinder.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/binder/MultipleFieldBinderSource.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/binder/ProxyBinderSource.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/Border.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/ParametersSuggestReturnHandler.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/ParameterInputContainerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/DescriptionInputContainerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaInputBlock/EquandaInputBlock.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/LinkInputBinderWrapper.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/actionHandler/LinkInputActionHandlerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/SelectObject.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/shared/PageGroupCommons.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/HasBidirectionalLinkParameter.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/HasProxyParameter.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationEntryContainer.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationablePageImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/ReturnHandlerField.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/EquandaBasePage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/TapestryHome.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/action/ActionPageParams.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/alerts/Alerts.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/alerts/dataModel/AlertFacade.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/alerts/dataModel/AlertsAdministrationQuery.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/edit/EditPage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/TableMasterDetailBasePage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/TableMasterDetailPageParameters.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/TableMasterDetailReturnHandler.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/parameter/TableParameter.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/select/SelectPageParams.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/shared/AddViewEditManipulation.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/shared/AddViewEditPageParameters.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/tableManager/TableManagerPage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/login/changePassword/ChangePassword.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/startPageConfig/StartPageConfig.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/view/ViewPage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/wiki/ViewPageRedirector.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/LinkFieldSelectionModel.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/RoleSelectionModel.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/squeezeAdaptor/EquandaProxySqueezeAdaptor.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/translator/DisplayTranslator.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/translator/UoidTranslator.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/cache/CacheLoaderPersister.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/cache/UserAdminCache.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/EquandaProxyAccessor.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/Global.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/LoginResolver.java
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ActionMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/AutoFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/BuilderSetSelectorHelper.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/DefaultMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/EquandaRoleMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/LinkableMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/PriorityFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ProgrConstraintsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/SecurMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/SecurSelectorHelper.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/VehicleWithWingsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/VeryDocumentedSelectorHelper.java
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-t4-gui/pom.xml
trunk/equanda-test/test-t4-gui/src/main/webapp/config.properties
trunk/equanda-test/test-test/pom.xml
trunk/equanda-test/test-test/src/test/java/org/equanda/test/applet/EquandaView.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/applet/TestApplet.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/pages/testFilters/TestFilters.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ActionTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/BuilderSetTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ChoicesTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/CloneableTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/CompareTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DefaultTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DelegateTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DowngradeTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EntityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/FieldTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ImmutableIfGlobalInheritedTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ImmutableIfGlobalTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/InheritanceTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/LazyInstTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/LinkTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ModifiedProxyTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/MultipleFieldTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/PriorityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ProgrConstraintsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ProxyTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveLinksTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RequiredFieldsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SecurityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectionTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorUpdateTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsFiltersTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsSortingTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SetEquandaRollbackTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/StringLengthTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SubselectTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TestAdapter.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/TypeTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/UniqueFieldsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java
trunk/equanda-tool/import.ini
trunk/equanda-tool/pom.xml
trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportWorker.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ObjectSelector.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/provider/ReportPrintInfo.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/worker/Worker.java
trunk/equanda-tool/src/site/wiki/ImportServlet.wiki
trunk/equanda-tool/translationsEditor.ini
trunk/equanda-util/pom.xml
trunk/equanda-util/src/main/java/org/equanda/util/accessor/ObjectAccessor.java
trunk/equanda-util/src/site/wiki/index.wiki
trunk/equanda-util/src/test/java/org/equanda/util/OMExtensionTest.java
trunk/pom.xml
trunk/src/site/wiki/config.wiki
trunk/src/site/wiki/gettingstarted.wiki
trunk/src/site/wiki/index.wiki
Added Paths:
-----------
trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ConcurrentModificationException.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaConstraintViolation.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEntity.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaObjectType.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaOperationNotAllowed.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceError.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxy.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxyState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaSelector.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaSelectorHelper.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java
trunk/equanda-client/src/main/java/org/equanda/persistence/HasUOID.java
trunk/equanda-client/src/main/java/org/equanda/persistence/InvalidUOIDException.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LazyEJBListBase.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LazyList.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LazyProxyListBase.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LenientChecksState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java
trunk/equanda-client/src/main/java/org/equanda/persistence/SelectorsState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/SelectorsStateType.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ServerEquandaStateInterceptor.java
trunk/equanda-client/src/main/java/org/equanda/persistence/UOID.java
trunk/equanda-client/src/main/java/org/equanda/persistence/UOIDGenerator.java
trunk/equanda-client/src/main/java/org/equanda/persistence/query/
trunk/equanda-client/src/test/java/org/equanda/persistence/EquandaListTest.java
trunk/equanda-generate/src/main/velocity/docs/dm.mm.vm
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/DmReportPlugin.java
trunk/equanda-test/src/main/dm/
trunk/equanda-test/src/main/dm/dm.ini
trunk/equanda-test/src/main/dm/dm.xml
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/
trunk/equanda-util/src/main/java/org/equanda/util/script/DMExtension.java
trunk/src/site/wiki/dm.wiki
Removed Paths:
-------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/
trunk/equanda-client/src/test/java/org/equanda/persistence/om/
trunk/equanda-test/src/main/dm/om.ini
trunk/equanda-test/src/main/dm/om.xml
trunk/equanda-test/src/main/om/
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2007-12-27 01:30:28 UTC (rev 221)
+++ trunk/equanda-client/pom.xml 2007-12-28 23:21:37 UTC (rev 222)
@@ -30,9 +30,24 @@
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: trunk/equanda-client/src/main/java/org/equanda/export/Export.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-12-27 01:30:28 UTC (rev 221)
+++ trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -24,8 +24,8 @@
package org.equanda.export;
-import org.equanda.persistence.om.UOID;
-import org.equanda.persistence.om.EquandaProxy;
+import org.equanda.persistence.UOID;
+import org.equanda.persistence.EquandaProxy;
import org.equanda.util.Base64;
import org.equanda.util.INIFile;
import org.equanda.util.StringSplitter;
Modified: trunk/equanda-client/src/main/java/org/equanda/export/ExportField.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/ExportField.java 2007-12-27 01:30:28 UTC (rev 221)
+++ trunk/equanda-client/src/main/java/org/equanda/export/ExportField.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -24,7 +24,7 @@
package org.equanda.export;
-import org.equanda.persistence.om.EquandaProxy;
+import org.equanda.persistence.EquandaProxy;
import java.lang.reflect.Method;
import java.util.Collection;
Modified: trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java 2007-12-27 01:30:28 UTC (rev 221)
+++ trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -24,7 +24,7 @@
package org.equanda.export;
-import org.equanda.persistence.om.EquandaProxy;
+import org.equanda.persistence.EquandaProxy;
import javolution.lang.TextBuilder;
import java.lang.reflect.Method;
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/CheckRulesState.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,50 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+/**
+ * Store the state whether declarative rules should be checked or not. This is stored in a ThreadLocal.
+ * When this is false, checks are skipped.
+ * This should only be used internally in the system to avoid double checks (and resulting slowness).
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class CheckRulesState
+{
+ public static final String RULES_CHECKS_STATE_CONTEXT = "equanda-CheckRulesStateContext";
+
+ private static ThreadLocal state = new ThreadLocal()
+ {
+ protected Object initialValue()
+ {
+ return Boolean.TRUE;
+ }
+ };
+
+ public static boolean getCheckRules() { return (Boolean) state.get(); }
+
+ public static void setCheckRules( boolean value ) { state.set( Boolean.valueOf( value ) ); }
+
+}
\ No newline at end of file
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/ClientEquandaStateInterceptor.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ClientEquandaStateInterceptor.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,68 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+/**
+ * Client side interceptor to transport the equanda state to the server as part of the invocation context.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class ClientEquandaStateInterceptor
+ implements Interceptor, Serializable
+{
+ private static final long serialVersionUID = 4536126296845291076L;
+
+ public static final ClientEquandaStateInterceptor singleton = new ClientEquandaStateInterceptor();
+
+ public String getName()
+ {
+ return "ClientEquandaStateInterceptor";
+ }
+
+ public Object invoke( Invocation invocation )
+ throws Throwable
+ {
+ invocation.getMetaData().addMetaData( LenientChecksState.LENIENT_CHECKS_STATE_CONTEXT,
+ LenientChecksState.LENIENT_CHECKS_STATE_CONTEXT,
+ LenientChecksState.getLenientChecks() );
+
+ invocation.getMetaData().addMetaData( SelectorsState.SELECTORS_STATE_CONTEXT,
+ SelectorsState.SELECTORS_STATE_CONTEXT,
+ SelectorsState.getSelectorsState() );
+ return invocation.invokeNext();
+ }
+
+ Object readResolve()
+ throws ObjectStreamException
+ {
+ return singleton;
+ }
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/ConcurrentModificationException.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/ConcurrentModificationException.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ConcurrentModificationException.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ConcurrentModificationException.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,73 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import javax.ejb.ApplicationException;
+
+/**
+ * Exception indicating a concurrent modification
+ *
+ * @author NetRom team
+ */
+@ApplicationException( rollback = true )
+public class ConcurrentModificationException
+ extends EquandaConstraintViolation
+{
+ public static final String DEFAULT_MESSAGE = "CONCURRENT MODIFICATION EXCEPTION";
+
+ private static final long serialVersionUID = 2220363507832990301L;
+
+ public ConcurrentModificationException() {}
+
+ public ConcurrentModificationException( Exception ex )
+ {
+ super( ex );
+ }
+
+ public ConcurrentModificationException( int exceptionCode, Exception ex, String... parameters )
+ {
+ super( exceptionCode, ex, parameters );
+ }
+
+ public ConcurrentModificationException( int exceptionCode, Exception ex )
+ {
+ super( exceptionCode, ex );
+ }
+
+ public ConcurrentModificationException( int exceptionCode, String... parameters )
+ {
+ super( exceptionCode, parameters );
+ }
+
+ public ConcurrentModificationException( int exceptionCode )
+ {
+ super( exceptionCode );
+ }
+
+ String getDefaultMessage()
+ {
+ return DEFAULT_MESSAGE;
+ }
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EJBUtil.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,62 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import javax.naming.InitialContext;
+
+/**
+ * Utility methods for the EJBUtil classes, avoids duplication of common code.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class EJBUtil
+{
+ public static <T> T lookup( String jndiName, Class<T> narrowTo )
+ throws javax.naming.NamingException
+ {
+ return lookup( null, jndiName, narrowTo );
+ }
+
+ public static <T> T lookup( java.util.Hashtable environment, String jndiName, Class<T> narrowTo )
+ throws javax.naming.NamingException
+ {
+ // Obtain initial context
+ InitialContext initialContext = new InitialContext( environment );
+ try
+ {
+ Object objRef = initialContext.lookup( jndiName );
+ // only narrow if necessary
+ if ( narrowTo.isInstance( java.rmi.Remote.class ) )
+ {
+ objRef = javax.rmi.PortableRemoteObject.narrow( objRef, narrowTo );
+ }
+ return (T) objRef;
+ }
+ finally
+ {
+ initialContext.close();
+ }
+ }
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaConstraintViolation.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaConstraintViolation.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaConstraintViolation.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaConstraintViolation.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,73 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import javax.ejb.ApplicationException;
+
+/**
+ * Exception indicating a constraint violation
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@ApplicationException( rollback = true )
+public class EquandaConstraintViolation
+ extends EquandaPersistenceException
+{
+ public static final String DEFAULT_MESSAGE = "CONSTRAINT VIOLATION";
+
+ private static final long serialVersionUID = 2220363507832990306L;
+
+ public EquandaConstraintViolation() {}
+
+ public EquandaConstraintViolation( Exception ex )
+ {
+ super( ex );
+ }
+
+ public EquandaConstraintViolation( int exceptionCode, Exception ex, String... parameters )
+ {
+ super( exceptionCode, ex, parameters );
+ }
+
+ public EquandaConstraintViolation( int exceptionCode, Exception ex )
+ {
+ super( exceptionCode, ex );
+ }
+
+ public EquandaConstraintViolation( int exceptionCode, String... parameters )
+ {
+ super( exceptionCode, parameters );
+ }
+
+ public EquandaConstraintViolation( int exceptionCode )
+ {
+ super( exceptionCode );
+ }
+
+ String getDefaultMessage()
+ {
+ return DEFAULT_MESSAGE;
+ }
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaDowngradeException.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,72 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import javax.ejb.ApplicationException;
+
+/**
+ * Exception indicating a constraint violation
+ *
+ * @author NetRom team
+ */
+@ApplicationException( rollback = false )
+public class EquandaDowngradeException
+ extends EquandaConstraintViolation
+{
+ public static String DEFAULT_MESSAGE = "DOWNGRADE EXCEPTION";
+
+ public EquandaDowngradeException() {}
+
+ public EquandaDowngradeException( Exception ex )
+ {
+ super( ex );
+ }
+
+ public EquandaDowngradeException( int exceptionCode, Exception ex, String... parameters )
+ {
+ super( exceptionCode, ex, parameters );
+ }
+
+ public EquandaDowngradeException( int exceptionCode, Exception ex )
+ {
+ super( exceptionCode, ex );
+ }
+
+ public EquandaDowngradeException( int exceptionCode, String... parameters )
+ {
+ super( exceptionCode, parameters );
+ }
+
+ public EquandaDowngradeException( int exceptionCode )
+ {
+ super( exceptionCode );
+ }
+
+ String getDefaultMessage()
+ {
+ return DEFAULT_MESSAGE;
+ }
+
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEJB.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,50 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+/**
+ * Base interface for both local and remote EJB interfaces (for ObjectBase which is a shared interface for both).
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public interface EquandaEJB
+ extends HasUOID
+{
+ void init( UOID uoid )
+ throws EquandaPersistenceException;
+ void initEntity( EquandaEntity entity )
+ throws EquandaPersistenceException;
+
+ // equanda built-in methods
+
+ java.sql.Timestamp getEquandaModificationDate();
+ String getEquandaType();
+ boolean isEquandaType( String type );
+ String getEquandaName();
+ String getEquandaStatus();
+ void setEquandaStatus( String status );
+
+ void remove();
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEntity.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaEntity.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEntity.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEntity.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,51 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import java.sql.Timestamp;
+
+/**
+ * Marker interface to indicate equanda entity beans (DMObjectBean)
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public interface EquandaEntity
+{
+ UOID getUOID();
+
+ String getEquandaStatus();
+
+ void setEquandaStatus( String status );
+
+ Timestamp getEquandaModificationDate();
+
+ Timestamp getEquandaCreationDate();
+
+ void setEquandaModificationDate( Timestamp modified );
+
+ String getEquandaType();
+
+ long getEquandaVersion();
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaFieldBean.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,64 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Version;
+import javax.persistence.MappedSuperclass;
+import java.sql.Timestamp;
+
+/**
+ * Base implementation for a equanda entity bean (DMFieldBean)
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+@MappedSuperclass
+public class EquandaFieldBean
+{
+ // fields
+ protected UOID uoid;
+ protected Timestamp equandaCreation;
+
+ @EmbeddedId
+ public UOID getUOID()
+ { return uoid; }
+
+ public void setUOID( UOID uoid ) { this.uoid = uoid; }
+
+ @Version
+ @Column(
+ name = "EQUANDA_CREATION"
+ )
+ public Timestamp getEquandaCreationDate()
+ {
+ return equandaCreation;
+ }
+
+ public void setEquandaCreationDate( Timestamp created )
+ {
+ equandaCreation = created;
+ }
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaImportProxy.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,74 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+/**
+ * Some extra mathods which are available in all importproxy objects
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public interface EquandaImportProxy
+{
+ void setUOID( UOID id );
+
+ void setUOID( String id );
+
+ boolean hasUOID();
+
+ String getEquandaType();
+
+ public UOID getUOID();
+
+ java.sql.Timestamp getEquandaModificationDate();
+
+ long getEquandaVersion();
+
+ boolean isEquandaModificationDateModified();
+
+ String getEquandaStatus();
+
+ void setEquandaStatus( String status );
+
+ String getEquandaName();
+
+ boolean isEquandaType( String type );
+
+ void setEquandaType( String type );
+
+ boolean isModified( boolean typeFieldsOnly );
+
+ boolean isModified();
+
+ void equandaUpdate()
+ throws EquandaPersistenceException;
+
+ void equandaUpdate( boolean updateTypeFieldsOnly )
+ throws EquandaPersistenceException;
+
+ void removeEntityBean()
+ throws EquandaPersistenceException;
+
+ void setEquandaUpdate( boolean update );
+}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java (from rev 217, trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java 2007-12-28 23:21:37 UTC (rev 222)
@@ -0,0 +1,533 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence;
+
+import javolution.lang.TextBuilder;
+
+import java.io.Serializable;
+import java.util.*;
+
+/**
+ * Simple list with "modified" detection support
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
+ */
+public class EquandaList<E>
+ implements List<E>, Serializable
+{
+ private static final long serialVersionUID = -3119090825066956438L;
+
+ protected List<ElementWrapper> list;
+ protected boolean proxySetterUsed =
+ false; // this is taken into consideration only where there are no object in the list or in the remove list (situation where we cannot know if the object was modified or not)
+ private Set<ElementWrapper> removeList = new HashSet<ElementWrapper>();
+
+ public EquandaList()
+ {
+ list = new ArrayList<ElementWrapper>();
+ }
+
+ EquandaList( List<ElementWrapper> base )
+ {
+ list = base;
+ }
+
+ public int size() { return list.size(); }
+
+ public boolean isEmpty() { return list.isEmpty(); }
+
+ public boolean contains( Object o ) { return indexOf( o ) >= 0; }
+
+ public Iterator<E> iterator() { return new CustomIterator( list.iterator() ); }
+
+ public Object[] toArray()
+ {
+ Object[] result = new Object[list.size()];
+ for ( int i = 0; i < list.size() ; i++ )
+ {
+ ElementWrapper ew = list.get( i );
+ result[ i ] = ew == null ? null : ew.element;
+ }
+ return result;
+ }
+
+ public <E> E[] toArray( E[] result )
+ {
+ int size = list.size();
+ if ( result.length < size )
+ {
+ result = (E[]) java.lang.reflect.Array.newInstance( result.getClass().getComponentType(), size );
+ }
+ for ( int i = 0; i < list.size() ; i++ )
+ {
+ ElementWrapper ew = list.get( i );
+ result[ i ] = ew == null ? null : (E) ew.element;
+ }
+ if ( result.length > size )
+ {
+ result[ size ] = null;
+ }
+ return result;
+ }
+
+ public boolean add( E element )
+ {
+ return _add( list.size(), element );
+ }
+
+ public void add( int index, E element )
+ {
+ _add( index, element );
+ }
+
+ private boolean _add( int index, E element )
+ {
+ ElementWrapper we = buildNewEW( element, true );
+ // if the element already exist in the list then just replace the element
+ int idx = we == null ? -1 : list.indexOf( we );
+ if ( idx >= 0 )
+ {
+ list.set( idx, we );
+ }
+ else
+ {
+ list.add( index, we );
+ //modified = true;
+ }
+ if ( we != null ) removeFromRemoveList( we );
+ return true;
+ }
+
+ public boolean addAll( Collection<? extends E> c )
+ {
+ boolean _modified = false;
+ for ( E element : c ) if ( add( element ) ) _modified = true;
+ return _modified;
+ }
+
+ public boolean addAll( int index, Collection<? extends E> c )
+ {
+ boolean _modified = false;
+ for ( E element : c ) if ( _add( index, element ) ) _modified = true;
+ return _modified;
+ }
+
+ public boolean remove( Object element )
+ {
+ ElementWrapper we = buildNewEW( (E) element, false );
+ boolean _modified = list.remove( we );
+ //if ( _modified ) modified = true;
+ if ( we != null ) removeList.add( we );
+ return _modified;
+ }
+
+ public E remove( int index )
+ {
+ ElementWrapper element = list.remove( index );
+ if ( element != null )
+ {
+ removeList.add( element );
+ //modified = true;
+ return element.element;
+ }
+ return null;
+ }
+
+ protected boolean _removeWrapper( ElementWrapper ew )
+ {
+ return ew != null && list.remove( ew ) && removeList.add( ew );
+ }
+
+ public boolean removeAll( Collection<?> c )
+ {
+ boolean _modified = false;
+ for ( Object element : c ) if ( remove( element ) ) _modified = true;
+ return _modified;
+ }
+
+ public boolean retainAll( Collection<?> c )
+ {
+ ArrayList<ElementWrapper> tmpRemoveList = new ArrayList<ElementWrapper>();
+ for ( ElementWrapper element : list ) if ( !c.contains( element.element ) ) tmpRemoveList.add( element );
+ for ( ElementWrapper element : tmpRemoveList ) _removeWrapper( element );
+ return !tmpRemoveList.isEmpty();
+ }
+
+ public boolean containsAll( Collection<?> c )
+ {
+ for ( Object o : c ) if ( !contains( o ) ) return false;
+ return true;
+ }
+
+ public void clear()
+ {
+ if ( !list.isEmpty() )
+ {
+ //modified = true;
+ for ( ElementWrapper element : list ) if ( element != null ) removeList.add( element );
+ list.clear();
+ }
+ }
+
+ public boolean equals( Object o )
+ {
+ if ( o == this ) return true;
+ if ( o == null || !( o instanceof List ) || ( (List) o ).size() != this.size() ) return false;
+ return this.containsAll( (List) o ) && ( (List) o ).containsAll( this );
+ }
+
+ public int hashCode() { return list.hashCode() + 37 * removeList.hashCode(); }
+
+ public E get( int index )
+ {
+ ElementWrapper element = list.get( index );
+ ...
[truncated message content] |
|
From: <tri...@us...> - 2007-12-27 01:30:35
|
Revision: 221
http://equanda.svn.sourceforge.net/equanda/?rev=221&view=rev
Author: triathlon98
Date: 2007-12-26 17:30:28 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
assure example project uses t5gui templates
Modified Paths:
--------------
equanda-example/example-ddltool/pom.xml
equanda-example/example-ear/pom.xml
equanda-example/example-ear/src/main/application/META-INF/jboss-app.xml
equanda-example/example-gui/pom.xml
equanda-example/example-gui/src/main/java/myapp/example/gui/components/Layout.java
equanda-example/example-gui/src/main/resources/myapp/example/gui/components/Layout.tml
equanda-example/example-gui/src/main/resources/myapp/example/gui/pages/Start.tml
equanda-example/example-test/pom.xml
equanda-example/pom.xml
Added Paths:
-----------
equanda-example/example-gui/src/main/webapp/css/style.css
Removed Paths:
-------------
equanda-example/example-ear/src/main/application/EquandaCache-service.xml
equanda-example/example-ear/src/main/application/ExampleCache-service.xml
Modified: equanda-example/example-ddltool/pom.xml
===================================================================
--- equanda-example/example-ddltool/pom.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-ddltool/pom.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -69,9 +69,9 @@
<sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
<template>ddltool</template>
<!-- run ddltool parameters -->
- <database>${synca.db.url}</database>
- <dblogin>${synca.db.login}</dblogin>
- <dbpassword>${synca.db.password}</dbpassword>
+ <database>${example.db.url}</database>
+ <dblogin>${example.db.login}</dblogin>
+ <dbpassword>${example.db.password}</dbpassword>
<dbmap>myapp.example.ddltool.EquandaMap</dbmap>
<ddltargets>update defaults createpk indexes</ddltargets>
</configuration>
@@ -104,9 +104,9 @@
<sourceDirectory>${basedir}/../src/main/om</sourceDirectory>
<template>ddltool</template>
<!-- run ddltool parameters -->
- <database>${synca.db.url}</database>
- <dblogin>${synca.db.login}</dblogin>
- <dbpassword>${synca.db.password}</dbpassword>
+ <database>${example.db.url}</database>
+ <dblogin>${example.db.login}</dblogin>
+ <dbpassword>${example.db.password}</dbpassword>
<dbmap>myapp.example.ddltool.EquandaMap</dbmap>
<ddltargets>update defaults createpk indexes</ddltargets>
</configuration>
Modified: equanda-example/example-ear/pom.xml
===================================================================
--- equanda-example/example-ear/pom.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-ear/pom.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -49,11 +49,6 @@
</webModule>
<!-- exclude files which are either unneeded or part of jboss distro -->
<javaModule>
- <groupId>eclipse</groupId>
- <artifactId>jdtcore</artifactId>
- <excluded>true</excluded>
- </javaModule>
- <javaModule>
<groupId>net.sf.fscript</groupId>
<artifactId>fscript</artifactId>
<excluded>true</excluded>
@@ -64,13 +59,23 @@
<excluded>true</excluded>
</javaModule>
<javaModule>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ <javaModule>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <excluded>true</excluded>
+ </javaModule>
+ <javaModule>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<excluded>true</excluded>
</javaModule>
<javaModule>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
<excluded>true</excluded>
</javaModule>
</modules>
@@ -103,10 +108,19 @@
</dependency>
<!-- need to include some dependencies explicitly (especially war dependencies) -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-tapestry5</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -127,17 +141,17 @@
<wait>true</wait>
<container>
<containerId>jboss4x</containerId>
- <home>${synca.jboss.home}</home>
+ <home>${example.jboss.home}</home>
</container>
<configuration>
<type>existing</type>
- <home>${synca.jboss.home}/server/${synca.jboss.config}/</home>
+ <home>${example.jboss.home}/server/${example.jboss.config}/</home>
<properties>
- <cargo.hostname>${synca.jboss.host}</cargo.hostname>
- <cargo.servlet.port>${synca.jboss.port}</cargo.servlet.port>
- <cargo.jboss.configuration>${synca.jboss.config}</cargo.jboss.configuration>
- <cargo.jvmargs>${synca.jboss.jvmargs}</cargo.jvmargs>
- <cargo.logging>${synca.jboss.logging}</cargo.logging>
+ <cargo.hostname>${example.jboss.host}</cargo.hostname>
+ <cargo.servlet.port>${example.jboss.port}</cargo.servlet.port>
+ <cargo.jboss.configuration>${example.jboss.config}</cargo.jboss.configuration>
+ <cargo.jvmargs>${example.jboss.jvmargs}</cargo.jvmargs>
+ <cargo.logging>${example.jboss.logging}</cargo.logging>
</properties>
<deployables>
<deployable>
Deleted: equanda-example/example-ear/src/main/application/EquandaCache-service.xml
===================================================================
--- equanda-example/example-ear/src/main/application/EquandaCache-service.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-ear/src/main/application/EquandaCache-service.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <!-- ==================================================================== -->
- <!-- Defines Cache for equanda/example -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=EquandaCacheService">
- <attribute name="CacheLoaderClass">org.equanda.tapestry.useradmin.cache.UserAdminCacheLoader</attribute>
-
- <!-- Specific eviction policy configurations. This is LRU -->
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">1</attribute>
- <!-- Cache wide default -->
- <region name="/_default_">
- <attribute name="maxNodes">500</attribute>
- <attribute name="timeToLiveSeconds">300</attribute>
- </region>
- </config>
- </attribute>
-
- </mbean>
-
-</server>
Deleted: equanda-example/example-ear/src/main/application/ExampleCache-service.xml
===================================================================
--- equanda-example/example-ear/src/main/application/ExampleCache-service.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-ear/src/main/application/ExampleCache-service.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <!-- ==================================================================== -->
- <!-- Defines Cache for Synergetics, which has a custom cache loader -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=SynergeticsCacheService">
- <attribute name="CacheLoaderClass">org.equanda.cache.EquandaBasicCacheLoader</attribute>
-
- <!-- Specific eviction policy configurations. This is LRU -->
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">1</attribute>
- <!-- Cache wide default -->
- <region name="/_default_">
- <attribute name="maxNodes">2500</attribute>
- <attribute name="timeToLiveSeconds">300</attribute>
- </region>
- </config>
- </attribute>
-
- </mbean>
-
-</server>
-
Modified: equanda-example/example-ear/src/main/application/META-INF/jboss-app.xml
===================================================================
--- equanda-example/example-ear/src/main/application/META-INF/jboss-app.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-ear/src/main/application/META-INF/jboss-app.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -8,12 +8,6 @@
example:app=example.ear
</loader-repository>
<module>
- <service>EquandaCache-service.xml</service>
- </module>
- <module>
- <service>ExampleCache-service.xml</service>
- </module>
- <module>
<java>equanda-server.jar</java>
</module>
<module>
Modified: equanda-example/example-gui/pom.xml
===================================================================
--- equanda-example/example-gui/pom.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-gui/pom.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -15,6 +15,17 @@
example management
</description>
<build>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/generated-sources/equanda/</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/resources/</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.equanda</groupId>
@@ -34,12 +45,14 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+ <!--<archiveClasses>true</archiveClasses>-->
<dependentWarExcludes>WEB-INF/web.xml,index.*</dependentWarExcludes>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
- <!--<warSourceExcludes>WEB-INF/lib/a*,WEB-INF/lib/c*,WEB-INF/lib/f*,
- WEB-INF/lib/i*,WEB-INF/lib/j*,WEB-INF/lib/o*,WEB-INF/lib/Uni*</warSourceExcludes>-->
+ <warSourceExcludes>
+ WEB-INF/lib/javassist*.jar,WEB-INF/lib/log4j*.jar,WEB-INF/lib/commons-*.jar
+ </warSourceExcludes>
<archive>
<manifest>
<addClasspath>true</addClasspath>
@@ -58,26 +71,25 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.equanda</groupId>
- <artifactId>equanda-tapestry5</artifactId>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-core</artifactId>
</dependency>
<dependency>
<groupId>org.equanda</groupId>
- <artifactId>equanda-t5gui</artifactId>
+ <artifactId>equanda-client</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.equanda</groupId>
- <artifactId>equanda-maven-plugin</artifactId>
- <scope>provided</scope>
+ <artifactId>equanda-tapestry5</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-t5gui</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -113,8 +125,19 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common</artifactId>
- <version>4.0.4</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>net.sf.fscript</groupId>
+ <artifactId>fscript</artifactId>
+ <version>1.17</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javolution</groupId>
+ <artifactId>javolution</artifactId>
+ <version>3.7.10</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: equanda-example/example-gui/src/main/java/myapp/example/gui/components/Layout.java
===================================================================
--- equanda-example/example-gui/src/main/java/myapp/example/gui/components/Layout.java 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-gui/src/main/java/myapp/example/gui/components/Layout.java 2007-12-27 01:30:28 UTC (rev 221)
@@ -31,7 +31,7 @@
import org.apache.tapestry.Block;
/**
- * ...
+ * General layout
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
@@ -42,19 +42,11 @@
private Asset style;
@Inject
- @Path("context:images/favicon.ico")
- private Asset favicon;
-
- @Inject
@Path( "classpath:/org/equanda/tapestry5/resources/equanda.js" )
private Asset equandaJs;
@Inject
- @Path("context:script/equanda.js")
- private Asset script;
-
- @Inject
- @Path("context:images/synergetics.png")
+ @Path("context:images/logo.png")
private Asset logo;
@Parameter
@@ -81,26 +73,6 @@
this.style = style;
}
- public Asset getFavicon()
- {
- return favicon;
- }
-
- public void setFavicon( Asset favicon )
- {
- this.favicon = favicon;
- }
-
- public Asset getScript()
- {
- return script;
- }
-
- public void setScript( Asset script )
- {
- this.script = script;
- }
-
public Asset getLogo()
{
return logo;
Modified: equanda-example/example-gui/src/main/resources/myapp/example/gui/components/Layout.tml
===================================================================
--- equanda-example/example-gui/src/main/resources/myapp/example/gui/components/Layout.tml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-gui/src/main/resources/myapp/example/gui/components/Layout.tml 2007-12-27 01:30:28 UTC (rev 221)
@@ -2,9 +2,7 @@
<head>
<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.4.0/build/reset/reset-min.css" />
<t:delegate to="title"/>
- <link rel="shortcut icon" href="${favicon}" type="image/x-icon" />
<link type="text/css" rel="stylesheet" href="${style}" />
- <script src="${script}" language="javascript" type="text/javascript" />
<script src="${equandaJs}" language="javascript" type="text/javascript" />
</head>
@@ -17,55 +15,26 @@
<t:parameter name="content1">
<div>
<ul>
- <li>[<t:pagelink t:page="CompetencyAll">View all competencies</t:pagelink>]</li>
- <li>[<t:pagelink t:page="OrganizationAll">View all organizations</t:pagelink>]</li>
- <li>[<t:pagelink t:page="ArtifactAll">View all artifacts</t:pagelink>]</li>
- <li><a href="nowhere">Create competency</a></li>
- <li><a href="nowhere">Add competency profile</a></li>
- <li><a href="nowhere">Edit competency profile</a></li>
- <li><a href="nowhere">Find learning execution</a></li>
- <li><a href="nowhere">Find best person</a></li>
+ <li>[<t:pagelink t:page="OrganizationEquandaAll">View all organizations</t:pagelink>]</li>
+ <li>[<t:pagelink t:page="AddressEquandaAll">View all addresses</t:pagelink>]</li>
</ul>
</div>
</t:parameter>
<t:parameter name="title2">User</t:parameter>
<t:parameter name="content2">
- <div><p>Logged in user : <a href="nowhere">Joachim</a><br/>Organization : <a href="nowhere">Synergetics
- nv</a><br/><a href="nowhere">log out</a><br/><a href="nowhere">change preferences</a><br/><a
- href="nowhere">set as start page</a><br/></p></div>
+ <div>
+ <p>This part is not yet functional</p>
+ <p>Logged in user : <a href="#nowhere">Joachim</a><br/>Organization : <a href="#nowhere">PROGS bvba</a><br/>
+ <a href="#nowhere">log out</a><br/>
+ <a href="#nowhere">change preferences</a><br/><a
+ href="#nowhere">set as start page</a><br/></p></div>
</t:parameter>
- <t:parameter name="title3">Environment</t:parameter>
+ <t:parameter name="title3">Help</t:parameter>
<t:parameter name="content3">
- <div><p>Synergetics Competency Analyzer<br/>Build <em>earlybird</em><br/></p></div>
- </t:parameter>
- <t:parameter name="title4">Other</t:parameter>
- <t:parameter name="content4">
<div>
- <ul>
- <li><a href="nowhere">Data</a></li>
- <li><a href="nowhere">Reports</a></li>
- <li><a href="nowhere">Import</a></li>
- <li><a href="nowhere">Export</a></li>
- </ul>
+ <p>This might be a good place to put some help about the application.</p>
</div>
</t:parameter>
- <t:parameter name="title5">Help</t:parameter>
- <t:parameter name="content5">
- <div>
- <p>This is the Synergetics Competency Analyzer. You can use the items above to display some common
- options.The entire system can be used and accessed from this menu.
- <ul>
- <li>Menu contains common operations.</li>
- <li>User contains user information and allows you to configure how you want to use the system.
- </li>
- <li>Environment.</li>
- <li>Other gives access to all features, including the more obscure or less used stuff.</li>
- <li>Help is where you are now.</li>
- </ul>
- The full manual can be viewed <a href="nowhere">here</a>.
- </p>
- </div>
- </t:parameter>
</span>
</div>
<div id="layout-right">
@@ -96,7 +65,7 @@
var padTitle = 8; /* padding + border (top+bottom) for title */
var padItem = 20; /* padding + border (top+bottom) for item */
var padMain = 6; /* padding + border (top+bottom) for main */
- var total = equandaWindowHeight() - 5 * ( one + padTitle ) - padItem;
+ var total = equandaWindowHeight() - 3 * ( one + padTitle ) - padItem;
var info = equandaWindowHeight();
info = info - $("layout-topbar").getHeight();
info = info - $("layout-breadcrumbs").getHeight();
Modified: equanda-example/example-gui/src/main/resources/myapp/example/gui/pages/Start.tml
===================================================================
--- equanda-example/example-gui/src/main/resources/myapp/example/gui/pages/Start.tml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-gui/src/main/resources/myapp/example/gui/pages/Start.tml 2007-12-27 01:30:28 UTC (rev 221)
@@ -1,7 +1,7 @@
<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>Competency Analyzer</title>
+ <title>equanda example application</title>
</t:parameter>
<t:parameter name="context">
<span id="context">context info</span>
Copied: equanda-example/example-gui/src/main/webapp/css/style.css (from rev 217, equanda-example/example-gui/src/main/webapp/css/example.css)
===================================================================
--- equanda-example/example-gui/src/main/webapp/css/style.css (rev 0)
+++ equanda-example/example-gui/src/main/webapp/css/style.css 2007-12-27 01:30:28 UTC (rev 221)
@@ -0,0 +1,187 @@
+#layout-left ul {
+ padding-left: 1em;
+}
+
+#layout-left li {
+ list-style: square;
+}
+
+fieldset {
+ border: 2px groove gray;
+ padding: 3px;
+}
+
+.accordion_title {
+ background-color: lightgray;
+ color: black;
+ height: 15px; /* overwritten by script */
+ font-weight: normal;
+ padding-left: 5px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ border-bottom: 1px solid white;
+ border-top: 1px solid black;
+ border-right: 1px dashed black;
+ cursor: pointer;
+}
+
+.accordion_title a:link,
+.accordion_title a:visited,
+.accordion_title a:active,
+.accordion_title a:hover {
+ color: black;
+ text-decoration: none;
+}
+
+.accordion_title_active {
+ font-weight: bold;
+}
+
+.accordion_content {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ padding-left: 10px;
+ padding-right: 2px;
+ background-color: beige;
+ overflow: auto;
+ border-right: 1px dashed black;
+}
+
+body {
+ margin:0;
+ border:0;
+ font-family: tahoma, verdana, arial, sans-serif;
+ font-size: 13px;
+}
+
+#layout-left { float:left; width:200px; height:100%; }
+#layout-right { position:static; width:100%; height:100%; left:200px; right:auto; top:0; bottom: auto; }
+#layout-topbar { position:static; width:100%; height:auto; }
+#layout-topbar-right { float:right; }
+#layout-topbar-end { clear:right; }
+#layout-breadcrumbs { position:static; width:100%; height:auto; background-color: lightgray; text-align:center; }
+#layout-info { position:static; width:100%; height:220px; } /* height should be corrected by script */
+#layout-main { position:static; height:100%; overflow:auto; overflow-y:scroll; background-color:white; padding:3px; }
+#layout-buttons { background-color:lightgray; text-align:center; }
+#layout-inforight { float:right; width:140px; height:100%; background-color:beige; border-left: 1px dashed black; overflow-x:hidden; overflow-y:scroll; }
+
+.defaultSubmit {
+ font-weight: bold;
+}
+
+.nodisplay { display : none; }
+
+label {
+ float: left;
+ width: 180px;
+ text-align: right;
+ padding-right: 5px;
+}
+fieldset label {
+ width: 175px;
+}
+fieldset fieldset label {
+ width: 170px;
+}
+fieldset fieldset fieldset label {
+ width: 165px;
+}
+fieldset fieldset fieldset fieldset label {
+ width: 160px;
+}
+
+
+#equandaTabsContent br {
+ clear: both;
+}
+
+/* tabs layout */
+
+.equandaTabsTitles {
+ float: left;
+ width: 100%;
+ margin: 0 0 0 0;
+ list-style: none;
+}
+.equandaTabsTitles li {
+ float: left;
+ padding: 0 .5em 0 0;
+}
+.equandaTabsTitles a:link,
+.equandaTabsTitles a:visited,
+.equandaTabsTitles a:active,
+.equandaTabsTitles a:hover {
+ width: 8em;
+ padding: .2em 1em;
+ display: block;
+ background: lightgray;
+ color: black;
+ font-weight: bold;
+ text-decoration: none;
+}
+.equandaTabsTitles a:hover {
+ background: gray;
+ color: white;
+}
+.equandaTabsPanel {
+ border: solid 1px;
+ clear: both;
+ width: auto;
+}
+.equandaTabsAll {
+ border-bottom: solid 1px;
+ background: beige;
+ padding: 1em;
+}
+.equandaTabsPanelContent {
+ background: white;
+ padding: 1em;
+}
+a.equandaTabsActive:link,
+a.equandaTabsActive:visited,
+a.equandaTabsActive:active,
+a.equandaTabsActive:hover {
+ background:black;
+ color:white;
+}
+.equandaTraverseForward,
+.equandaTraverseBackward {
+ display: none;
+}
+
+.equandaLinkList { display: table; }
+.equandaLinkListRow { display: table; }
+.equandaLinkListRow div { display: inline; }
+
+
+/* overwrite tapestry defaults where necessary, correct fonts and font-sizes */
+
+DIV.t-exception-message {
+ font-size: 13pt;
+}
+DIV.t-exception-report, DIV.t-env-data {
+ font-family: tahoma, verdana, arial, sans-serif;
+}
+SPAN.t-exception-class-name {
+ font-size: 13px;
+}
+UL.t-stack-trace LI {
+ font-family: Monaco, Times, monospace;
+ font-size: 10px;
+}
+H1.t-exception-report {
+ font-family: tahoma, verdana, arial, sans-serif;
+}
+DIV.t-beaneditor, DIV.t-beandisplay {
+ font-family: tahoma, verdana, arial, sans-serif;
+}
+.t-data-grid {
+ font-family: tahoma, verdana, arial, sans-serif;
+ font-size: 13px;
+}
+DIV.t-data-grid-pager A, DIV.t-data-grid-pager SPAN.current {
+ font-size: 13px;
+}
+DIV.t-env-data-section {
+ font-size: 13px;
+}
Modified: equanda-example/example-test/pom.xml
===================================================================
--- equanda-example/example-test/pom.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/example-test/pom.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -37,7 +37,7 @@
</container>
<configuration>
<type>existing</type>
- <home>${jboss.appserver.home}\server\example\</home>
+ <home>${example.jboss.home}\server\${example.jboss.config}\</home>
<properties>
<cargo.hostname>${jboss.host}</cargo.hostname>
<cargo.servlet.port>${jboss.port}</cargo.servlet.port>
Modified: equanda-example/pom.xml
===================================================================
--- equanda-example/pom.xml 2007-12-26 19:00:46 UTC (rev 220)
+++ equanda-example/pom.xml 2007-12-27 01:30:28 UTC (rev 221)
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
- <version>${staticwiki-release-version}</version>
+ <version>${staticwiki-version}</version>
</dependency>
</dependencies>
</plugin>
@@ -172,29 +172,39 @@
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
- <version>${equanda-release-version}</version>
+ <version>${equanda-version}</version>
</dependency>
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-server</artifactId>
- <version>${equanda-release-version}</version>
+ <version>${equanda-version}</version>
</dependency>
<dependency>
<groupId>org.equanda</groupId>
+ <artifactId>equanda-client</artifactId>
+ <version>${equanda-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
- <version>${equanda-release-version}</version>
+ <version>${equanda-version}</version>
</dependency>
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
- <version>${equanda-release-version}</version>
+ <version>${equanda-version}</version>
</dependency>
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
- <version>${equanda-release-version}</version>
+ <version>${equanda-version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-core</artifactId>
+ <version>${tapestry-version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -222,6 +232,11 @@
</dependency>
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-ejb3x</artifactId>
<version>4.0.5</version>
</dependency>
@@ -256,11 +271,6 @@
<version>4.0.4</version>
</dependency>
<dependency>
- <groupId>tapestry</groupId>
- <artifactId>tapestry-prop</artifactId>
- <version>0.1.1</version>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>1.4</version>
@@ -275,6 +285,11 @@
<artifactId>jboss-serialization</artifactId>
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -331,7 +346,7 @@
<example.db.empty>/home/joachim/data/example-empty.fdb</example.db.empty>
<example.cargo.wait>true</example.cargo.wait>
<example.jboss.home>/home/joachim/java/examplejboss</example.jboss.home>
- <example.jboss.config>example</example.jboss.config>
+ <example.jboss.config>equanda</example.jboss.config>
<example.jboss.host>localhost</example.jboss.host>
<example.jboss.port>8080</example.jboss.port>
<example.jboss.jvmargs>
@@ -347,7 +362,8 @@
</profiles>
<properties>
- <equanda-release-version>0.9-SNAPSHOT</equanda-release-version>
- <staticwiki-release-version>0.9-SNAPSHOT</staticwiki-release-version>
- </properties>
+ <equanda-version>0.9-SNAPSHOT</equanda-version>
+ <staticwiki-version>0.9-SNAPSHOT</staticwiki-version>
+ <tapestry-version>5.0.7-SNAPSHOT</tapestry-version>
+ </properties>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-26 19:00:49
|
Revision: 220
http://equanda.svn.sourceforge.net/equanda/?rev=220&view=rev
Author: triathlon98
Date: 2007-12-26 11:00:46 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
extra dependency needed as tests may fail otherwise (don't know why this worked earlier and not now though)
Modified Paths:
--------------
trunk/equanda-test/test-test/pom.xml
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2007-12-26 17:56:38 UTC (rev 219)
+++ trunk/equanda-test/test-test/pom.xml 2007-12-26 19:00:46 UTC (rev 220)
@@ -167,6 +167,10 @@
<artifactId>jaybird</artifactId>
<version>2.1.1</version>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
</dependencies>
<repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-26 17:56:42
|
Revision: 219
http://equanda.svn.sourceforge.net/equanda/?rev=219&view=rev
Author: triathlon98
Date: 2007-12-26 09:56:38 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
EQ-56 include enough
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm 2007-12-26 17:04:02 UTC (rev 218)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm 2007-12-26 17:56:38 UTC (rev 219)
@@ -43,6 +43,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import java.io.Serializable;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-12-26 17:04:08
|
Revision: 218
http://equanda.svn.sourceforge.net/equanda/?rev=218&view=rev
Author: triathlon98
Date: 2007-12-26 09:04:02 -0800 (Wed, 26 Dec 2007)
Log Message:
-----------
slight cleanup (for future)
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/docs/group.vm
Modified: trunk/equanda-generate/src/main/velocity/docs/group.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/group.vm 2007-12-24 13:09:47 UTC (rev 217)
+++ trunk/equanda-generate/src/main/velocity/docs/group.vm 2007-12-26 17:04:02 UTC (rev 218)
@@ -46,7 +46,7 @@
#foreach ( $group in $group.Groups )
$fieldsep
-#set( $GroupName="$group.GroupName" )
+#set( $GroupName="$group.Name" )
#parse( "group.vm" )
#set( $fieldsep = "<font size=\"0\"><p /></font>" )
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
