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...> - 2010-04-14 07:58:44
|
Revision: 1209
http://equanda.svn.sourceforge.net/equanda/?rev=1209&view=rev
Author: triathlon98
Date: 2010-04-14 07:58:38 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
small improvements
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java 2010-03-25 23:09:46 UTC (rev 1208)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java 2010-04-14 07:58:38 UTC (rev 1209)
@@ -27,7 +27,8 @@
import org.apache.tapestry5.json.JSONObject;
/**
- * Configuration bean for {@link org.equanda.tapestry5.components.JSPager}
+ * Configuration bean for {@link org.equanda.tapestry5.components.JSPager}.
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
public class PagerConfig
@@ -49,9 +50,7 @@
private String name;
public PagerConfig()
- {
-
- }
+ {}
public PagerConfig( int range, int maxPages, int rowsPerPage, int lastIndex, int currentPage, int rowCount,
int addedRowCount, int additionalRowCount, String currentPageFieldName, String addedRowFieldName,
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2010-03-25 23:09:46 UTC (rev 1208)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2010-04-14 07:58:38 UTC (rev 1209)
@@ -24,8 +24,20 @@
package org.equanda.tapestry5.components;
-import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.PrimaryKeyEncoder;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
import org.apache.tapestry5.corelib.components.Delegate;
import org.apache.tapestry5.corelib.components.Loop;
import org.apache.tapestry5.ioc.annotations.Inject;
@@ -313,11 +325,18 @@
public String getDisplayStyle()
{
- if ( getConfig() == null )
+ PagerConfig config = getConfig();
+ if ( null == config )
{
- setConfig( internalPager.getConfig() );
+ config = internalPager.getConfig();
+ setConfig( config );
}
- PagerConfig config = getConfig();
+ if ( null == config )
+ {
+ log.error( "no pager configuration" );
+ return "display:none;";
+ }
+
int availableRows = config.getRowCount() - config.getAdditionalRowCount() + config.getAddedRowCount();
config.setMaxPages( ( ( availableRows - 1 ) / config.getRowsPerPage() ) + 1 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-03-25 23:09:52
|
Revision: 1208
http://equanda.svn.sourceforge.net/equanda/?rev=1208&view=rev
Author: triathlon98
Date: 2010-03-25 23:09:46 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
EQ-378 use editlayour for AuthAndConfig pages
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2010-03-11 21:00:19 UTC (rev 1207)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2010-03-25 23:09:46 UTC (rev 1208)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="dm" type="org.equanda.domain.xml.DomainModel" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Tables}</t:parameter>
@@ -100,4 +100,4 @@
<br />
-</t:layout>
\ No newline at end of file
+</t:editlayout>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2010-03-11 21:00:19 UTC (rev 1207)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2010-03-25 23:09:46 UTC (rev 1208)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<p:title>${dollar}{equanda-message:authAndConfig.title.Roles}</p:title>
@@ -20,4 +20,4 @@
<input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
</p:buttons>
-</t:layout>
\ No newline at end of file
+</t:editlayout>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2010-03-11 21:00:19 UTC (rev 1207)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2010-03-25 23:09:46 UTC (rev 1208)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:authAndConfig.configure} ${dollar}{equanda-message:table.${table.Name}}</t:parameter>
@@ -70,4 +70,4 @@
</fieldset>
#end
-</t:layout>
+</t:editlayout>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-03-11 21:00:25
|
Revision: 1207
http://equanda.svn.sourceforge.net/equanda/?rev=1207&view=rev
Author: triathlon98
Date: 2010-03-11 21:00:19 +0000 (Thu, 11 Mar 2010)
Log Message:
-----------
EQ-376 assure equanda works using tapestry 5.2
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2010-03-11 21:00:19 UTC (rev 1207)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"">
+<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<div class="eqLLR">
<t:equanda.formactionlink t:id="Select" context="prop:setterId">${dollar}{equanda-message:Select}</t:equanda.formactionlink>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-03-10 20:08:22
|
Revision: 1206
http://equanda.svn.sourceforge.net/equanda/?rev=1206&view=rev
Author: triathlon98
Date: 2010-03-10 20:08:16 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
EQ-376 assure equanda works using tapestry 5.2
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java
trunk/pom.xml
Added Paths:
-----------
trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java
Removed Paths:
-------------
trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
Deleted: trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,47 +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.client;
-
-/**
- * Configuration for a specific page.
- *
- * @author <a href="mailto:bri...@ri...">Brian Reynolds</a>
- */
-public interface AuthAndConfigPages
-{
- /**
- * Set whether this page has GUI Administration rights
- *
- * @param isGuiAdmin The value to set the GUI Admin flag to
- */
- void setGuiAdmin( boolean isGuiAdmin );
-
- /**
- * Set the role being used
- *
- * @param roleName The name of the role to be used, or null if no role selected
- */
- void setRoleName( String roleName );
-}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div id="${clientId}" class="${table.Name}-edit" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div id="${clientId}" class="${table.Name}-edit" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="equanda-readable:table.${table.Name}">
#parse( "t5gui/render.vm" )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
<div t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<div class="eqInlR">
<div class="eqInlRL">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
<div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -3,7 +3,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
-<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<div class="eqLLR" t:type="loop" volatile="true" source="value" value="current" index="index" rowsPerPage="7">
<t:parameter name="empty"></t:parameter>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"">
<div class="eqLLR">
<t:equanda.formactionlink t:id="Select" context="prop:setterId">${dollar}{equanda-message:Select}</t:equanda.formactionlink>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Select.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="equanda-readable:table.${table.Name}">
<t:grid model="gridModel" row="currentRow" source="rows" pagerposition="both" rowsPerPage="prop:rowsPerPage">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:container xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:container xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="hasValue()">
#set( $sep = "" )
#foreach( $field in $table.getFieldsNotHidden() )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/SummaryEditLink.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:if test="hasObject()">
<t:equanda.formactionlink t:id="Edit" context="object.id">
<span t:type="${table.VarName}/Summary" t:value="object"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="action" type="org.equanda.domain.xml.Action" *#
-<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:table.${table.Name}}, ${dollar}{equanda-message:action.${table.Name}.${action.Name}}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -2,7 +2,7 @@
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="action" type="org.equanda.domain.xml.Action" *#
-<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:table.${table.Name}}, ${dollar}{equanda-message:action.${table.Name}.${action.Name}}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:editlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{navigationPageTitle}</t:parameter>
<t:parameter name="context">
<span id="context">id ${dollar}{object?.id}</span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -55,7 +55,7 @@
import org.apache.tapestry5.runtime.Component;
import org.equanda.auth.ParsedAuthAndConfigProvider;
import org.equanda.client.AuthAndConfigProvider;
-import org.equanda.client.AuthAndConfigPages;
+import org.equanda.auth.AuthAndConfigPage;
import org.equanda.client.EquandaException;
import org.equanda.persistence.*;
import org.equanda.t5gui.services.LoginInfoService;
@@ -64,7 +64,7 @@
$!{engine.getTemplateConfig("page-class-annotation" )}
@IncludeJavaScriptLibrary( { "classpath:/org/equanda/t5gui/authandconfig.js" } )
public class AuthAndConfigTables
- implements AuthAndConfigPages
+ implements AuthAndConfigPage
{
private static final Logger log = Logger.getLogger( AuthAndConfigTables.class );
private static final String noRoleIndicator = "__no_role__";
@@ -282,7 +282,7 @@
{
if( context.length == 3 )
{
- AuthAndConfigPages page = (AuthAndConfigPages)source.getPage( context[0] + "/AuthAndConfig" );
+ AuthAndConfigPage page = (AuthAndConfigPage)source.getPage( context[0] + "/AuthAndConfig" );
String roleName = (String)context[1];
String isGuiAdmin = (String)context[2];
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="dm" type="org.equanda.domain.xml.DomainModel" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Tables}</t:parameter>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="select" type="org.equanda.domain.xml.Select" *#
-<t:selectlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:selectlayout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{navigationPageTitle}</t:parameter>
<t:parameter name="context">
<span id="context"></span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -80,26 +80,12 @@
private Object nextPage;
@Persist
+ @Property
private boolean guiAdmin;
- public void setGuiAdmin( boolean guiAdmin )
- {
- this.guiAdmin = guiAdmin;
- }
- public boolean isGuiAdmin()
- {
- return guiAdmin;
- }
@Persist
+ @Property
private String roleName;
- public void setRoleName( String roleName )
- {
- this.roleName = roleName;
- }
- public String getRoleName()
- {
- return roleName;
- }
public SelectModel getRolesChoiceModel()
{
@@ -110,7 +96,7 @@
for ( ${roleTable} role : coll )
{
- list.add( new EquandaOptionModel (role.getRoleName(), role.getRoleName() ) );
+ list.add( new EquandaOptionModel(role.getRoleName(), role.getRoleName() ) );
}
}
catch(Exception e){
@@ -151,7 +137,7 @@
if ( guiAdmin )
{
navigationManager.beginNavigation( resources );
- tablePage.initPage( getRoleName(), guiAdmin );
+ tablePage.initPage( roleName, guiAdmin );
tablePage.refreshBoxes();
nextPage = tablePage;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,23 +1,23 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
- <t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Roles}</t:parameter>
+ <p:title>${dollar}{equanda-message:authAndConfig.title.Roles}</p:title>
- <t:if test="isGuiAdmin()">
+ <t:if test="getGuiAdmin()">
<p>${dollar}{equanda-message:authAndConfig.select.Role}</p>
<br/>
<select t:type="Select" t:model="RolesChoiceModel" t:value="roleName" t:blankOption="ALWAYS"/>
- <t:parameter name="else">
+ <p:else>
<p class="aacError">${dollar}{equanda-message:authAndConfig.select.Prohibited}</p>
- </t:parameter>
+ </p:else>
</t:if>
- <t:parameter name="buttons">
+ <p:buttons>
<input class="defaultSubmit" t:type="submit" value="equanda-message:button.OK" t:id="ok"/>
<input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
- </t:parameter>
+ </p:buttons>
</t:layout>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -55,7 +55,7 @@
import org.apache.tapestry5.annotations.Environmental;
import org.equanda.auth.ParsedAuthAndConfigProvider;
import org.equanda.client.AuthAndConfigProvider;
-import org.equanda.client.AuthAndConfigPages;
+import org.equanda.auth.AuthAndConfigPage;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
import org.equanda.persistence.*;
@@ -67,7 +67,7 @@
"classpath:/org/equanda/tapestry5/resources/t5equanda.js",
"classpath:/org/equanda/t5gui/authandconfig.js" } )
public class AuthAndConfig
- implements AuthAndConfigPages
+ implements AuthAndConfigPage
{
private static final Logger log = Logger.getLogger( AuthAndConfig.class );
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2010-03-10 20:08:16 UTC (rev 1206)
@@ -1,7 +1,7 @@
#* @vtlvariable name="dollar" type="java.lang.String" *#
#* @vtlvariable name="readOnlyContext" type="boolean" *#
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
-<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
<t:parameter name="title">${dollar}{equanda-message:authAndConfig.configure} ${dollar}{equanda-message:table.${table.Name}}</t:parameter>
Copied: trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java (from rev 1196, trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java)
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java (rev 0)
+++ trunk/equanda-server/src/main/java/org/equanda/auth/AuthAndConfigPage.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -0,0 +1,47 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.auth;
+
+/**
+ * Configuration for a specific page.
+ *
+ * @author <a href="mailto:bri...@ri...">Brian Reynolds</a>
+ */
+public interface AuthAndConfigPage
+{
+ /**
+ * Set whether this page has GUI Administration rights
+ *
+ * @param isGuiAdmin The value to set the GUI Admin flag to
+ */
+ void setGuiAdmin( boolean isGuiAdmin );
+
+ /**
+ * Set the role being used
+ *
+ * @param roleName The name of the role to be used, or null if no role selected
+ */
+ void setRoleName( String roleName );
+}
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormActionLink.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -33,7 +33,7 @@
import java.util.List;
/**
- * Form aware ActionLink component. The form should containa equanda/FormSupport component or it does not work.
+ * Form aware ActionLink component. The form should contain a equanda/FormSupport component or it does not work.
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/FormSupport.java 2010-03-10 20:08:16 UTC (rev 1206)
@@ -122,5 +122,19 @@
public void setAnchor( String s ) {/*ignore*/}
public String toAbsoluteURI() { return target;}
+
+ public void removeParameter( String s ) {/*ignore*/}
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getBasePath()
+ {
+ return ""; // not really supported
+ }
+
+ public Link copyWithBasePath( String s ) {
+ return this; // not really supported
+ }
}
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-03 21:53:26 UTC (rev 1205)
+++ trunk/pom.xml 2010-03-10 20:08:16 UTC (rev 1206)
@@ -631,7 +631,7 @@
</profiles>
<properties>
- <tapestry-release-version>5.1.0.5</tapestry-release-version>
+ <tapestry-release-version>5.2.0-SNAPSHOT</tapestry-release-version>
<chenillekit-version>1.0.0</chenillekit-version>
<!--
<staticwiki-release-version>0.9.1-SNAPSHOT</staticwiki-release-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-03-03 21:53:33
|
Revision: 1205
http://equanda.svn.sourceforge.net/equanda/?rev=1205&view=rev
Author: triathlon98
Date: 2010-03-03 21:53:26 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
EQ-375 refactor EquandaMessages in a "normal" service, making it 5.2 compatible
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBinding.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBindingFactory.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java
Removed Paths:
-------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -25,10 +25,9 @@
package org.equanda.t5gui.bindings;
import org.apache.tapestry5.Binding;
-import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.ioc.BaseLocatable;
import org.apache.tapestry5.ioc.Location;
-import org.equanda.t5gui.services.EquandaMessagesSource;
+import org.equanda.t5gui.services.EquandaMessages;
import java.lang.annotation.Annotation;
@@ -42,24 +41,20 @@
implements Binding
{
private String expression;
- private ComponentResources componentResources;
- private EquandaMessagesSource messagesSource;
+ private EquandaMessages messages;
/**
* Creates Equanda Message Binding
*
- * @param componentResources component resources
* @param expression message expression
* @param location location
- * @param messagesSource equanda message source
+ * @param messages equanda message source
*/
- public EquandaMessageBinding( ComponentResources componentResources, String expression, Location location,
- EquandaMessagesSource messagesSource )
+ public EquandaMessageBinding( String expression, Location location, EquandaMessages messages )
{
super( location );
- this.componentResources = componentResources;
this.expression = expression;
- this.messagesSource = messagesSource;
+ this.messages = messages;
}
/**
@@ -68,7 +63,7 @@
public Object get()
{
String key = expression != null ? expression.trim() : expression;
- return messagesSource.getMessages( componentResources ).get( key );
+ return messages.get( key );
}
@SuppressWarnings( "unchecked" )
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -28,7 +28,7 @@
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.ioc.Location;
import org.apache.tapestry5.services.BindingFactory;
-import org.equanda.t5gui.services.EquandaMessagesSource;
+import org.equanda.t5gui.services.EquandaMessages;
/**
* Factory for Equanda Message Binding
@@ -39,16 +39,16 @@
implements BindingFactory
{
- private EquandaMessagesSource messagesSource;
+ private EquandaMessages messages;
/**
* Creates Equanda Message Binding Factory
*
- * @param messagesSource equanda message source
+ * @param messages equanda message source
*/
- public EquandaMessageBindingFactory( EquandaMessagesSource messagesSource )
+ public EquandaMessageBindingFactory( EquandaMessages messages )
{
- this.messagesSource = messagesSource;
+ this.messages = messages;
}
/**
@@ -64,7 +64,7 @@
public Binding newBinding( String description, ComponentResources container, ComponentResources componentResources,
String expression, Location location )
{
- return new EquandaMessageBinding( componentResources, expression, location, messagesSource );
+ return new EquandaMessageBinding( expression, location, messages );
}
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBinding.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBinding.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBinding.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -25,10 +25,9 @@
package org.equanda.t5gui.bindings;
import org.apache.tapestry5.Binding;
-import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.ioc.BaseLocatable;
import org.apache.tapestry5.ioc.Location;
-import org.equanda.t5gui.services.EquandaMessagesSource;
+import org.equanda.t5gui.services.EquandaMessages;
import java.lang.annotation.Annotation;
@@ -42,24 +41,20 @@
implements Binding
{
private String expression;
- private ComponentResources componentResources;
- private EquandaMessagesSource messagesSource;
+ private EquandaMessages messages;
/**
* Creates HasEquandaMessage Binding
*
- * @param componentResources component resources
* @param expression message expression
* @param location location
- * @param messagesSource equanda message source
+ * @param messages equanda message source
*/
- public HasEquandaMessageBinding( ComponentResources componentResources, String expression, Location location,
- EquandaMessagesSource messagesSource )
+ public HasEquandaMessageBinding( String expression, Location location, EquandaMessages messages )
{
super( location );
- this.componentResources = componentResources;
this.expression = expression;
- this.messagesSource = messagesSource;
+ this.messages = messages;
}
/**
@@ -68,7 +63,7 @@
public Object get()
{
String key = expression != null ? expression.trim() : expression;
- String msg = messagesSource.getMessages( componentResources ).get( key );
+ String msg = messages.get( key );
return msg != null && msg.length() > 0 && msg.charAt( 0 ) != '[';
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBindingFactory.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBindingFactory.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/HasEquandaMessageBindingFactory.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -28,7 +28,7 @@
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.ioc.Location;
import org.apache.tapestry5.services.BindingFactory;
-import org.equanda.t5gui.services.EquandaMessagesSource;
+import org.equanda.t5gui.services.EquandaMessages;
/**
* Factory to figure out if there is a message for a string
@@ -39,16 +39,16 @@
implements BindingFactory
{
- private EquandaMessagesSource messagesSource;
+ private EquandaMessages messages;
/**
* Creates Equanda Message Binding Factory
*
- * @param messagesSource equanda message source
+ * @param messages equanda message source
*/
- public HasEquandaMessageBindingFactory( EquandaMessagesSource messagesSource )
+ public HasEquandaMessageBindingFactory( EquandaMessages messages )
{
- this.messagesSource = messagesSource;
+ this.messages = messages;
}
/**
@@ -64,7 +64,7 @@
public Binding newBinding( String description, ComponentResources container, ComponentResources componentResources,
String expression, Location location )
{
- return new HasEquandaMessageBinding( componentResources, expression, location, messagesSource );
+ return new HasEquandaMessageBinding( expression, location, messages );
}
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -35,20 +35,6 @@
extends Messages
{
/**
- * Sets language for translation
- *
- * @param language language
- */
- void setLanguage( String language );
-
- /**
- * Sets page name
- *
- * @param page page name
- */
- void setPage( String page );
-
- /**
* Sets message groups
*
* @param messagesGroups message groups
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -25,6 +25,8 @@
package org.equanda.t5gui.services;
import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
/**
* Equanda Message implementation
@@ -34,11 +36,17 @@
public class EquandaMessagesImpl
implements EquandaMessages
{
- private String language;
- private String page;
- private EquandaMessagesTranslator equandaMessageTranslator;
- private String[] messagesGroups;
+ @Inject
+ private ThreadLocale threadLocale;
+ private EquandaMessagesTranslator equandaMessageTranslator;
+ private String[] messagesGroups = {
+ "equanda-table",
+ "equanda-fixed",
+ "equanda-exceptions",
+ "app",
+ "app-exceptions",
+ };
/**
* Creates Equanda Messages
*
@@ -54,7 +62,7 @@
*/
public boolean contains( String key )
{
- return equandaMessageTranslator.hasTranslation( language, key, page, messagesGroups );
+ return equandaMessageTranslator.hasTranslation( threadLocale.getLocale().getLanguage(), key, messagesGroups );
}
/**
@@ -70,7 +78,7 @@
*/
public String get( String key )
{
- return equandaMessageTranslator.getTranslation( language, key, page, messagesGroups );
+ return equandaMessageTranslator.getTranslation( threadLocale.getLocale().getLanguage(), key, messagesGroups );
}
public MessageFormatter getFormatter( final String key )
@@ -84,16 +92,6 @@
};
}
- public void setLanguage( String language )
- {
- this.language = language;
- }
-
- public void setPage( String page )
- {
- this.page = page;
- }
-
public void setMessagesGroups( String[] messagesGroups )
{
this.messagesGroups = messagesGroups;
Deleted: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -1,59 +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.t5gui.services;
-
-import org.apache.tapestry5.ioc.ObjectLocator;
-import org.apache.tapestry5.model.MutableComponentModel;
-import org.apache.tapestry5.services.ClassTransformation;
-import org.apache.tapestry5.services.InjectionProvider;
-import org.apache.tapestry5.services.TransformConstants;
-
-/**
- * Performs injection of translated messages
- *
- * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
- */
-public class EquandaMessagesInjectionProvider
- implements InjectionProvider
-{
- @SuppressWarnings( "unchecked" )
- public boolean provideInjection( String fieldName, Class fieldType, ObjectLocator locator,
- ClassTransformation transformation, MutableComponentModel componentModel )
- {
-
- if ( fieldType.equals( EquandaMessages.class ) )
- {
- String msgSourceField = transformation.addInjectedField( EquandaMessagesSource.class,
- "equandaMessagesSource", locator.getService( EquandaMessagesSource.class ) );
- String body = String.format( "%s = %s.%s( %s );", fieldName, msgSourceField, "getMessages", transformation
- .getResourcesFieldName() );
- transformation.makeReadOnly( fieldName );
- transformation.extendMethod( TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE, body );
- return true;
- }
- return false;
- }
-
-}
Deleted: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -1,43 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.t5gui.services;
-
-import org.apache.tapestry5.ComponentResources;
-
-/**
- * Message source for translation
- *
- * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
- */
-public interface EquandaMessagesSource
-{
- /**
- * Gets equanda messages for specified component
- *
- * @param componentResources component resources
- * @return messages
- */
- EquandaMessages getMessages( ComponentResources componentResources );
-}
Deleted: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -1,75 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.t5gui.services;
-
-import org.apache.tapestry5.ComponentResources;
-
-/**
- * Equanda Message Source implementation
- *
- * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
- */
-public class EquandaMessagesSourceImpl
- implements EquandaMessagesSource
-{
- private static final String[] DEFAULT_GROUPS = {
- "equanda-table",
- "equanda-fixed",
- "equanda-exceptions",
- "app",
- "app-exceptions",
- };
-
- private EquandaMessagesTranslator equandaMessageTranslator;
-
- /**
- * Creates message source
- *
- * @param equandaMessageTranslator message translator
- */
- public EquandaMessagesSourceImpl( EquandaMessagesTranslator equandaMessageTranslator )
- {
- this.equandaMessageTranslator = equandaMessageTranslator;
- }
-
- public EquandaMessages getMessages( ComponentResources componentResources )
- {
- EquandaMessages messages = new EquandaMessagesImpl( equandaMessageTranslator );
- messages.setLanguage( componentResources.getLocale().getLanguage() );
- messages.setPage( componentResources.getPageName() );
-
- if ( componentResources.getPage() instanceof EquandaMessagesGroup )
- {
- messages.setMessagesGroups( ( (EquandaMessagesGroup) componentResources.getPage() ).getMessagesGroups() );
- }
- else
- {
- messages.setMessagesGroups( DEFAULT_GROUPS );
- }
-
- return messages;
- }
-
-}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -36,20 +36,18 @@
*
* @param language language
* @param strKey message key
- * @param page page name
* @param messagesGroups array of message groups
* @return translated message
*/
- String getTranslation( String language, String strKey, String page, String[] messagesGroups );
+ String getTranslation( String language, String strKey, String[] messagesGroups );
/**
* Gets translation for specified key
*
* @param language language
* @param strKey message key
- * @param page page name
* @param messagesGroups array of message groups
* @return translated message
*/
- boolean hasTranslation( String language, String strKey, String page, String[] messagesGroups );
+ boolean hasTranslation( String language, String strKey, String[] messagesGroups );
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -156,7 +156,7 @@
return null;
}
- public String getTranslation( String language, String strKey, String page, String[] messagesGroups )
+ public String getTranslation( String language, String strKey, String[] messagesGroups )
{
String res = translate( language, strKey, messagesGroups );
if ( null == res )
@@ -170,7 +170,7 @@
return res;
}
- public boolean hasTranslation( String language, String strKey, String page, String[] messagesGroups )
+ public boolean hasTranslation( String language, String strKey, String[] messagesGroups )
{
return null != translate( language, strKey, messagesGroups );
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java 2010-02-21 12:25:38 UTC (rev 1204)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/T5guiModule.java 2010-03-03 21:53:26 UTC (rev 1205)
@@ -33,12 +33,24 @@
import org.apache.tapestry5.ioc.annotations.InjectService;
import org.apache.tapestry5.ioc.services.Coercion;
import org.apache.tapestry5.ioc.services.CoercionTuple;
-import org.apache.tapestry5.services.*;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.services.Session;
import org.equanda.persistence.InvalidUoidException;
import org.equanda.persistence.SelectorsState;
import org.equanda.persistence.SelectorsStateType;
import org.equanda.persistence.Uoid;
-import org.equanda.t5gui.bindings.*;
+import org.equanda.t5gui.bindings.AuthDeletableFactory;
+import org.equanda.t5gui.bindings.AuthReadableFactory;
+import org.equanda.t5gui.bindings.AuthWritableFactory;
+import org.equanda.t5gui.bindings.DisplayListFactory;
+import org.equanda.t5gui.bindings.DisplayPrintFactory;
+import org.equanda.t5gui.bindings.DisplaySummaryFactory;
+import org.equanda.t5gui.bindings.EquandaMessageBindingFactory;
+import org.equanda.t5gui.bindings.HasEquandaMessageBindingFactory;
import org.equanda.t5gui.translators.UoidTranslator;
import org.slf4j.Logger;
@@ -65,6 +77,8 @@
public static void bind( ServiceBinder binder )
{
binder.bind( LoginInfoService.class, LoginInfoServiceImpl.class );
+ binder.bind( EquandaMessages.class, EquandaMessagesImpl.class );
+ binder.bind( EquandaMessagesTranslator.class, EquandaMessagesTranslatorImpl.class );
// Make bind() calls on the binder object to define most IoC services.
// Use service builder methods (example below) when the implementation
@@ -220,27 +234,6 @@
}
/**
- * Building Equanda Messages Source
- *
- * @param equandaMessageTranslator Equanda Message Translator
- * @return new Messages Source
- */
- public static EquandaMessagesSource build( EquandaMessagesTranslator equandaMessageTranslator )
- {
- return new EquandaMessagesSourceImpl( equandaMessageTranslator );
- }
-
- /**
- * Building Equanda Message Translator
- *
- * @return new Message Translator
- */
- public static EquandaMessagesTranslator build()
- {
- return new EquandaMessagesTranslatorImpl();
- }
-
- /**
* Building Equanda Setter Cache
*
* @return new EquandaSetterCache
@@ -251,27 +244,17 @@
}
/**
- * Contributes the injection providers
- *
- * @param configuration configuration
- */
- public static void contributeInjectionProvider( OrderedConfiguration<InjectionProvider> configuration )
- {
- configuration.add( "EquandaMessages", new EquandaMessagesInjectionProvider() );
- }
-
- /**
* Contributes the factory for equanda binding prefixes
*
* @param configuration configuration to add to
- * @param messagesSource Equanda Message Source
+ * @param messages Equanda Messages
* @param loginInfo login info service
*/
public static void contributeBindingSource( MappedConfiguration<String, BindingFactory> configuration,
- EquandaMessagesSource messagesSource, LoginInfoService loginInfo )
+ EquandaMessages messages, LoginInfoService loginInfo )
{
- configuration.add( "equanda-message", new EquandaMessageBindingFactory( messagesSource ) );
- configuration.add( "has-equanda-message", new HasEquandaMessageBindingFactory( messagesSource ) );
+ configuration.add( "equanda-message", new EquandaMessageBindingFactory( messages ) );
+ configuration.add( "has-equanda-message", new HasEquandaMessageBindingFactory( messages ) );
configuration.add( "equanda-readable", new AuthReadableFactory( loginInfo ) );
configuration.add( "equanda-writable", new AuthWritableFactory( loginInfo ) );
configuration.add( "equanda-deletable", new AuthDeletableFactory( loginInfo ) );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-21 12:30:48
|
Revision: 1204
http://equanda.svn.sourceforge.net/equanda/?rev=1204&view=rev
Author: triathlon98
Date: 2010-02-21 12:25:38 +0000 (Sun, 21 Feb 2010)
Log Message:
-----------
EQ-373 setting a FieldValidator for a link field does not compile
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/DMObject.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/DMObject.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMObject.java.vm 2010-02-16 21:36:03 UTC (rev 1203)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMObject.java.vm 2010-02-21 12:25:38 UTC (rev 1204)
@@ -105,7 +105,7 @@
#end## hasChoice
#set( $count = 0 )
#foreach( $fv in $field.Validators )
- FieldValidator fv${field.Name}${count} = new $fv().setTableAndField( "${table.Name}", "${field.Name}}" );
+ FieldValidator<DM${field.LinkTableName}, DM${table.Name}> fv${field.Name}${count} = new $fv().setTableAndField( "${table.Name}", "${field.Name}}" );
#set( $count = $count + 1 )
#end
#end## foreach field
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-16 21:36:09
|
Revision: 1203
http://equanda.svn.sourceforge.net/equanda/?rev=1203&view=rev
Author: triathlon98
Date: 2010-02-16 21:36:03 +0000 (Tue, 16 Feb 2010)
Log Message:
-----------
temporary fix for a strange error, needs further investigation
Modified Paths:
--------------
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java 2010-02-14 16:09:58 UTC (rev 1202)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java 2010-02-16 21:36:03 UTC (rev 1203)
@@ -24,8 +24,17 @@
package org.equanda.domain.xml;
-import com.thoughtworks.xstream.annotations.*;
-import org.equanda.domain.xml.aid.*;
+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 com.thoughtworks.xstream.annotations.XStreamOmitField;
+import org.equanda.domain.xml.aid.CaseConversionValue;
+import org.equanda.domain.xml.aid.DefaultType;
+import org.equanda.domain.xml.aid.ImplicitBooleanConverter;
+import org.equanda.domain.xml.aid.ListFilter;
+import org.equanda.domain.xml.aid.TemplateUtil;
+import org.equanda.domain.xml.aid.TransformationUtil;
import org.equanda.domain.xml.transform.RootTable;
import java.util.ArrayList;
@@ -761,6 +770,7 @@
case TYPE_CLOB:
return "java.lang.String";
case TYPE_LINK:
+ if ( null == clientPackage ) clientPackage = "/*no clientPackage, field not validated???*/";
return clientPackage + linkTableName;
default:
return "Unknown";
@@ -793,6 +803,7 @@
case TYPE_CLOB:
return "java.lang.String";
case TYPE_LINK:
+ if ( null == serverPackage ) serverPackage = "/*no serverPackage, field not validated???*/";
return serverPackage + "pm.DM" + linkTableName;
default:
return "Unknown";
@@ -872,6 +883,7 @@
case TYPE_CLOB:
return "java.lang.String";
case TYPE_LINK:
+ if ( null == clientPackage ) clientPackage = "/*no clientPackage, field not validated???*/";
return clientPackage + linkTableName;
default:
return "Unknown";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-14 16:10:04
|
Revision: 1202
http://equanda.svn.sourceforge.net/equanda/?rev=1202&view=rev
Author: triathlon98
Date: 2010-02-14 16:09:58 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
try to improve line number reported
Modified Paths:
--------------
trunk/equanda-server/src/main/java/org/equanda/ymport/ImportWorker.java
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/ImportWorker.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/ImportWorker.java 2010-02-14 15:53:32 UTC (rev 1201)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/ImportWorker.java 2010-02-14 16:09:58 UTC (rev 1202)
@@ -54,7 +54,7 @@
{
ImportHandler handler = null;
String output = null;
- int lineNumber = 1;
+ int lineNumber = 0;
BufferedReader in;
if ( reader instanceof BufferedReader )
@@ -73,6 +73,7 @@
{
while ( ( output == null ) && ( ( line = in.readLine() ) != null ) )
{
+ lineNumber++;
if ( log.isDebugEnabled() ) log.debug( line );
// hack to make testing using a servlet possible
@@ -121,7 +122,6 @@
tx.commit();
}
}
- lineNumber++;
}
}
catch ( ImportHandlerException ihe )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-14 15:53:40
|
Revision: 1201
http://equanda.svn.sourceforge.net/equanda/?rev=1201&view=rev
Author: triathlon98
Date: 2010-02-14 15:53:32 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
improve logging
Modified Paths:
--------------
trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java
trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java
trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java 2010-02-14 15:15:24 UTC (rev 1200)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java 2010-02-14 15:53:32 UTC (rev 1201)
@@ -136,7 +136,7 @@
Object value = ih.ymport( fields );
if ( value == null )
{
- throw new ImportHandlerException( "Referenced record not found" );
+ throw new ImportHandlerException( "Referenced record not found " + fields );
}
fh.setField( proxy, value );
}
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java 2010-02-14 15:15:24 UTC (rev 1200)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java 2010-02-14 15:53:32 UTC (rev 1201)
@@ -99,7 +99,6 @@
throws ImportHandlerException
{
String table = ImportParser.parseTableTable( line );
- System.out.println( "!!!!!!! get table handler for " + table );
TableHandler tableHandler = databaseMap.getTableHandler( table );
FieldMap fieldMap = databaseMap.getFieldMap( table );
Collection fields = buildFieldList( databaseMap, fieldMap, line );
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java 2010-02-14 15:15:24 UTC (rev 1200)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java 2010-02-14 15:53:32 UTC (rev 1201)
@@ -68,19 +68,14 @@
public EquandaProxy ymport( EquandaProxy proxy, ImportHandler importHandler, Collection collection )
throws Exception
{
- System.out.println( "!!!!!!! TableHandlerBase going to update one" + proxy );
if ( null == proxy.getId() )
{
- System.out.println( "!!!!!!! TableHandlerBase going to test new " + proxy );
proxy = select( proxy );
- System.out.println( "!!!!!!! TableHandlerBase going to test res " + proxy );
if ( null != proxy.getId() )
{
- System.out.println( "!!!!!!! TableHandlerBase going read fields again" );
importHandler.ymport( proxy, collection );
}
}
- System.out.println( "!!!!!!! TableHandlerBase going to update" );
proxy.equandaUpdate();
return proxy;
}
@@ -95,7 +90,6 @@
public EquandaProxy select( EquandaProxy proxy )
throws Exception
{
- System.out.println( "!!!!!!! TableHandlerBase no-op select" );
return proxy;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-14 15:15:41
|
Revision: 1200
http://equanda.svn.sourceforge.net/equanda/?rev=1200&view=rev
Author: triathlon98
Date: 2010-02-14 15:15:24 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
EQ-372 avoid duplicate declaration
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2010-02-14 13:44:28 UTC (rev 1199)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2010-02-14 15:15:24 UTC (rev 1200)
@@ -143,8 +143,12 @@
#if( $field.isDefaultClass() )
#set( $defaulttype = "${field.WrappingFieldType}" )
#if( $field.isMultiple() ) #set( $defaulttype = "Collection<${field.WrappingFieldType}>" ) #end
- org.equanda.validation.Default<${defaulttype}> validator = (org.equanda.validation.Default<${defaulttype}>) Thread.currentThread().getContextClassLoader().loadClass( "${field.Default}" ).newInstance();
- proxy.set${field.Name}( validator.getDefault() );
+ {
+ org.equanda.validation.Default<${defaulttype}> defaultHandler =
+ (org.equanda.validation.Default<${defaulttype}>) Thread.currentThread().
+ getContextClassLoader().loadClass( "${field.Default}" ).newInstance();
+ proxy.set${field.Name}( defaultHandler.getDefault() );
+ }
#end
#end ## !internal, !auto etc.
#end ## hasDefault
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-14 13:44:34
|
Revision: 1199
http://equanda.svn.sourceforge.net/equanda/?rev=1199&view=rev
Author: triathlon98
Date: 2010-02-14 13:44:28 +0000 (Sun, 14 Feb 2010)
Log Message:
-----------
fix typo
Modified Paths:
--------------
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java 2010-02-12 20:30:34 UTC (rev 1198)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java 2010-02-14 13:44:28 UTC (rev 1199)
@@ -90,7 +90,7 @@
field = root.getField( getFieldName() );
if ( null == field )
{
- select.err( dm, "select " + getName() + " unknown field " + getFieldName() + "in table " + getTableName() );
+ select.err( dm, "select " + getName() + " unknown field " + getFieldName() + " in table " + getTableName() );
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-12 20:30:41
|
Revision: 1198
http://equanda.svn.sourceforge.net/equanda/?rev=1198&view=rev
Author: triathlon98
Date: 2010-02-12 20:30:34 +0000 (Fri, 12 Feb 2010)
Log Message:
-----------
small fixes
Modified Paths:
--------------
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java
trunk/equanda-dm/src/main/resources/equanda.dtd
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java 2010-02-08 07:59:11 UTC (rev 1197)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java 2010-02-12 20:30:34 UTC (rev 1198)
@@ -570,7 +570,7 @@
}
else
{
- lnmValue = getTable();
+ lnmValue = getDmTable().getRoot().getName();
}
lnMap.put( linkName, lnmValue );
Modified: trunk/equanda-dm/src/main/resources/equanda.dtd
===================================================================
--- trunk/equanda-dm/src/main/resources/equanda.dtd 2010-02-08 07:59:11 UTC (rev 1197)
+++ trunk/equanda-dm/src/main/resources/equanda.dtd 2010-02-12 20:30:34 UTC (rev 1198)
@@ -101,7 +101,7 @@
<!--
Specify that this table type is the default instance type.
Possibly give a class-name to indicate the default type.
- You can set whether it is forced that all instanced are of default type.
+ You can set whether it is forced that all instances 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.
-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-02-08 07:59:18
|
Revision: 1197
http://equanda.svn.sourceforge.net/equanda/?rev=1197&view=rev
Author: triathlon98
Date: 2010-02-08 07:59:11 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
EQ-371 allow replacing the EquandaUser and EquandaRole tables by something else
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/src/site/wiki/templates/login.wiki
Modified: trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/ejb3/HTObjectBase.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -35,7 +35,11 @@
package ${package}.server;
-import ${package}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${package}.client.$userTable;
import ${package}.server.pm.*;
import org.equanda.client.EquandaException;
import org.equanda.client.ExceptionCodes;
@@ -89,13 +93,13 @@
#set( $loginPackage="" )
#set( $loginPackage=$!{engine.getLoginConfig("package")} )
#if( "x" != "$loginPackage" )
- #if( "EquandaUser" == $table.Name )
+ #if( "$userTable" == $table.Name )
${loginPackage}.LoginCache.setUser( entity.getUserName() );
#end
- #if( "EquandaRole" == $table.Name )
+ #if( "$roleTable" == $table.Name )
${loginPackage}.LoginCache.setRoleAuths( entity.getRoleName(),
new org.equanda.auth.ParsedAuthAndConfigProvider( entity.getAuthAndConfig() ) );
- for ( EquandaUser user : EquandaUser.selectRole( entity.getId() ) )
+ for ( $userTable user : ${userTable}.selectRole( entity.getId() ) )
{
try
{
Modified: trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -32,12 +32,17 @@
package ${package};
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+
import org.equanda.client.LoginInfo;
-#set( $ejbPackage=${engine.getConfig("ejb-package")} )
-import ${ejbPackage}.server.pm.DMEquandaUser;
-import ${ejbPackage}.server.pm.DMEquandaRole;
-import ${ejbPackage}.client.HREquandaRole;
-import ${ejbPackage}.client.HREquandaUser;
+#set( $ejbPackage = ${engine.getConfig("ejb-package")} )
+import ${ejbPackage}.server.pm.DM$roleTable;
+import ${ejbPackage}.server.pm.DM$userTable;
+import ${ejbPackage}.client.HR$roleTable;
+import ${ejbPackage}.client.HR$userTable;
import org.apache.log4j.Logger;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
@@ -70,11 +75,11 @@
public LoginInfo getLoginInfo( String username )
throws EquandaException
{
- List<DMEquandaUser> users =
- HREquandaUser.equandaRunQuery( em, HREquandaUser.getUserNameQuery( null, username ) );
+ List<DM$userTable> users =
+ HR${userTable}.equandaRunQuery( em, HR${userTable}.getUserNameQuery( null, username ) );
if ( users.size() != 0 )
{
- DMEquandaUser dmUser = users.get( 0 );
+ DM$userTable dmUser = users.get( 0 );
boolean isAdmin = false;
boolean isNotGui = false;
@@ -82,7 +87,7 @@
List<String> roles = new ArrayList<String>();
List<String> aacRoles = new ArrayList<String>();
- for ( DMEquandaRole role : dmUser.getRoles() )
+ for ( DM$roleTable role : dmUser.getRoles() )
{
aacRoles.add( role.getRoleName() );
isAdmin |= role.getGuiAdministrator();
@@ -100,7 +105,7 @@
roles.add( "${engine.getConfig("default-role")}" );
}
- LoginInfo info = new LoginInfo( HREquandaUser.get( dmUser ) );
+ LoginInfo info = new LoginInfo( HR${userTable}.get( dmUser ) );
info.setGuiAdministrator( isAdmin );
info.setGuiAccessProhibited( isNotGui );
info.setRoles( roles );
@@ -115,11 +120,11 @@
public String getRoleAuthAndConfig( String role )
{
- List<DMEquandaRole> roles =
- HREquandaRole.equandaRunQuery( em, HREquandaRole.getRoleQuery( null, role ) );
+ List<DM$roleTable> roles =
+ HR${roleTable}.equandaRunQuery( em, HR${roleTable}.getRoleQuery( null, role ) );
if ( roles.size() != 0 )
{
- DMEquandaRole dmRole = roles.get( 0 );
+ DM${roleTable} dmRole = roles.get( 0 );
return dmRole.getAuthAndConfig();
}
return null;
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -37,8 +37,12 @@
#set( $ejbPackage=${engine.getConfig("ejb-package")} )
#set( $loginPackage=${engine.getLoginConfig("package")} )
-import ${ejbPackage}.client.EquandaRole;
-import ${ejbPackage}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${ejbPackage}.client.$roleTable;
+import ${ejbPackage}.client.$userTable;
import ${loginPackage}.LoginCache;
import org.apache.log4j.Logger;
@@ -226,13 +230,13 @@
if( this.roleName != null )
{
- EquandaRole thisRole = EquandaRole.selectRole( this.roleName );
+ ${roleTable} thisRole = ${roleTable}.selectRole( this.roleName );
thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisRole.equandaUpdate();
}
else
{
- EquandaUser thisUser = (EquandaUser)loginInfoService.getLoginInfo().getUser();
+ $userTable thisUser = ($userTable)loginInfoService.getLoginInfo().getUser();
thisUser.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisUser.equandaUpdate();
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -36,8 +36,12 @@
package ${package}.pages;
#set( $ejbPackage=${engine.getConfig("ejb-package")} )
-import ${ejbPackage}.client.EquandaRole;
-import ${ejbPackage}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${ejbPackage}.client.$roleTable;
+import ${ejbPackage}.client.$userTable;
import org.apache.log4j.Logger;
import org.apache.tapestry5.ComponentResources;
@@ -102,9 +106,9 @@
List<OptionModel> list = new ArrayList<OptionModel>();
try{
- Collection<EquandaRole> coll = EquandaRole.selectEquandaAll();
+ Collection<${roleTable}> coll = ${roleTable}.selectEquandaAll();
- for ( EquandaRole role : coll )
+ for ( ${roleTable} role : coll )
{
list.add( new EquandaOptionModel (role.getRoleName(), role.getRoleName() ) );
}
@@ -124,9 +128,9 @@
try
{
LoginInfo li = loginInfoService.getLoginInfo();
- EquandaUser theUser = (EquandaUser)li.getUser();
+ $userTable theUser = ($userTable)li.getUser();
- for( EquandaRole thisRole : theUser.getRoles() )
+ for( $roleTable thisRole : theUser.getRoles() )
{
if( thisRole.isGuiAdministrator() )
{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2010-02-08 07:59:11 UTC (rev 1197)
@@ -35,8 +35,12 @@
package ${package}.pages.${table.VarName};
-import ${ejbPackage}.client.EquandaRole;
-import ${ejbPackage}.client.EquandaUser;
+#set( $userTable = "EquandaUser" )
+#set( $userTable = $engine.getConfig("user-table") )
+#set( $roleTable = "EquandaRole" )
+#set( $roleTable = $engine.getConfig("role-table") )
+import ${ejbPackage}.client.$roleTable;
+import ${ejbPackage}.client.$userTable;
import ${package}.pages.AuthAndConfigTables;
import ${loginPackage}.LoginCache;
@@ -438,13 +442,13 @@
if( getRoleName() != null )
{
- EquandaRole thisRole = EquandaRole.selectRole( getRoleName() );
+ ${roleTable} thisRole = ${roleTable}.selectRole( getRoleName() );
thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisRole.equandaUpdate();
}
else
{
- EquandaUser thisUser = (EquandaUser)loginInfoService.getLoginInfo().getUser();
+ $userTable thisUser = ($userTable)loginInfoService.getLoginInfo().getUser();
thisUser.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisUser.equandaUpdate();
}
Modified: trunk/src/site/wiki/templates/login.wiki
===================================================================
--- trunk/src/site/wiki/templates/login.wiki 2010-01-29 19:06:20 UTC (rev 1196)
+++ trunk/src/site/wiki/templates/login.wiki 2010-02-08 07:59:11 UTC (rev 1197)
@@ -82,7 +82,7 @@
h3. AppModule
In your tapestry application module, the following needs to be included
{code}
- /* include this forwhen putting your app behind SSL/https
+ /* include this when putting your app behind SSL/https
public void contributeMetaDataLocator( MappedConfiguration<String, String> configuration )
{
configuration.add( MetaDataConstants.SECURE_PAGE, "true" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-29 19:06:53
|
Revision: 1196
http://equanda.svn.sourceforge.net/equanda/?rev=1196&view=rev
Author: triathlon98
Date: 2010-01-29 19:06:20 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
remove redundant '== true'
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-01-22 19:48:04 UTC (rev 1195)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2010-01-29 19:06:20 UTC (rev 1196)
@@ -128,7 +128,7 @@
for( EquandaRole thisRole : theUser.getRoles() )
{
- if( thisRole.isGuiAdministrator() == true )
+ if( thisRole.isGuiAdministrator() )
{
guiAdmin = true;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-22 19:48:14
|
Revision: 1195
http://equanda.svn.sourceforge.net/equanda/?rev=1195&view=rev
Author: triathlon98
Date: 2010-01-22 19:48:04 +0000 (Fri, 22 Jan 2010)
Log Message:
-----------
example file
Modified Paths:
--------------
trunk/src/site/docbook/docbook.xml
Modified: trunk/src/site/docbook/docbook.xml
===================================================================
--- trunk/src/site/docbook/docbook.xml 2010-01-21 09:34:51 UTC (rev 1194)
+++ trunk/src/site/docbook/docbook.xml 2010-01-22 19:48:04 UTC (rev 1195)
@@ -1,19 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<article id="docbook" lang="en">
- <title>Page title</title>
- <toc></toc>
-<para>
-<note>
-<para><emphasis>warning</emphasis> : this documentation is still somewhat incomplete. We are working hard to improve both the feature set and the documentation. So do have a browse around, but definitely come back later to see how things evolve.</para>
-</note>
- </para>
+ <title>Page title</title>
-<section><title>Section</title>
-<para>
-A sample paragraph.
-</para>
- </section>
+ <toc />
+ <para>
+ <note>
+ <para><emphasis>warning</emphasis> : this documentation is still
+ somewhat incomplete. We are working hard to improve both the feature set
+ and the documentation. So do have a browse around, but definitely come
+ back later to see how things evolve.</para>
+ </note>
+ </para>
+
+ <section>
+ <title>Section</title>
+
+ <para>A sample paragraph.</para>
+ </section>
</article>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-21 09:43:06
|
Revision: 1193
http://equanda.svn.sourceforge.net/equanda/?rev=1193&view=rev
Author: triathlon98
Date: 2010-01-21 09:10:22 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
EQ-370 fix (EJB) rights on actions
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2010-01-21 09:07:32 UTC (rev 1192)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2010-01-21 09:10:22 UTC (rev 1193)
@@ -87,7 +87,7 @@
#end
#macro( actionSecurityRole $action )
-#if( $table.hasSecurityRole() )
+#if( $action.hasSecurityRole() )
#set( $sep="" )
#set( $roles=$action.SecurityRole.split(",") )
@RolesAllowed({ #foreach( $role in $roles ) $sep"$role" #set( $sep=",") #end })
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-21 09:35:12
|
Revision: 1194
http://equanda.svn.sourceforge.net/equanda/?rev=1194&view=rev
Author: triathlon98
Date: 2010-01-21 09:34:51 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
EQ-369 convert some stuff to docbook (lots to go)
Modified Paths:
--------------
trunk/pom.xml
trunk/src/site/site.xml
Added Paths:
-----------
trunk/src/site/docbook/
trunk/src/site/docbook/codingstyle.xml
trunk/src/site/docbook/developers.xml
trunk/src/site/docbook/docbook.xml
Removed Paths:
-------------
trunk/src/site/wiki/developers.wiki
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-21 09:10:22 UTC (rev 1193)
+++ trunk/pom.xml 2010-01-21 09:34:51 UTC (rev 1194)
@@ -187,14 +187,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <!--<version>2.0-beta-7</version>-->
+ <version>2.0.1</version>
<dependencies>
<dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-docbook-simple</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <!--
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <!++<version>2.0-beta-7</version>++>
+ <dependencies>
+ <dependency>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-site-plugin</artifactId>
<version>${staticwiki-release-version}</version>
</dependency>
</dependencies>
+ -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -502,11 +514,13 @@
<artifactId>joda-time</artifactId>
<version>1.5.2</version>
</dependency>
+ <!--
<dependency>
<groupId>org.staticwiki</groupId>
<artifactId>staticwiki-renderer</artifactId>
<version>${staticwiki-release-version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
@@ -619,7 +633,9 @@
<properties>
<tapestry-release-version>5.1.0.5</tapestry-release-version>
<chenillekit-version>1.0.0</chenillekit-version>
+ <!--
<staticwiki-release-version>0.9.1-SNAPSHOT</staticwiki-release-version>
+ -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Added: trunk/src/site/docbook/codingstyle.xml
===================================================================
--- trunk/src/site/docbook/codingstyle.xml (rev 0)
+++ trunk/src/site/docbook/codingstyle.xml 2010-01-21 09:34:51 UTC (rev 1194)
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<!--
+ ~ This file is part of Geomajas, a component framework for building
+ ~ rich Internet applications (RIA) with sophisticated capabilities for the
+ ~ display, analysis and management of geographic information.
+ ~ It is a building block that allows developers to add maps
+ ~ and other geographic data capabilities to their web applications.
+ ~
+ ~ Copyright 2008-2010 Geosparc, http://www.geosparc.com, Belgium
+ ~
+ ~ This program is free software: you can redistribute it and/or modify
+ ~ it under the terms of the GNU Affero General Public License as
+ ~ published by the Free Software Foundation, either version 3 of the
+ ~ License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU Affero General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Affero General Public License
+ ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+<article id="release" lang="en">
+ <title>Coding quality and style</title>
+
+ <toc />
+
+ <!--
+References
+- http://maven.apache.org/developers/conventions/code.html
+- http://docs.jboss.org/process-guide/en/html/coding.html
+- http://equanda.org/developers.html
+- http://svn.collab.net/repos/svn/trunk/www/hacking.html
+- http://java.sun.com/docs/codeconv/
+- http://geosoft.no/development/javastyle.html (!)
+- http://192.220.96.201/essays/java-style/single-page.html
+- http://gee.cs.oswego.edu/dl/html/javaCodingStd.html
+- http://www.ambysoft.com/essays/javaCodingStandards.html
+- http://docs.codehaus.org/display/GEOT/5+Project+Conventions
+-->
+
+ <para>As a general note, the coding style and naming conventions should be
+ adhered to. Some parts are even checked by the checkstyle maven plugin.
+ However, deviations are always allowed when this enhances code readability
+ (but only when checkstyle accepts it, otherwise the build will fail).</para>
+
+ <para>You can configure a formatter to apply this style in your favourite
+ IDE (see also at the bottom). You can be liberal on applying this on new
+ code, but be prudent when applying these to the existing code base. Code
+ style changes make revision changes a lot more difficult and should thus be
+ limited. If there is a need to reformat existing code, then this should be
+ done in a separate commit.</para>
+
+ <section>
+ <title>Class, method and variable names</title>
+
+ <para>Rules</para>
+
+ <itemizedlist>
+ <listitem>Use meaningful names. Especially class and method names should
+ explain their purpose.</listitem>
+
+ <listitem>For class, method and (non-static) variable names, use
+ camelCase to separate the words, not underscores. For abbreviations,
+ capitalize he first letter, lower case for the others.</listitem>
+
+ <listitem>Class names start with a capital, for example
+ "EquandaException".</listitem>
+
+ <listitem>Method and (non-static) variable names start lower case, for
+ example "getMessage".</listitem>
+
+ <listitem>All static variables should have capitalized names with words
+ separated by underscores.</listitem>
+
+ <listitem>Package names are all lower case and should be
+ singular.</listitem>
+
+ <listitem>Use getXxx/setXxx/isXxx.</listitem>
+
+ <listitem>Abbreviations and acronyms should not be uppercase when used
+ as name (for example, use "exportHtml()").</listitem>
+
+ <listitem>All names should be written in English.</listitem>
+
+ <listitem>The terms get/set must be used where an attribute is accessed
+ directly.</listitem>
+
+ <listitem>"is" prefix should be used for boolean variables and methods.
+ In some cases, when this is more readable, "has", "can" or "should" can
+ also be used as prefix.</listitem>
+
+ <listitem>Complement names must be used for complement entities. These
+ include get/set, add/remove, create/destroy, start/stop, insert/delete,
+ increment/decrement, old/new, begin/end, first/last, up/down, min/max,
+ next/previous, old/new, open/close, show/hide, suspend/resume,
+ etc.</listitem>
+
+ <listitem>Exception classes should be suffixed with
+ Exception.</listitem>
+ </itemizedlist>
+
+ <para>Recommendations</para>
+
+ <itemizedlist>
+ <listitem>Usually class names are nouns and method names are
+ verbs.</listitem>
+
+ <listitem>Generic variables should have the same name as their
+ type.</listitem>
+
+ <listitem>Variables with a large scope should have long names, variables
+ with a small scope can have short names. Scratch variables used for
+ temporary storage or indices are best kept short. A programmer reading
+ such variables should be able to assume that its value is not used
+ outside a few lines of code. Common scratch variables for integers are
+ i, j, k, m, n and for characters c and d.</listitem>
+
+ <listitem>The name of the object is implicit, and should be avoided in a
+ method name. For example, use "line.getLength()" instead of
+ "line.getLineLength()". The latter might seem natural in the class
+ declaration, but proves superfluous in use, as shown in the
+ example.</listitem>
+
+ <listitem>The term compute can be used in methods where something is
+ computed.</listitem>
+
+ <listitem>The term find can be used in methods where something is looked
+ up.</listitem>
+
+ <listitem>The term initialize can be used where an object or a concept
+ is established.</listitem>
+
+ <listitem>Plural form should be used on names representing a collection
+ of objects.</listitem>
+
+ <listitem>Negated boolean variable names must be avoided.</listitem>
+
+ <listitem>Default interface implementations can be prefixed by Default.
+ However, if it is not expected that there will even be another
+ implementation, it can be a lot more natural to suffix with "Impl"
+ instead.</listitem>
+
+ <listitem>Singleton classes should return their sole instance through
+ method getInstance(), should have a private constructor and be declared
+ final.</listitem>
+
+ <listitem>Functions (methods returning an object) should be named after
+ what they return and procedures (void methods) after what they
+ do.</listitem>
+ </itemizedlist>
+
+ <section><title>Comment</title>Each file should have the correct copyright
+ notice at the start of the file. <programlisting>/**
+ * 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.
+ */</programlisting><itemizedlist>
+ <listitem>The copyright message should be at the top of the
+ file.</listitem>
+
+ <listitem>Each class and interface should have class comments
+ indicating the purpose of the class.</listitem>
+
+ <listitem>Public methods should be commented if the meaning is not
+ entirely clear from method and parameter names (is it ever?). When the
+ method overrides or implements a method, then repeating the javadoc is
+ not needed (it is recommended to us "@inheritedDoc").</listitem>
+
+ <listitem>Comments in the code are recommended when they explain a
+ block of code or when they explain why things are done in a certain
+ way. Repeating the code in human readable wording is
+ wasteful.</listitem>
+
+ <listitem>Use "@todo" comments to indicate shortcuts or hacks which
+ should be fixed. Better still is just to do it right and not have the
+ shortcut.</listitem>
+
+ <listitem>All comments should be written in English.</listitem>
+
+ <listitem>Comments should be indented relative to their position in
+ the code.</listitem>
+
+ <listitem>
+ <para>Javadoc comments should be active, not descriptive (for
+ example on method "getXxx()" the comment could be "Get xxx").</para>
+ </listitem>
+ </itemizedlist></section>
+
+ <section>
+ <title>Claim your code</title>
+
+ <para>Be proud of your code and take responsibility of your changes.
+ When making any kind of significant changes (not for reformatting,
+ fixing typing errors or renaming), add your full name (optionally
+ including e-mail link) at the bottom of the authors list in the class
+ comments.</para>
+ </section>
+
+ <section>
+ <title>Code layout</title>
+
+ <para>See the example below</para>
+
+ <programlisting>/**
+ * 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.bladibla;
+
+/**
+ * Page for importing/updating a portfolio from one of a selection of formats.
+ *
+ * @author <a href="mailto:au...@em...">Author's name</a>
+ * @author Another Author's Name
+ */
+@Annotation( param1 = "value1", param2 = "value2" )
+public class Foo
+ implements Serializable
+{
+ int[] x = new int[] { 1, 3, 5, 6, 7, 87, 1213, 2 };
+
+ /**
+ * Do something
+ *
+ * @param x some data
+ * @param y more data
+ */
+ public void foo( int x, int y )
+ throws Exception
+ {
+ for ( int i = 0; i < x ; i++ )
+ {
+ y += ( y ^ 0x123 ) << 2;
+ }
+ do
+ {
+ try
+ {
+ if ( 0 < x && x < 10 )
+ {
+ while ( x != y )
+ {
+ x = f( x * 3 + 5 );
+ }
+ }
+ else
+ {
+ synchronized ( this )
+ {
+ switch ( e.getCode() )
+ {
+ //...
+ }
+ }
+ }
+ }
+ catch ( MyException e )
+ {}
+ finally
+ {
+ int[] arr = (int[]) g( y );
+ x = y >= 0 ? arr[ y ] : -1;
+ }
+ }
+ while ( true );
+ }
+}</programlisting>
+
+ <para>The codingstyle is optimized for readability and thus uses a lot
+ of whitespace both horizontally as vertically.</para>
+
+ <itemizedlist>
+ <listitem>The code is written with the right margin at 120 characters
+ and lines should not be longer than that if possible.</listitem>
+
+ <listitem>All indents should be done using four spaces, no tabs
+ !</listitem>
+
+ <listitem>Braces are always on separate lines. The only exception is
+ for empty blocks and single line ifs and for/while loops.</listitem>
+
+ <listitem>Always use spaces inside brackets.</listitem>
+
+ <listitem>Spaces around operators.</listitem>
+
+ <listitem>No wildcards allowed on import statements.</listitem>
+
+ <listitem>Always use braces when the body is not on the same line as
+ the if, for, while, do-while.</listitem>
+
+ <listitem>Array specifiers must be attached to the type not the
+ variable.</listitem>
+
+ <listitem>Class variables should never be declared public.</listitem>
+
+ <listitem>Logical units within a block should be separated by one
+ blank line.</listitem>
+ </itemizedlist>
+
+ <para>We have an <ulink url="equanda.xml">IntelliJ IDEA</ulink>
+ formatter which can be used. However, be careful not to change the
+ entire formatting of a class.</para>
+ </section>
+ </section>
+</article>
Added: trunk/src/site/docbook/developers.xml
===================================================================
--- trunk/src/site/docbook/developers.xml (rev 0)
+++ trunk/src/site/docbook/developers.xml 2010-01-21 09:34:51 UTC (rev 1194)
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<!--
+ ~ This file is part of Geomajas, a component framework for building
+ ~ rich Internet applications (RIA) with sophisticated capabilities for the
+ ~ display, analysis and management of geographic information.
+ ~ It is a building block that allows developers to add maps
+ ~ and other geographic data capabilities to their web applications.
+ ~
+ ~ Copyright 2008-2010 Geosparc, http://www.geosparc.com, Belgium
+ ~
+ ~ This program is free software: you can redistribute it and/or modify
+ ~ it under the terms of the GNU Affero General Public License as
+ ~ published by the Free Software Foundation, either version 3 of the
+ ~ License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU Affero General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Affero General Public License
+ ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+<article id="release" lang="en">
+ <title>Developers information</title>
+
+ <toc />
+
+ <section>
+ <title>maven targets, profiles, variables</title>
+
+ <para>There are two main ways to install, either just compiling, running
+ the simple tests and installing, or running the full testsuite which does
+ integration tests by deploying some sample stuff into a jboss
+ instance.</para>
+
+ <para>You can choose by using one of the following targets.</para>
+
+ <programlisting>mvn install
+mvn -Dfulltest install
+</programlisting>
+
+ <para>To be able to run the full test suite, you need to include a profile
+ in your maven local settings (.m2/settings.xml).</para>
+
+ <programlisting><settings>
+ <profiles>
+ <profile>
+ <id>dev-joachim</id>
+ <properties>
+ <!-- selenium properties-->
+ <firefox.path>firefox /usr/lib/firefox/firefox-bin</firefox.path>
+
+ <equanda.db.url>jdbc:firebirdsql:localhost/3050:/home/joachim/data/equanda.fdb</equanda.db.url>
+ <equanda.db.login>sysdba</equanda.db.login>
+ <equanda.db.password>masterkey</equanda.db.password>
+ <equanda.db.location>/home/joachim/data/equanda.fdb</equanda.db.location>
+ <equanda.db.empty>/home/joachim/data/equanda-empty.fdb</equanda.db.empty>
+ <equanda.cargo.wait>true</equanda.cargo.wait>
+ <!-- jboss properties-->
+ <equanda.jboss.home>/home/joachim/java/equandajboss</equanda.jboss.home>
+ <equanda.jboss.config>equanda</equanda.jboss.config>
+ <equanda.jboss.host>localhost</equanda.jboss.host>
+ <equanda.jboss.port>8080</equanda.jboss.port>
+ <equanda.jboss.jvmargs>
+ -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
+ -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000
+ </equanda.jboss.jvmargs>
+ <equanda.jboss.logging>medium</equanda.jboss.logging>
+
+ </properties>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>dev-joachim</activeProfile>
+ </activeProfiles>
+
+ <pluginGroups>
+ <pluginGroup>org.equanda</pluginGroup>
+ </pluginGroups>
+
+</settings></programlisting>
+ </section>
+
+ <section><title>Documentation</title><para>All documentation is written in
+ docbook format to allow both PDF and HTML output formats. </para>To generate
+ the project site, use <programlisting>mvn site</programlisting><para>For
+ editing the docbook files, we recommend using <ulink
+ url="http://www.xmlmind.com/xmleditor/">XMLMind</ulink>. The personal
+ version is free and can (at the time of writing) be used for editing open
+ source documentation. </para><para>The docbook files are currently formatted
+ using XMLMind. When using another tool for editing, please keep the current
+ formatting to assure diffs remain usable. </para></section>
+
+ <section>
+ <title>subversion, commits</title>
+
+ <para>All SVN commits should include the JIRA issue number at the start of
+ the commit message, and a short description of the work done. The JIRA
+ issue number allows linking the commits with the issues (as can be seen in
+ JIRA), the short message allows persons to know what is happening without
+ referring to JIRA. The only times JIRA issue number are not needed is for
+ making "obvious" changes like fixing typos.</para>
+
+ <para>Commits should be grouped by issue as much as possible/sensible
+ (better two commits than one commit for fixing two issues, better one
+ commit of five files than five commits of one file (for one
+ issue)).</para>
+
+ <para>Development of the "latest-and-greatest" version happens in
+ "trunk".</para>
+
+ <para>When a release is cut, a tag with the release version as name is
+ created. The release should be built from the tagged files.</para>
+
+ <para>After each commit, the system should still compile and all test
+ cases should still succeed. There is a continuous integration engine
+ (Hudson) which verifies this and sends messages to the developers mailing
+ list on failures.</para>
+ </section>
+
+ <section>
+ <title>Coding</title>
+
+ <para>Note that details about coding style and naming are on the <ulink
+ url="codingstyle.html">coding style</ulink> page.</para>
+
+ <section>
+ <title>Logging</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>For debug level messages, always use
+ <code>isDebugEnabled()</code>.</para>
+ </listitem>
+
+ <listitem>all logging is done through log4j, logger is created using
+ <programlisting>private static final Logger log = Logger.getLogger( ContainingClassName.class );</programlisting></listitem>
+
+ <listitem>logging levels<table>
+ <title>logging levels</title>
+
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry align="center">log level</entry>
+
+ <entry align="center">default on</entry>
+
+ <entry>use</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>ERROR</entry>
+
+ <entry>yes</entry>
+
+ <entry>major problems, should always be visible in logs and
+ are likely to require action from a person (to fix the
+ condition or assure it does not happen again). Indicates
+ that something is seriously wrong.</entry>
+ </row>
+
+ <row>
+ <entry>WARN</entry>
+
+ <entry>yes</entry>
+
+ <entry>warning about potential problems. Should always be
+ visible in logs and a person will probably need to assess
+ whether this is harmless or should be treated as an
+ error.</entry>
+ </row>
+
+ <row>
+ <entry>INFO</entry>
+
+ <entry>yes</entry>
+
+ <entry>important information. You can assume this level is
+ on in production, so it should be carefully considered
+ whether this level is appropriate. In general only used to
+ indicate service status (started, stopped).</entry>
+ </row>
+
+ <row>
+ <entry>DEBUG</entry>
+
+ <entry>no</entry>
+
+ <entry>logging information which is detailed enough to know
+ what is happening in the system, without flooding the
+ logs.</entry>
+ </row>
+
+ <row>
+ <entry>TRACE</entry>
+
+ <entry>no</entry>
+
+ <entry>very detailed logging, probably only making sense to
+ the developer of the code.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table></listitem>
+
+ <listitem>When an exception is caught and (another exception) thrown
+ you should not log the exception. You should however include the cause
+ in the newly thrown exception.</listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Unit testing</title>
+
+ <para>Unit testing: At least each class implementing the public API
+ should have a unit test, testing all methods. For testing JUnit is
+ used.</para>
+
+ <itemizedlist>
+ <listitem>Advantages of unit testing: <itemizedlist>
+ <listitem>
+ <para>Capturing a <ulink
+ url="http://jira.geomajas.org/">JIRA</ulink> bug report in a
+ reproducible manner.</para>
+ </listitem>
+
+ <listitem>Allowing you to specify exactly the behaviour you want,
+ before you start coding.</listitem>
+ </itemizedlist></listitem>
+
+ <listitem>How unit testing should be done: <itemizedlist>
+ <listitem>If you are testing
+ src/main/java/org/geomajas/ToBeTestedClass.java, create a class
+ src/test/java/org/geomajas/ToBeTestedClassTest.java. Actual test
+ methods have a name starting with "test". The class itself should
+ extend jnit.framework.TestCase.</listitem>
+
+ <listitem>
+ <para>The test will automatically be run when running "<code>mvn
+ install</code>".</para>
+ </listitem>
+ </itemizedlist></listitem>
+
+ <listitem>Integration tests should also be provided. These can also be
+ used for testing the user interface (thanks to selenium).</listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Exception handling</title>
+
+ <para>*Never* throw away exception, either log them or throw them again
+ (possibly wrapped). Do not log and throw, this only clutters log files
+ with duplicate exceptions.</para>
+
+ <para>Do not wrap exceptions unnecessarily (so no
+ <code>EquandaException</code> caused by a <code>EquandaException</code>)
+ unless you add additional information in the message.</para>
+
+ <para>When wrapping an exception, always include the cause.</para>
+ </section>
+
+ <section>
+ <title>Refactoring</title>
+
+ <para>Changes in the (public) API use a "deprecate, then remove" cycle.
+ It should be marked "deprecated" in at least one minor version before it
+ can be removed in the next major version.</para>
+ </section>
+
+ <section>
+ <title>File encoding</title>
+
+ <para>All source files, including .properties files should use UTF-8
+ encoding.</para>
+ </section>
+
+ <section>
+ <title>Other</title>
+
+ <para>For the directory structure and file locations, we follow standard
+ maven conventions (see <ulink
+ url="http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html">http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html</ulink>).</para>
+ </section>
+ </section>
+</article>
Added: trunk/src/site/docbook/docbook.xml
===================================================================
--- trunk/src/site/docbook/docbook.xml (rev 0)
+++ trunk/src/site/docbook/docbook.xml 2010-01-21 09:34:51 UTC (rev 1194)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<article id="docbook" lang="en">
+ <title>Page title</title>
+ <toc></toc>
+<para>
+<note>
+<para><emphasis>warning</emphasis> : this documentation is still somewhat incomplete. We are working hard to improve both the feature set and the documentation. So do have a browse around, but definitely come back later to see how things evolve.</para>
+</note>
+ </para>
+
+<section><title>Section</title>
+<para>
+A sample paragraph.
+</para>
+ </section>
+
+</article>
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2010-01-21 09:10:22 UTC (rev 1193)
+++ trunk/src/site/site.xml 2010-01-21 09:34:51 UTC (rev 1194)
@@ -28,6 +28,7 @@
<item name="Configuration" href="config.html"/>
<item name="Domain Model" href="dm.html"/>
<item name="Developers" href="developers.html"/>
+ <item name="Coding Style" href="codingstyle.html"/>
</item>
<item name="Roadmap" href="roadmap.html"/>
<item name="License" href="license.html"/>
Deleted: trunk/src/site/wiki/developers.wiki
===================================================================
--- trunk/src/site/wiki/developers.wiki 2010-01-21 09:10:22 UTC (rev 1193)
+++ trunk/src/site/wiki/developers.wiki 2010-01-21 09:34:51 UTC (rev 1194)
@@ -1,162 +0,0 @@
-h1. Developers information
-
-h2. maven targets, profiles, variables
-
-There are two main ways to install, either just compiling, running the simple tests and installing, or running the full testsuite which does integration tests by deploying some sample stuff into a jboss instance.
-You can choose by using one of the following targets.
-{code}
-mvn install
-mvn -Dfulltest install
-{code}
-
-To be able to run the full test suite, you need to include a profile in your maven local settings (.m2/settings.xml).
-{code}
-<settings>
- <profiles>
- <profile>
- <id>dev-joachim</id>
- <properties>
- <!-- selenium properties-->
- <firefox.path>firefox /usr/lib/firefox/firefox-bin</firefox.path>
-
- <equanda.db.url>jdbc:firebirdsql:localhost/3050:/home/joachim/data/equanda.fdb</equanda.db.url>
- <equanda.db.login>sysdba</equanda.db.login>
- <equanda.db.password>masterkey</equanda.db.password>
- <equanda.db.location>/home/joachim/data/equanda.fdb</equanda.db.location>
- <equanda.db.empty>/home/joachim/data/equanda-empty.fdb</equanda.db.empty>
- <equanda.cargo.wait>true</equanda.cargo.wait>
- <!-- jboss properties-->
- <equanda.jboss.home>/home/joachim/java/equandajboss</equanda.jboss.home>
- <equanda.jboss.config>equanda</equanda.jboss.config>
- <equanda.jboss.host>localhost</equanda.jboss.host>
- <equanda.jboss.port>8080</equanda.jboss.port>
- <equanda.jboss.jvmargs>
- -server -Xms256m -Xmx382m -XX:MaxPermSize=128m -Dsun.net.inetaddr.ttl=15
- -Dsun.rmi.dgc.client.gcInterval=3600000
- -Dsun.rmi.dgc.server.gcInterval=3600000
- </equanda.jboss.jvmargs>
- <equanda.jboss.logging>medium</equanda.jboss.logging>
-
- </properties>
- </profile>
- </profiles>
- <activeProfiles>
- <activeProfile>dev-joachim</activeProfile>
- </activeProfiles>
-
- <pluginGroups>
- <pluginGroup>org.equanda</pluginGroup>
- </pluginGroups>
-
-</settings>
-{code}
-
-h2. Coding quality and style
-
-h3. Class, method and variable names
-
-Use meaningful names. Especially class and method names should explain their purpose. Use standard java camelcase conventions.
-
-h3. Comments
-
-- Each file should have a copyright notice at the start of the file.
-- Each class should have class comments indicating the purpose of the class and the authors.
-- Public methods should be commented if the meaning is not entirely clear from method and parameter names (is it ever?). When the method overrides or implements a method, then repeating the javadoc is not needed.
-- Comments in the code are recommended when they explain a block of code or when they explain why things are done in a certain way. Repeating the code in human readable wording is wasteful.
-- Use "@todo" comments to indicate shortcuts or hacks which should be fixed. Better still is just to do it right and not have the shortcut.
-- When inserting debug statements, always put them inside a "log.isDebugEnabled()" test.
-
-h3. Claim your code
-
-Be proud of your code and take responsibility of your changes. When making any kind of significant changes (not for reformatting, fixing typing errors or renaming), add your name and e-mail address at the bottom of the authors list in the class comments.
-
-h3. Coding style
-
-In equanda we use a coding style which prefers easy reading above displaying a lot of information. Most of the features should be clear in the following piece of code.
-{code}
-/**
- * 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.bladibla;
-
-/**
- * Page for importing/updating a portfolio from one of a selection of formats.
- *
- * @author <a href="mailto:au...@em...">Author's name</a>
- */
-@Annotation( param1 = "value1", param2 = "value2" )
-public class Foo
- implements Serializable
-{
- int[] x = new int[] { 1, 3, 5, 6, 7, 87, 1213, 2 };
-
- /**
- * Do something
- *
- * @param x some data
- * @param y more data
- */
- public void foo( int x, int y )
- throws Exception
- {
- for ( int i = 0; i < x ; i++ )
- {
- y += ( y ^ 0x123 ) << 2;
- }
- do
- {
- try
- {
- if ( 0 < x && x < 10 )
- {
- while ( x != y )
- {
- x = f( x * 3 + 5 );
- }
- }
- else
- {
- synchronized ( this )
- {
- switch ( e.getCode() )
- {
- //...
- }
- }
- }
- }
- catch ( MyException e )
- {}
- finally
- {
- int[] arr = (int[]) g( y );
- x = y >= 0 ? arr[ y ] : -1;
- }
- }
- while ( true );
- }
-}
-{code}
-The code is written with the right margin at 120 characters and lines should not be longer than that if possible.
-An indentation is 4 spaces, tabs should not be used.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2010-01-21 09:07:49
|
Revision: 1192
http://equanda.svn.sourceforge.net/equanda/?rev=1192&view=rev
Author: triathlon98
Date: 2010-01-21 09:07:32 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
spelling fixes
Modified Paths:
--------------
trunk/equanda-dm/src/main/resources/equanda.dtd
Modified: trunk/equanda-dm/src/main/resources/equanda.dtd
===================================================================
--- trunk/equanda-dm/src/main/resources/equanda.dtd 2009-12-16 08:57:05 UTC (rev 1191)
+++ trunk/equanda-dm/src/main/resources/equanda.dtd 2010-01-21 09:07:32 UTC (rev 1192)
@@ -113,7 +113,7 @@
<!--
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
+ 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.
@@ -371,8 +371,8 @@
<!ELEMENT ws-value (#PCDATA)>
<!--
- Indicate the roles which may view this value, default is "all".
- Other possible values are "none", or a
+ Indicate the roles which may view this value, default is "ALL".
+ Other possible values are "NONE", or a
space or comma separated list of roles
-->
<!ELEMENT ws-role (#PCDATA)>
@@ -382,7 +382,7 @@
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).
+ 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.
@@ -567,7 +567,7 @@
<!--
- Comma separated list of filter names. The select is only visible in gui if NONE of these filters is active.
+ Comma separated list of filter names. The select is only visible in gui if none of these filters are active.
-->
<!ELEMENT view-filter (#PCDATA)>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-16 08:57:11
|
Revision: 1191
http://equanda.svn.sourceforge.net/equanda/?rev=1191&view=rev
Author: triathlon98
Date: 2009-12-16 08:57:05 +0000 (Wed, 16 Dec 2009)
Log Message:
-----------
update to next equanda
Modified Paths:
--------------
t5-equanda-example/pom.xml
Modified: t5-equanda-example/pom.xml
===================================================================
--- t5-equanda-example/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
+++ t5-equanda-example/pom.xml 2009-12-16 08:57:05 UTC (rev 1191)
@@ -173,7 +173,7 @@
</pluginRepositories>
<properties>
- <equanda-release-version>0.9.5-SNAPSHOT</equanda-release-version>
+ <equanda-release-version>0.9.6-SNAPSHOT</equanda-release-version>
<tapestry-release-version>5.1.0.5</tapestry-release-version>
<chenillekit-version>1.0.0</chenillekit-version>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-14 11:14:05
|
Revision: 1190
http://equanda.svn.sourceforge.net/equanda/?rev=1190&view=rev
Author: triathlon98
Date: 2009-12-14 11:13:58 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
bump to 0.9.6-SNAPSHOT
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-dm/pom.xml
trunk/equanda-generate/pom.xml
trunk/equanda-maven-plugin/pom.xml
trunk/equanda-server/pom.xml
trunk/equanda-t5gui/pom.xml
trunk/equanda-t5navigation/pom.xml
trunk/equanda-tapestry5/pom.xml
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-gui-t5-test/pom.xml
trunk/equanda-test/test-t5-ear/pom.xml
trunk/equanda-test/test-t5-gui/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/pom.xml
trunk/equanda-util/pom.xml
trunk/pom.xml
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-client/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-dm/pom.xml
===================================================================
--- trunk/equanda-dm/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-dm/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-generate/pom.xml
===================================================================
--- trunk/equanda-generate/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-generate/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-maven-plugin/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<artifactId>equanda</artifactId>
<groupId>org.equanda</groupId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-server/pom.xml
===================================================================
--- trunk/equanda-server/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-server/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-t5gui/pom.xml
===================================================================
--- trunk/equanda-t5gui/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-t5gui/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-t5navigation/pom.xml
===================================================================
--- trunk/equanda-t5navigation/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-t5navigation/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-tapestry5/pom.xml
===================================================================
--- trunk/equanda-tapestry5/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-tapestry5/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-test/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-test/test-core/pom.xml
===================================================================
--- trunk/equanda-test/test-core/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-test/test-core/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-test/test-ddltool/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
Modified: trunk/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t5-test/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-test/test-gui-t5-test/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
Modified: trunk/equanda-test/test-t5-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-ear/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-test/test-t5-ear/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
Modified: trunk/equanda-test/test-t5-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-gui/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-test/test-t5-gui/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-test/test-test/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
Modified: trunk/equanda-tool/pom.xml
===================================================================
--- trunk/equanda-tool/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-tool/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/equanda-util/pom.xml
===================================================================
--- trunk/equanda-util/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/equanda-util/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-14 11:10:19 UTC (rev 1189)
+++ trunk/pom.xml 2009-12-14 11:13:58 UTC (rev 1190)
@@ -4,7 +4,7 @@
<artifactId>equanda</artifactId>
<packaging>pom</packaging>
- <version>0.9.5</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>equanda</name>
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-14 11:10:25
|
Revision: 1189
http://equanda.svn.sourceforge.net/equanda/?rev=1189&view=rev
Author: triathlon98
Date: 2009-12-14 11:10:19 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
tag 0.9.5
Added Paths:
-----------
tags/equanda-0.9.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-14 11:07:30
|
Revision: 1188
http://equanda.svn.sourceforge.net/equanda/?rev=1188&view=rev
Author: triathlon98
Date: 2009-12-14 11:07:24 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
prepare release of 0.9.5
Modified Paths:
--------------
trunk/equanda-client/pom.xml
trunk/equanda-dm/pom.xml
trunk/equanda-generate/pom.xml
trunk/equanda-maven-plugin/pom.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-server/pom.xml
trunk/equanda-t5gui/pom.xml
trunk/equanda-t5navigation/pom.xml
trunk/equanda-tapestry5/pom.xml
trunk/equanda-test/pom.xml
trunk/equanda-test/test-core/pom.xml
trunk/equanda-test/test-ddltool/pom.xml
trunk/equanda-test/test-gui-t5-test/pom.xml
trunk/equanda-test/test-t5-ear/pom.xml
trunk/equanda-test/test-t5-gui/pom.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/pom.xml
trunk/equanda-util/pom.xml
trunk/pom.xml
Modified: trunk/equanda-client/pom.xml
===================================================================
--- trunk/equanda-client/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-client/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-client</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-client</name>
<dependencies>
<dependency>
Modified: trunk/equanda-dm/pom.xml
===================================================================
--- trunk/equanda-dm/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-dm/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-dm</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-dm</name>
<dependencies>
<dependency>
Modified: trunk/equanda-generate/pom.xml
===================================================================
--- trunk/equanda-generate/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-generate/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-generate</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-generate</name>
<build>
<resources>
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-maven-plugin/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<artifactId>equanda</artifactId>
<groupId>org.equanda</groupId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-maven-plugin</name>
<description>
Provide the maven plugins for equanda users.
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -478,9 +478,9 @@
</profiles>
<properties>
- <equanda-version>0.9.4</equanda-version>
+ <equanda-version>0.9.5</equanda-version>
<staticwiki-version>0.9</staticwiki-version>
- <tapestry-version>5.1.0.3</tapestry-version>
+ <tapestry-version>5.1.0.5</tapestry-version>
<chenillekit-version>1.0.0</chenillekit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Modified: trunk/equanda-server/pom.xml
===================================================================
--- trunk/equanda-server/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-server/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-server</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-server</name>
<dependencies>
<dependency>
Modified: trunk/equanda-t5gui/pom.xml
===================================================================
--- trunk/equanda-t5gui/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-t5gui/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-t5gui</name>
<build>
Modified: trunk/equanda-t5navigation/pom.xml
===================================================================
--- trunk/equanda-t5navigation/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-t5navigation/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5navigation</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-t5navigation</name>
<build>
Modified: trunk/equanda-tapestry5/pom.xml
===================================================================
--- trunk/equanda-tapestry5/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-tapestry5/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-tapestry5</name>
<build>
Modified: trunk/equanda-test/pom.xml
===================================================================
--- trunk/equanda-test/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-test/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,15 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<packaging>pom</packaging>
- <version>0.9.5-SNAPSHOT</version>
-
<name>equanda-test</name>
<description>tests for equanda</description>
<modules>
Modified: trunk/equanda-test/test-core/pom.xml
===================================================================
--- trunk/equanda-test/test-core/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-test/test-core/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-core</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>test-core</name>
<description>test core</description>
<build>
Modified: trunk/equanda-test/test-ddltool/pom.xml
===================================================================
--- trunk/equanda-test/test-ddltool/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-test/test-ddltool/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-ddltool</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>test-ddltool</name>
<description>test ddltool</description>
Modified: trunk/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- trunk/equanda-test/test-gui-t5-test/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-test/test-gui-t5-test/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-gui-t5-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>test-gui-t5-test</name>
<description>test test</description>
Modified: trunk/equanda-test/test-t5-ear/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-ear/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-test/test-t5-ear/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-ear</artifactId>
<packaging>ear</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>test-t5-ear</name>
<description>test ear</description>
<build>
Modified: trunk/equanda-test/test-t5-gui/pom.xml
===================================================================
--- trunk/equanda-test/test-t5-gui/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-test/test-t5-gui/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-gui</artifactId>
<packaging>war</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>test-t5-gui</name>
<description>test gui</description>
<build>
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-test/test-test/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>test-test</name>
<description>test test</description>
Modified: trunk/equanda-tool/pom.xml
===================================================================
--- trunk/equanda-tool/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-tool/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-tool</name>
<dependencies>
<dependency>
Modified: trunk/equanda-util/pom.xml
===================================================================
--- trunk/equanda-util/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/equanda-util/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -2,13 +2,12 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
<packaging>jar</packaging>
- <version>0.9.5-SNAPSHOT</version>
<name>equanda-util</name>
<dependencies>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
+++ trunk/pom.xml 2009-12-14 11:07:24 UTC (rev 1188)
@@ -4,7 +4,7 @@
<artifactId>equanda</artifactId>
<packaging>pom</packaging>
- <version>0.9.5-SNAPSHOT</version>
+ <version>0.9.5</version>
<name>equanda</name>
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-13 19:31:41
|
Revision: 1187
http://equanda.svn.sourceforge.net/equanda/?rev=1187&view=rev
Author: triathlon98
Date: 2009-12-13 19:31:33 +0000 (Sun, 13 Dec 2009)
Log Message:
-----------
EQ-367 upgrade to using checkstyle 5
Modified Paths:
--------------
trunk/equanda-checkstyle/pom.xml
trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java
trunk/pom.xml
Modified: trunk/equanda-checkstyle/pom.xml
===================================================================
--- trunk/equanda-checkstyle/pom.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-checkstyle/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -3,7 +3,7 @@
<groupId>org.equanda</groupId>
<artifactId>equanda-checkstyle</artifactId>
<packaging>jar</packaging>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<name>equanda-checkstyle</name>
<description>checkstyle configuration for equanda</description>
@@ -14,4 +14,15 @@
<url>dav:http://maven.progs.be/m2repo</url>
</repository>
</distributionManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ </build>
+
</project>
Modified: trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml
===================================================================
--- trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -10,6 +10,8 @@
<module name="Checker">
+ <property name="charset" value="UTF-8"/>
+
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
<!--<module name="PackageHtml"/>-->
@@ -27,11 +29,28 @@
<!-- duplicate code, see http://checkstyle.sourceforge.net/config_duplicates.html -->
<!--<module name="StrictDuplicateCode"/>-->
+ <!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
+
+ <module name="Header">
+ <!-- The follow property value demonstrates the ability -->
+ <!-- to have access to ANT properties. In this case it uses -->
+ <!-- the ${basedir} property to allow Checkstyle to be run -->
+ <!-- from any directory within a project. -->
+ <!--<property name="headerFile" value="config/equanda-header.txt"/>-->
+ <property name="header" value="/**\n * This file is part of the equanda project.\n *\n * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at http://www.mozilla.org/MPL/\n *\n * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF\n * ANY KIND, either express or implied. See the License for the specific language governing rights and\n * limitations under the License.\n *\n * Alternatively, the contents of this file may be used under the terms of\n * either the GNU General Public License Version 2 or later (the "GPL"), or\n * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),\n * in which case the provisions of the GPL or the LGPL are applicable instead\n * of those above. If you wish to allow use of your version of this file only\n * under the terms of either the GPL or the LGPL, and not to allow others to\n * use your version of this file under the terms of the MPL, indicate your\n * decision by deleting the provisions above and replace them with the notice\n * and other provisions required by the GPL or the LGPL. If you do not delete\n * the provisions above, a recipient may use your version of this file under\n * the terms of any one of the MPL, the GPL or the LGPL.\n */"/>
+ </module>
+
+ <module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <property name="severity" value="info"/>
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ </module>
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
<property name="tabWidth" value="4"/>
- <property name="charset" value="UTF-8"/>
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
@@ -76,17 +95,6 @@
</module>
<module name="TypeName"/>
- <!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
-
- <module name="Header">
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. -->
- <!--<property name="headerFile" value="config/equanda-header.txt"/>-->
- <property name="header" value="/**\n * This file is part of the equanda project.\n *\n * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at http://www.mozilla.org/MPL/\n *\n * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF\n * ANY KIND, either express or implied. See the License for the specific language governing rights and\n * limitations under the License.\n *\n * Alternatively, the contents of this file may be used under the terms of\n * either the GNU General Public License Version 2 or later (the "GPL"), or\n * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),\n * in which case the provisions of the GPL or the LGPL are applicable instead\n * of those above. If you wish to allow use of your version of this file only\n * under the terms of either the GPL or the LGPL, and not to allow others to\n * use your version of this file under the terms of the MPL, indicate your\n * decision by deleting the provisions above and replace them with the notice\n * and other provisions required by the GPL or the LGPL. If you do not delete\n * the provisions above, a recipient may use your version of this file under\n * the terms of any one of the MPL, the GPL or the LGPL.\n */"/>
- </module>
-
<!-- imports, see http://checkstyle.sourceforge.net/config_imports.html -->
<!--<module name="AvoidStarImport"/>-->
@@ -134,7 +142,7 @@
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
</module>
<module name="NoWhitespaceBefore">
- <property name="severity" value="info"/>
+ <!--<property name="severity" value="info"/>-->
<!-- Default tokens and additional GENERIC_START and GENERIC_END -->
<property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
</module>
@@ -143,23 +151,19 @@
<property name="option" value="space"/>
</module>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter">
<property name="severity" value="info"/>
- <!-- Default tokens and additional GENERIC_END -->
- <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+ <!-- Default tokens and additional GENERIC_END, RCURLY -->
+ <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END, RCURLY"/>
</module>
<module name="WhitespaceAround">
- <property name="severity" value="info"/>
- <!-- Default tokens without GENERIC_START and GENERIC_END -->
+ <!--<property name="severity" value="info"/>-->
+ <!-- Default tokens without GENERIC_START, GENERIC_END, LCURLY, RCURLY, SLIST -->
<property name="tokens"
- value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
</module>
- <module name="TabCharacter">
- <property name="severity" value="info"/>
- </module>
<!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
@@ -245,11 +249,6 @@
<!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
- <module name="GenericIllegalRegexp">
- <property name="severity" value="info"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
<!--<module name="TodoComment"/>-->
<!--<module name="UncommentedMain"/>-->
<module name="UpperEll"/>
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -10,6 +10,8 @@
<module name="Checker">
+ <property name="charset" value="UTF-8"/>
+
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
<!--<module name="PackageHtml"/>-->
@@ -27,11 +29,27 @@
<!-- duplicate code, see http://checkstyle.sourceforge.net/config_duplicates.html -->
<!--<module name="StrictDuplicateCode"/>-->
+ <!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
+
+ <module name="Header">
+ <!-- The follow property value demonstrates the ability -->
+ <!-- to have access to ANT properties. In this case it uses -->
+ <!-- the ${basedir} property to allow Checkstyle to be run -->
+ <!-- from any directory within a project. -->
+ <property name="headerFile" value="config/header.txt"/>
+ </module>
+
+ <module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <property name="severity" value="info"/>
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ </module>
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
<property name="tabWidth" value="4"/>
- <property name="charset" value="UTF-8"/>
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
@@ -76,16 +94,6 @@
</module>
<module name="TypeName"/>
- <!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
-
- <module name="Header">
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. -->
- <property name="headerFile" value="config/header.txt"/>
- </module>
-
<!-- imports, see http://checkstyle.sourceforge.net/config_imports.html -->
<!--<module name="AvoidStarImport"/>-->
@@ -133,7 +141,7 @@
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
</module>
<module name="NoWhitespaceBefore">
- <property name="severity" value="info"/>
+ <!--<property name="severity" value="info"/>-->
<!-- Default tokens and additional GENERIC_START and GENERIC_END -->
<property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
</module>
@@ -142,23 +150,19 @@
<property name="option" value="space"/>
</module>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter">
<property name="severity" value="info"/>
- <!-- Default tokens and additional GENERIC_END -->
- <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+ <!-- Default tokens and additional GENERIC_END, RCURLY -->
+ <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END, RCURLY"/>
</module>
<module name="WhitespaceAround">
- <property name="severity" value="info"/>
- <!-- Default tokens without GENERIC_START and GENERIC_END -->
+ <!--<property name="severity" value="info"/>-->
+ <!-- Default tokens without GENERIC_START, GENERIC_END, LCURLY, RCURLY, SLIST -->
<property name="tokens"
- value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
</module>
- <module name="TabCharacter">
- <property name="severity" value="info"/>
- </module>
<!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
@@ -244,11 +248,6 @@
<!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
- <module name="GenericIllegalRegexp">
- <property name="severity" value="info"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
<!--<module name="TodoComment"/>-->
<!--<module name="UncommentedMain"/>-->
<module name="UpperEll"/>
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -87,6 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<configLocation>config/checkstyle.xml</configLocation>
</configuration>
@@ -480,7 +481,7 @@
<equanda-version>0.9.4</equanda-version>
<staticwiki-version>0.9</staticwiki-version>
<tapestry-version>5.1.0.3</tapestry-version>
- <chenillekit-version>1.0.0</chenillekit-version>
+ <chenillekit-version>1.0.0</chenillekit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Modified: trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java 2009-12-13 19:31:33 UTC (rev 1187)
@@ -40,8 +40,8 @@
public static final TrustManager[] TRUST_MANAGERS = new TrustManager[]{ new TrustAllX509TrustManager() };
private SslUtil() {}
-
- /** Set the default Hostname Verifier to an instance of a fake class that trust all hostnames. */
+
+ /** Set the default hostname verifier to an instance of a fake class that trusts all hostnames. */
public static void trustAllHostnames()
{
HttpsURLConnection.setDefaultHostnameVerifier( HOSTNAME_VERIFIER );
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -123,7 +123,7 @@
<extension>
<groupId>org.equanda</groupId>
<artifactId>equanda-checkstyle</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</extension>
</extensions>
<plugins>
@@ -152,6 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<configLocation>config/equanda-checkstyle.xml</configLocation>
</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-13 19:24:35
|
Revision: 1186
http://equanda.svn.sourceforge.net/equanda/?rev=1186&view=rev
Author: triathlon98
Date: 2009-12-13 19:24:19 +0000 (Sun, 13 Dec 2009)
Log Message:
-----------
EQ-368 support java 6 JDBC
Modified Paths:
--------------
trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaConnection.java
trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaPreparedStatement.java
trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaResultSet.java
trunk/equanda-server/src/main/java/org/equanda/reporting/driver/MetaData.java
Modified: trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaConnection.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaConnection.java 2009-12-09 07:15:08 UTC (rev 1185)
+++ trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaConnection.java 2009-12-13 19:24:19 UTC (rev 1186)
@@ -31,6 +31,7 @@
import java.sql.*;
import java.util.Map;
+import java.util.Properties;
/**
* Implementation of java.sql.Connection used by jasper reports
@@ -292,4 +293,82 @@
{
throw new UnsupportedOperationException( "not implemented" );
}
+
+ public Clob createClob()
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public Blob createBlob()
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public NClob createNClob()
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public SQLXML createSQLXML()
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public boolean isValid( int timeout )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setClientInfo( String name, String value )
+ throws SQLClientInfoException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setClientInfo( Properties properties )
+ throws SQLClientInfoException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public String getClientInfo( String name )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public Properties getClientInfo()
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public Array createArrayOf( String typeName, Object[] elements )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public Struct createStruct( String typeName, Object[] attributes )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public <T> T unwrap( Class<T> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public boolean isWrapperFor( Class<?> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
}
Modified: trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaPreparedStatement.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaPreparedStatement.java 2009-12-09 07:15:08 UTC (rev 1185)
+++ trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaPreparedStatement.java 2009-12-13 19:24:19 UTC (rev 1186)
@@ -505,4 +505,142 @@
{
throw new UnsupportedOperationException( "not implemented" );
}
+
+ public void setRowId( int parameterIndex, RowId x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setNString( int parameterIndex, String value )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setNCharacterStream( int parameterIndex, Reader value, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setNClob( int parameterIndex, NClob value )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setClob( int parameterIndex, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setBlob( int parameterIndex, InputStream inputStream, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setNClob( int parameterIndex, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setSQLXML( int parameterIndex, SQLXML xmlObject )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setAsciiStream( int parameterIndex, InputStream x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setBinaryStream( int parameterIndex, InputStream x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setCharacterStream( int parameterIndex, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setAsciiStream( int parameterIndex, InputStream x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setBinaryStream( int parameterIndex, InputStream x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setCharacterStream( int parameterIndex, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setNCharacterStream( int parameterIndex, Reader value )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setClob( int parameterIndex, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setBlob( int parameterIndex, InputStream inputStream )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void setNClob( int parameterIndex, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public boolean isClosed()
+ throws SQLException
+ {
+ return false;
+ }
+
+ public void setPoolable( boolean poolable )
+ throws SQLException
+ {
+ // ignore
+ }
+
+ public boolean isPoolable()
+ throws SQLException
+ {
+ return false;
+ }
+
+ public <T> T unwrap( Class<T> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public boolean isWrapperFor( Class<?> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
}
\ No newline at end of file
Modified: trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaResultSet.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaResultSet.java 2009-12-09 07:15:08 UTC (rev 1185)
+++ trunk/equanda-server/src/main/java/org/equanda/reporting/driver/EquandaResultSet.java 2009-12-13 19:24:19 UTC (rev 1186)
@@ -1194,4 +1194,304 @@
{
throw new UnsupportedOperationException( "not implemented" );
}
+
+ public RowId getRowId( int columnIndex )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public RowId getRowId( String columnLabel )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateRowId( int columnIndex, RowId x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateRowId( String columnLabel, RowId x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public int getHoldability()
+ throws SQLException
+ {
+ return 0;
+ }
+
+ public boolean isClosed()
+ throws SQLException
+ {
+ return false;
+ }
+
+ public void updateNString( int columnIndex, String nString )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNString( String columnLabel, String nString )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNClob( int columnIndex, NClob nClob )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNClob( String columnLabel, NClob nClob )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public NClob getNClob( int columnIndex )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public NClob getNClob( String columnLabel )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public SQLXML getSQLXML( int columnIndex )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public SQLXML getSQLXML( String columnLabel )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateSQLXML( int columnIndex, SQLXML xmlObject )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateSQLXML( String columnLabel, SQLXML xmlObject )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public String getNString( int columnIndex )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public String getNString( String columnLabel )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public Reader getNCharacterStream( int columnIndex )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public Reader getNCharacterStream( String columnLabel )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNCharacterStream( int columnIndex, Reader x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNCharacterStream( String columnLabel, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateAsciiStream( int columnIndex, InputStream x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBinaryStream( int columnIndex, InputStream x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateCharacterStream( int columnIndex, Reader x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateAsciiStream( String columnLabel, InputStream x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBinaryStream( String columnLabel, InputStream x, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateCharacterStream( String columnLabel, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBlob( int columnIndex, InputStream inputStream, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBlob( String columnLabel, InputStream inputStream, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateClob( int columnIndex, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateClob( String columnLabel, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNClob( int columnIndex, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNClob( String columnLabel, Reader reader, long length )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNCharacterStream( int columnIndex, Reader x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNCharacterStream( String columnLabel, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateAsciiStream( int columnIndex, InputStream x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBinaryStream( int columnIndex, InputStream x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateCharacterStream( int columnIndex, Reader x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateAsciiStream( String columnLabel, InputStream x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBinaryStream( String columnLabel, InputStream x )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateCharacterStream( String columnLabel, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBlob( int columnIndex, InputStream inputStream )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateBlob( String columnLabel, InputStream inputStream )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateClob( int columnIndex, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateClob( String columnLabel, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNClob( int columnIndex, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public void updateNClob( String columnLabel, Reader reader )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public <T> T unwrap( Class<T> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public boolean isWrapperFor( Class<?> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
}
Modified: trunk/equanda-server/src/main/java/org/equanda/reporting/driver/MetaData.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/reporting/driver/MetaData.java 2009-12-09 07:15:08 UTC (rev 1185)
+++ trunk/equanda-server/src/main/java/org/equanda/reporting/driver/MetaData.java 2009-12-13 19:24:19 UTC (rev 1186)
@@ -24,7 +24,9 @@
package org.equanda.reporting.driver;
-import java.sql.*;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Types;
import java.util.ArrayList;
/**
@@ -167,4 +169,16 @@
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+
+ public <T> T unwrap( Class<T> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
+
+ public boolean isWrapperFor( Class<?> iface )
+ throws SQLException
+ {
+ throw new UnsupportedOperationException( "not implemented" );
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-09 07:15:19
|
Revision: 1185
http://equanda.svn.sourceforge.net/equanda/?rev=1185&view=rev
Author: triathlon98
Date: 2009-12-09 07:15:08 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
EQ-130 documentation
Modified Paths:
--------------
trunk/src/site/wiki/dm.wiki
trunk/src/site/wiki/templates/ejb3.wiki
Modified: trunk/src/site/wiki/dm.wiki
===================================================================
--- trunk/src/site/wiki/dm.wiki 2009-12-03 22:11:25 UTC (rev 1184)
+++ trunk/src/site/wiki/dm.wiki 2009-12-09 07:15:08 UTC (rev 1185)
@@ -2,7 +2,7 @@
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.
+For starters, the declaration of a table can be done by referring 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 excerpts from a file.
The domain model had the following structure
@@ -33,14 +33,14 @@
A table definition can have the following attributes :
- *name* : name of the table. This is expected to start with a capital to adhere to the Java naming convention.
- *file* : when this is specified, the specified file will replace the table definition. The file is searched on the filesystem, relative to the location of the main file. However, when the value starts with "classpath://" then the file is retrieved using the classloader.
-- *dir* : when this is specified, the given wildcard expession is used to find all the files which contain the table definitions. The locatio is relative with the location of the main file.
+- *dir* : when this is specified, the given wildcard expression is used to find all the files which contain the table definitions. The locatio is relative with the location of the main file.
- *type* : this is a code of up to four characters which is used to discriminate tables which are part of the same hierarchy (as specified using the "template" tags). This is typically not specified on the root table, but only on the children (this is merely a convention, it is not enforced). The value needs to be unique within the inheritance tree.
- *expected-amount* : an indication of the number of records which are expected to be in this table. Allowed values are "small", "medium" and "large" ("large" is the default). This can be used by the templates as a hint to make the user interface more intuitive. For example when expected-amount is "small". links could be rendered as a combo box. When it is "large" then displaying a list of all items may be unpractical.
-- *category* : category key which is used for gicing a categorisation of tables. The value specified on the root tables can for example be used for grouping the tables in a menu structure.
+- *category* : category key which is used for giving a categorisation of tables. The value specified on the root tables can for example be used for grouping the tables in a menu structure.
- *proxy-interface* : extra interfaces (comma separated) which should be applied to the proxy. This allows you to have dependencies on the proxies' accessors.
- *internal* : when a table is marked internal (by passing a value which is different from "false"), then it cannot be instantiated. The table is only provided to have a common parent in the inheritance tree.
-Each table can be given a _description_ and semantic annotations using _subectory_.
+Each table can be given a _description_ and semantic annotations using _subjectory_.
The inheritance tree is specified using the _template_ tag. Each template specifies a parent table.
On the template tag, you can put the following attributes :
@@ -90,7 +90,7 @@
- *name* : name of the field. This is expected to start with a capital to adhere to the Java naming convention.
- *singular* : when the field is multiple, you can define the singular name here. When this is not specified, the singular name is assumed to be the same as the name, after removal of a trailing "s".
- *type* : field type. There are a few builtin types "string", "int", "double", "boolean", "date", "timestamp", "blob", "clob". Also allowed are any table name (in which case the type starts with a capital and the field is interpretted as a link) or custom types (which start with a lower case letter).
-- *length* : lengh of the field. This is only applicable for string fields. The default length is 50 characters. String which are longer than this will be truncated.
+- *length* : length of the field. This is only applicable for string fields. The default length is 50 characters. String which are longer than this will be truncated.
- *display-length* : width for the field in number of characters. This is a hint for the generated user interface. Default value for strings is 50. Default value for dates and timestamps is 10. Default value for int and double is 5.
- *renderer* : indication of the renderer (and parameters) which should be used to render this fields. This overwrites the defaults.
- *priority* : priority for setting this field. When the proxies set/update the field values, this is by default done in an order based on the priority and the order in which the fields are declared in the domain model. Priority is a value between "1" and "9", with fields at priority "1" updated first and "9" updated last.
@@ -108,19 +108,19 @@
- _owner_ : indicates that this side of the relationship is owner. Only allowed for bidirectional links. For 1-N and N-1 this defaults to the 1 side. For 1-1 and N-N it is recommended that this is specified (defaults to the table which comes first in alfabetic order).
- _embedded_ : indicates that the linked record is considered "embedded". It requires a bidirectional link and removes the posibility to have an unlinked record on the other side of the link.
- _other-side-multiple_, _other-side-single_ : all links are 1-N or N-1 by default. This allows you to specify the multiplicity on the other side. Only needed when the link is not bidirectional.
-- _use-relation-table_, _use-relation-field_ : allows forcing the use of a realtion table. Not recommended.
+- _use-relation-table_, _use-relation-field_ : allows forcing the use of a relation table. Not recommended.
- _cascade-delete_ : Indicates that if this record is deleted, that the linked records should also be deleted. 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.
- _cascade-keep_ : Indicates deleting records which are linked to is not allowed when there is a link.
- _allow-delete_ : Allow deletion of linked records. The link will be nulled if this is the case. This is the default behaviour.
-You can specify a _default_ value wich should be assigned when new instances are created of the record. These can either be specified as explicit values (or the choice name) (note that for strings, a literal value should be enclosed in double quotes), or a class-name can be given which is used to determine the default value at runtime. For date and timestamp fields, some aliases like "NOW", "TODAY", "YESTERDAY" and "TOMORROW" are also allowed.
+You can specify a _default_ value which should be assigned when new instances are created of the record. These can either be specified as explicit values (or the choice name) (note that for strings, a literal value should be enclosed in double quotes), or a class-name can be given which is used to determine the default value at runtime. For date and timestamp fields, some aliases like "NOW", "TODAY", "YESTERDAY" and "TOMORROW" are also allowed.
-The clonability of the field can be specified using _cloneable_ and _not-cloneable_. These are only used when the table is marked as "cloneable". By default all fields in a cloneable table are themselves also cloneable, so you will normally only use _not-cloneable_ when this is not the case.
+The cloneability of the field can be specified using _cloneable_ and _not-cloneable_. These are only used when the table is marked as "cloneable". By default all fields in a cloneable table are themselves also cloneable, so you will normally only use _not-cloneable_ when this is not the case.
You can specify several field level _constraints_ :
- _unique_ : all not-null values in the field have to be different.
- _required_ : at least one value should be set for the field, null is not allowed.
-- _immutable_ : the field value can only be set on the first save. The field is immutable aftwerards.
+- _immutable_ : the field value can only be set on the first save. The field is immutable afterwards.
- _immutable-if_ : set the field to immutable when another field has value "true".
- _mutable-even-if_ : allows overwriting the _immutable-if_ when another field is (also) "true".
- _compare_ : set some range checks on the field value.
@@ -217,7 +217,7 @@
A type can have the following attributes :
- *name* : name of the type. This is expected to start with a lower to make a visual distuinction between links and types in the domain model.
- *type* : base type. Can be one of the builtin types "string", "int", "double", "boolean", "date", "timestamp", "blob", "clob" or any table name (in which case the type starts with a capital). Other types are not allowed here.
-- *length* : default lengh of the field. This is only applicable for string fields.
+- *length* : default length of the field. This is only applicable for string fields.
- *display-length* : default width for the field in number of characters.
- *renderer* : indication of the default renderer (and parameters) which should be used to render this fields.
@@ -231,12 +231,12 @@
When the type indicates a link to a different table, you can marked that it should be implemented as _embedded_ link.
-You can specify a _default_ value wich should be assigned when new instances are created of the record. These can either be specified as explicit values (or the choice name) (note that for strings, a literal value should be enclosed in double quotes), or a class-name can be given which is used to determine the default value at runtime. For date and timestamp fields, some aliases like "NOW", "TODAY", "YESTERDAY" and "TOMORROW" are also allowed.
+You can specify a _default_ value which should be assigned when new instances are created of the record. These can either be specified as explicit values (or the choice name) (note that for strings, a literal value should be enclosed in double quotes), or a class-name can be given which is used to determine the default value at runtime. For date and timestamp fields, some aliases like "NOW", "TODAY", "YESTERDAY" and "TOMORROW" are also allowed.
You can specify several field level _constraints_ :
- _unique_ : all not-null values in the field have to be different.
- _required_ : at least one value should be set for the field, null is not allowed.
-- _immutable_ : the field value can only be set on the first save. The field is immutable aftwerards.
+- _immutable_ : the field value can only be set on the first save. The field is immutable afterwards.
- _compare_ : set some range checks on the field value.
As user interface hints you can specify _display_ which means that the field will by default be included in record summaries and lists, or _hide_ which means that the field will never be included in the user interface.
Modified: trunk/src/site/wiki/templates/ejb3.wiki
===================================================================
--- trunk/src/site/wiki/templates/ejb3.wiki 2009-12-03 22:11:25 UTC (rev 1184)
+++ trunk/src/site/wiki/templates/ejb3.wiki 2009-12-09 07:15:08 UTC (rev 1185)
@@ -1,23 +1,23 @@
h1. ejb3 templates
Domain model description options
-- inheritance
-- declarative constraints
-- programmed constraints
-- int, double, string, blob, clob fields
-- fields with multiple values
-- hard linked records (normal db links)
-- 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 (type) templates can be used
-- [custom filtering and sorting on defined selectors|filter.html]
-{private}- soft linked records (using an ordinary field reference, the linked record may not exist){private}
+- inheritance.
+- declarative constraints.
+- programmed constraints.
+- int, double, string, blob, clob fields.
+- fields with multiple values.
+- hard linked records (normal db links).
+- 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 (type) templates can be used.
+- [custom filtering and sorting on defined selectors|filter.html].
+{private}- soft linked records (using an ordinary field reference, the linked record may not exist).{private}
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|filter.html]
+- 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|filter.html].
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).
@@ -25,14 +25,14 @@
As part of the generated classes, some powerful _data access objects_ (DAO's) are generated. These _proxies_ assure that access to the objects always behaves consistently, independent of whether access is local, remote, using a UserTransaction or not.
The proxies have the following advantages and behaviour.
-- All multiple linked fields are lazy loaded. They are instaniated when the collection is first accessed.
-- Proxies can be saved and updated (using equandaUpdate() in place, the actual object stays the same though the data in it may change. However, linked objects which are updated because of cascading update are replaced (see example velow)!
+- All multiple linked fields are lazy loaded. They are instantiated when the collection is first accessed.
+- Proxies can be saved and updated (using equandaUpdate() in place, the actual object stays the same though the data in it may change. However, linked objects which are updated because of cascading update are replaced (see example below)!
- All multiple fields in the proxies are always not-null. When there are no values in it, an empty collection is returned.
- All updates to proxies cascade. The linked records will also be updated when they are changed (though this only follows a path of changed objects, when object A links to object B which links to C and A and C are modified but B is not, then an update on A will not update C).
- Multiple fields in proxies are intelligent. They record which elements are removed or updated and will not touch unmodified linked objects. If however, you assign a new collection to these fields, then part of the intelligence is no longer possible, making updates somewhat less efficient. Therefore it is recommended not to assign new collections.
- Proxies are only marked as _modified_ if something has actually changed. Just assigning the current value in a field will not mark that field as modified.
- The "equandaCreate()" static method allows instantiation of a new object with all default values filled in.
-- All selectors are available through static method on the proxy class. The results are lazy collections which are instantiated and refreshed automatically.
+- All selectors are available through static methods on the proxy class. The results are lazy collections which are instantiated and refreshed automatically.
- The proxies allow direct invocation of the actions which are defined on the objects (in the domain model). You can choose whether the system should implicitly do a equandaUpdate() before calling the action (using "setEquandaUpdate()", default is false).
- You can choose whether to check for changes to fields which are not part of the object according to the inheritance (templates) in the domain model. Using "equandaUpdate( false )" you can assure the updates are only attempted on fields which are part of the object based on the equandaType. This can for example be very practical for interacting with user interfaces.
- To test whether a proxy already exists in the database, check whether "getId()" is not-null.
@@ -48,7 +48,7 @@
uf.equandaUpdate();
{code}
The "equandaUpdate()" will create both the "UniqueFields" and the "Car" records (because of cascading updates).
-However, the update will replace the "Car" instance inside the "UniqueFields" object and not do an explicit update on the "car" object. Therefor "car.getId()" will still return null and "car.isModified()" will be true. To get the saved version, use "car = uf.getLinkedCar()".
+However, the update will replace the "Car" instance inside the "UniqueFields" object and not do an explicit update on the "car" object. Therefore "car.getId()" will still return null and "car.isModified()" will be true. To get the saved version, use "car = uf.getLinkedCar()".
h2. How the domain model is generated
@@ -56,39 +56,31 @@
The preferred way to access the data is through the proxies. These have names which equal the names of the root tables and allow remote access to the data, selectors and actions while hiding the details of looking up beans etc. They are built to transparently instantiate fields when required.
-Alternatively, you can access the data through a set of session beans for each root table. One is the /ObjectSelectorBean/ which is stateless and allows executing the selectors which are defined. The second is the /ObjectBean/ which is a stateful session bean façade for the entity bean. To make accessing these beans slightly easier, there is a /EquandaGlobal/ class which (amongst other things) allows you to retrieve the beans.
+Alternatively, selectors, actions etc can also be accessed using the /ObjectSelectorBean/ stateless session bean for each root table (the "Object" is replaced by the root table name). To make accessing these beans slightly easier, there is a /EquandaGlobal/ class which (amongst other things) allows you to retrieve instances of the session beans.
-For constraint checking a smart set of intermediate classes called "mediators" are used. These are built in such a way to assure the declarative constraints can be handled and updated when the generation is re-run, but constraints added by manual coding are also maintained. For this a /MediatorRoot/ is used to start by constraining all access (nothing allowed). Then for each class there is a /MediatorBase/ which contains the declarative constraints and a /Mediator/ which is supposed to be filled in by the used and contains the programmatic constraints.
+For constraint checking, actions, auto and calculated fields, a set of helper classes is used. These are built in such a way to assure the declarative bits can be handled and updated when the generation is re-run, but constraints added by manual coding are also maintained. For this a /HTObjectRoot/ is used to start by defining all actions (which are not allowed to be called). Then for each class there is a /HTObjectBase/ which contains the declarative constraints (in /equandaCheckRules()/) and a /HTObject/ which is supposed to be filled in by the used and allow you to add constraints, implement actions, define the auto and calculated field values.
This results in the following classes. The classes you are most likely to use/need are indicated in bold. Where a name contains "Object" this should be replaced with the table name.
Global
-- LazyEJBList.java : lazy list with beans, generated to allow package private access to some methods.
- LazyProxyList.java : lazy list with proxies, generated to allow package private access to some methods.
-- ObjectUpdater.java : used internally for updating the proxies.
- *EquandaGlobal.java* : utility class which allows getting instance of the beans, and some extra utility methods including access to the base selector EJBQL qeries.
For each root table
-- ObjectSelectorBean.java : stateless session bean, allows access to the selectors
-- ObjectBean.java : stateful session bean, providing access to the entity bean with all the constraints checking through the mediators
-- DMNameBean.java : ejb3 entity bean
-- *ObjectSelectorEJB.java* : selector bean interface
-- *ObjectEJB.java* : (remote) interface for the ObjectBean
-- ObjectEJBLocal.java : local interface for the ObjectBean
- *Object* : the proxy
-- ObjectState.java : the proxy state, use internally in the proxy to allow updating without replacing the actual proxy
-- ObjectMediatorRoot : root of the mediator object tree,
-- ObjectConstants : contains the constants like type identifiers and possibe values for choice fields
-- ObjectSelectorHelperBase : base for the ObjectSelectorHelper
-- *ObjectSelectorHelper* : allows code to be inserted for the builders.
-- DMObjectSelector : class for handling selections at the entity bean level
-- ObjectBase : shared interface between ObjectEJB and ObjectEJBLocal
+- ObjectState.java : the proxy state, use internally in the proxy to allow updating without replacing the actual proxy.
+- ObjectConstants : contains the constants like type identifiers and possibe values for choice fields.
+- *ObjectSelectorEJB.java* : selector bean interface.
+- ObjectSelectorBean.java : stateless session bean, allows access to the selectors.
+- HTObjectRoot : root of table helper classes, defines all actions as "operation not allowed".
+- HRObject : (internal) helper class which contains the code for setting/updating proxies and finding the entities.
For each table
-- ObjectMediatorBase : contains the programmatic constraints
-- *ObjectMediator* : empty file, should be used for programmatic constraints and defining the actions
+- DMObject.java : ejb3 entity bean
- *ObjectType* : type handling and testing
- *ObjectTypeChoice* : validator to possible types
+- HTObjectBase : contains the base equandaCheckRules() method.
+- *HTObject* : empty file (to be defined in your source tree), should be used for overwriting equandaCheckRules, defining the actions and the auto and calculated fields.
For each multiple field
- DMObject_FieldBean : entity bean which represents the multiple field values
@@ -101,7 +93,7 @@
[extra]
ejb-package=org.equanda.test.dm
{code}
-Note that the "package" setting is commented. WHen both settings are specified they should be equals or you will get compilation problems. However the ejb3 package setting defaults to the "ejb-package" setting in the "extra" section.
+Note that the "package" setting is commented. When both settings are specified they should be equal or you will get compilation problems. However the ejb3 package setting defaults to the "ejb-package" setting in the "extra" section.
- /prefix/.client : contains all the classes which may be required for remote access to the data.
- /prefix/.server : contains the classes which should only be available inside the application server. The client does not need access to these.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
