made first demo almost fully working
This commit is contained in:
Willem Cazander
parent
2a0d992642
commit
01b3b5cc54
104 changed files with 3259 additions and 2181 deletions
|
|
@ -91,5 +91,11 @@
|
|||
<artifactId>vasc-demo-tech-web</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.forwardfire.vasc.demo</groupId>
|
||||
<artifactId>vasc-demo-server-build-client-swing</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -50,7 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
</fileSet>
|
||||
<fileSet>
|
||||
<directory>${project.basedir}/src/main/scripts/</directory>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<outputDirectory>/bin</outputDirectory>
|
||||
<fileMode>755</fileMode>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
|
|
@ -71,5 +71,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
<directory>${project.basedir}/target/docs/</directory>
|
||||
<outputDirectory>/docs</outputDirectory>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<directory>${project.parent.basedir}/vasc-demo-server-build-client-swing/target/</directory>
|
||||
<outputDirectory>/clients</outputDirectory>
|
||||
<includes>
|
||||
<include>vasc-demo-server-build-client-swing-${project.version}-bin.zip</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
</assembly>
|
||||
|
|
@ -8,14 +8,9 @@
|
|||
<Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
|
||||
<Listener className="net.forwardfire.vasc.demo.server.tomcat.JndiVascDeployerListener"
|
||||
vascControllerName="vasc/server-tech"
|
||||
scanPath="conf/server-tech"
|
||||
scanPath="conf/vasc.d"
|
||||
scanTime="3"
|
||||
/>
|
||||
<Listener className="net.forwardfire.vasc.demo.server.tomcat.JndiVascDeployerListener"
|
||||
vascControllerName="vasc/server-admin"
|
||||
scanPath="conf/server-admin"
|
||||
scanTime="9"
|
||||
/>
|
||||
<GlobalNamingResources>
|
||||
<!-- Config Vasc Tech Demo -->
|
||||
<Environment name="config/START_GUI" value="true" type="java.lang.Boolean"/>
|
||||
|
|
@ -36,11 +31,6 @@
|
|||
vascControllerProvider="net.forwardfire.vasc.demo.server.core.VascTechDemoControllerConfig"
|
||||
removeLocal="false"
|
||||
/>
|
||||
<Resource name="vasc/server-admin" auth="Container" type="net.forwardfire.vasc.core.VascController" singleton="true" scope="Shareable"
|
||||
factory="net.forwardfire.vasc.impl.jndi.JndiVascControllerFactory"
|
||||
vascControllerProvider="net.forwardfire.vasc.demo.server.core.VascTechDemoControllerConfig"
|
||||
removeLocal="false"
|
||||
/>
|
||||
</GlobalNamingResources>
|
||||
<Service name="Catalina">
|
||||
<Connector port="8899" protocol="HTTP/1.1" connectionTimeout="5000" redirectPort="9988" />
|
||||
|
|
|
|||
|
|
@ -3,7 +3,12 @@
|
|||
xmlns:v="http://vasc.forwardfire.net/xml/ns/vasc-lang"
|
||||
xmlns:mm="http://vasc.forwardfire.net/xml/ns/vasc-backend-metamodel"
|
||||
>
|
||||
|
||||
|
||||
<v:entryGroup
|
||||
id="demo-csv"
|
||||
rolesView="login"
|
||||
/>
|
||||
|
||||
<mm:csvDataContext
|
||||
el.id="metaPeopleDS"
|
||||
file="data/demo/meta-people.csv"
|
||||
|
|
@ -11,10 +16,10 @@
|
|||
<mm:metaModelBackend
|
||||
id="metaPeopleBackend"
|
||||
dataContextProvider="${metaPeopleDS}"
|
||||
table="meta_people"
|
||||
table="meta-people"
|
||||
tableId="id"
|
||||
/>
|
||||
<v:entry id="metaPeople" backendId="metaPeopleBackend">
|
||||
<v:entry id="metaPeople" backendId="metaPeopleBackend" vascGroupId="demo-csv">
|
||||
<v:field id="id" list="false"/>
|
||||
<v:field id="name"/>
|
||||
<v:field id="age"/>
|
||||
|
|
@ -33,10 +38,10 @@
|
|||
<mm:metaModelBackend
|
||||
id="metaProjectBackend"
|
||||
dataContextProvider="${metaProjectDS}"
|
||||
table="meta_project"
|
||||
table="meta-project"
|
||||
tableId="id"
|
||||
/>
|
||||
<v:entry id="metaProject" backendId="metaProjectBackend">
|
||||
<v:entry id="metaProject" backendId="metaProjectBackend" vascGroupId="demo-csv">
|
||||
<v:field id="id" list="false"/>
|
||||
<v:field id="name"/>
|
||||
<v:field id="description" vascEntryFieldType="TextAreaField"/>
|
||||
|
|
@ -25,12 +25,6 @@
|
|||
</v:entry>
|
||||
-->
|
||||
|
||||
|
||||
<!--
|
||||
<mm:schemaAutoEntry dataContextProvider="${mmdc_pf}" entryPrefix="pf" />
|
||||
-->
|
||||
|
||||
|
||||
<!--
|
||||
<td:tomcatResource name="mmdc/mongo/laura" auth="Container" type="org.eobjects.metamodel.DataContext"
|
||||
factory="net.forwardfire.vasc.backend.metamodel.jndi.JndiDataContextObjectFactory"
|
||||
|
|
@ -4,11 +4,15 @@
|
|||
xmlns:mm="http://vasc.forwardfire.net/xml/ns/vasc-backend-metamodel"
|
||||
xmlns:td="http://vasc.forwardfire.net/xml/ns/vasc-tech-demo"
|
||||
>
|
||||
<v:entryGroup
|
||||
id="tech-admin"
|
||||
rolesView="admin"
|
||||
/>
|
||||
<mm:jndiDataSourceDataContext el.id="DemoManagerDataDC" jndiName="java:jdbc/DemoManagerDataDS" />
|
||||
|
||||
|
||||
<mm:metaModelBackend id="AdminVascUserBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_USER" tableId="ID" />
|
||||
<v:entry id="AdminVascUser" backendId="AdminVascUserBackend" displayNameFieldId="username">
|
||||
<v:entry id="AdminVascUser" backendId="AdminVascUserBackend" displayNameFieldId="username" vascGroupId="tech-admin">
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="username" backendName="USERNAME"/>
|
||||
<v:field id="password" backendName="PASSWORD"/>
|
||||
|
|
@ -17,7 +21,7 @@
|
|||
|
||||
|
||||
<mm:metaModelBackend id="AdminVascUserRoleBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_USER_ROLE" tableId="ID" />
|
||||
<v:entry id="AdminVascUserRole" backendId="AdminVascUserRoleBackend" >
|
||||
<v:entry id="AdminVascUserRole" backendId="AdminVascUserRoleBackend" vascGroupId="tech-admin">
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="username" backendName="USERNAME" vascEntryFieldType="ListField">
|
||||
<v:vascSelectItemModel entryId="AdminVascUser" keyFieldId="username"/>
|
||||
|
|
@ -27,7 +31,7 @@
|
|||
|
||||
|
||||
<mm:metaModelBackend id="AdminVascUserChangeFieldBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_USER_CHANGE_FIELD" tableId="ID" />
|
||||
<v:entry id="AdminVascUserChangeField" backendId="AdminVascUserChangeFieldBackend" adminEditReadOnly="true">
|
||||
<v:entry id="AdminVascUserChangeField" backendId="AdminVascUserChangeFieldBackend" adminEditReadOnly="true" vascGroupId="tech-admin">
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="field" backendName="FIELD"/>
|
||||
<v:field id="name" backendName="NAME"/>
|
||||
|
|
@ -36,7 +40,7 @@
|
|||
|
||||
|
||||
<mm:metaModelBackend id="AdminVascUserChangeLogBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_USER_CHANGE_LOG" tableId="ID" />
|
||||
<v:entry id="AdminVascUserChangeLog" backendId="AdminVascUserChangeLogBackend" adminEditReadOnly="true">
|
||||
<v:entry id="AdminVascUserChangeLog" backendId="AdminVascUserChangeLogBackend" adminEditReadOnly="true" vascGroupId="tech-admin">
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="user_id" backendName="USER_ID" vascEntryFieldType="ListField">
|
||||
<v:vascSelectItemModel entryId="AdminVascUser" keyFieldId="id"/>
|
||||
|
|
@ -49,7 +53,7 @@
|
|||
</v:entry>
|
||||
|
||||
<mm:metaModelBackend id="AdminVascPageBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_PAGE" tableId="ID" />
|
||||
<v:entry id="AdminVascPage" backendId="AdminVascPageBackend">
|
||||
<v:entry id="AdminVascPage" backendId="AdminVascPageBackend" vascGroupId="tech-admin">
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="slug" backendName="SLUG"/>
|
||||
<v:field id="title" backendName="TITLE"/>
|
||||
|
|
@ -60,7 +64,7 @@
|
|||
|
||||
|
||||
<mm:metaModelBackend id="AdminVascPagePartBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_PAGE_PART" tableId="ID" />
|
||||
<v:entry id="AdminVascPagePart" backendId="AdminVascPagePartBackend">
|
||||
<v:entry id="AdminVascPagePart" backendId="AdminVascPagePartBackend" vascGroupId="tech-admin">
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="page_id" backendName="PAGE_ID" vascEntryFieldType="ListField">
|
||||
<v:vascSelectItemModel entryId="AdminVascPage" keyFieldId="id" displayFieldId="slug"/>
|
||||
|
|
@ -78,7 +82,7 @@
|
|||
|
||||
|
||||
<mm:metaModelBackend id="AdminVascMenuWebBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_MENU_WEB" tableId="ID" />
|
||||
<v:entry id="AdminVascMenuWeb" backendId="AdminVascMenuWebBackend">
|
||||
<v:entry id="AdminVascMenuWeb" backendId="AdminVascMenuWebBackend" vascGroupId="tech-admin">
|
||||
<v:listOption id="menu_type" backendName="MENU_TYPE" vascEntryFieldType="ListField" optional="true">
|
||||
<v:vascSelectItemModelEnum enumClass="net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWebType"/>
|
||||
</v:listOption>
|
||||
|
|
@ -97,31 +101,4 @@
|
|||
</v:field>
|
||||
</v:entry>
|
||||
|
||||
<mm:metaModelBackend id="AdminVascMenuGroupBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_MENU_GROUP" tableId="ID" />
|
||||
<v:entry id="AdminVascMenuGroup" backendId="AdminVascMenuGroupBackend">
|
||||
<v:listOption id="active" backendName="ACTIVE" vascEntryFieldType="ListField" optional="true" defaultValue="FALSE">
|
||||
<v:vascSelectItemModelString nullLabel="All" data="TRUE,FALSE"/>
|
||||
</v:listOption>
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="title" backendName="TITLE"/>
|
||||
<v:field id="active" backendName="ACTIVE" vascEntryFieldType="BooleanField"/>
|
||||
<v:field id="roles" backendName="ROLES"/>
|
||||
<v:field id="menu_order" backendName="MENU_ORDER" vascEntryFieldType="IntegerField"/>
|
||||
</v:entry>
|
||||
|
||||
<mm:metaModelBackend id="AdminVascMenuBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_MENU" tableId="ID" />
|
||||
<v:entry id="AdminVascMenu" backendId="AdminVascMenuBackend">
|
||||
<v:listOption id="active" backendName="ACTIVE" vascEntryFieldType="ListField" optional="true" defaultValue="FALSE">
|
||||
<v:vascSelectItemModelString nullLabel="All" data="TRUE,FALSE"/>
|
||||
</v:listOption>
|
||||
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
|
||||
<v:field id="vascEntryId" backendName="VASC_ENTRY_ID"/>
|
||||
<v:field id="title" backendName="TITLE"/>
|
||||
<v:field id="active" backendName="ACTIVE" vascEntryFieldType="BooleanField"/>
|
||||
<v:field id="roles" backendName="ROLES"/>
|
||||
<v:field id="menu_order" backendName="MENU_ORDER" vascEntryFieldType="IntegerField"/>
|
||||
<v:field id="menu_group" backendName="MENU_GROUP">
|
||||
</v:field>
|
||||
</v:entry>
|
||||
|
||||
</vasc:root>
|
||||
|
|
@ -5,6 +5,11 @@
|
|||
xmlns:td="http://vasc.forwardfire.net/xml/ns/vasc-tech-demo"
|
||||
>
|
||||
|
||||
<v:entryGroup
|
||||
id="tech-server"
|
||||
rolesView="admin"
|
||||
/>
|
||||
|
||||
<!-- Load jndi factories into tomcat. -->
|
||||
<td:tomcatResource name="mmdc/server/conf/server.xml" auth="Container" type="org.eobjects.metamodel.DataContext"
|
||||
factory="net.forwardfire.vasc.backend.metamodel.jndi.JndiDataContextObjectFactory"
|
||||
|
|
@ -35,10 +40,10 @@
|
|||
<mm:jndiDataContext el.id="mmdc5" jndiName="java:mmdc/server/conf/web.xml"/>
|
||||
|
||||
<!-- Auto config schema from MetaModel backends. -->
|
||||
<mm:schemaAutoEntry dataContextProvider="${mmdc1}" entryPrefix="AdminConfServer" />
|
||||
<mm:schemaAutoEntry dataContextProvider="${mmdc2}" entryPrefix="AdminConfLogServer" />
|
||||
<mm:schemaAutoEntry dataContextProvider="${mmdc3}" entryPrefix="AdminConfLogAccess" />
|
||||
<mm:schemaAutoEntry dataContextProvider="${mmdc4}" entryPrefix="AdminConfConfig" />
|
||||
<mm:schemaAutoEntry dataContextProvider="${mmdc5}" entryPrefix="AdminConfWeb" />
|
||||
<mm:schemaAutoEntry vascGroupId="tech-server" dataContextProvider="${mmdc1}" entryPrefix="AdminConfServer" />
|
||||
<mm:schemaAutoEntry vascGroupId="tech-server" dataContextProvider="${mmdc2}" entryPrefix="AdminConfLogServer" />
|
||||
<mm:schemaAutoEntry vascGroupId="tech-server" dataContextProvider="${mmdc3}" entryPrefix="AdminConfLogAccess" />
|
||||
<mm:schemaAutoEntry vascGroupId="tech-server" dataContextProvider="${mmdc4}" entryPrefix="AdminConfConfig" />
|
||||
<mm:schemaAutoEntry vascGroupId="tech-server" dataContextProvider="${mmdc5}" entryPrefix="AdminConfWeb" />
|
||||
|
||||
</vasc:root>
|
||||
|
|
@ -25,11 +25,12 @@ setlocal enableextensions
|
|||
|
||||
:: Run in app dir
|
||||
cd /d %~dp0
|
||||
cd ..
|
||||
|
||||
:: Config variables
|
||||
set JAVA_OPTS=-Xms64m -Xmx256m
|
||||
set JAVA_OPTS=-Xms128m -Xmx768m -XX:MaxPermSize=256m
|
||||
set MAIN_CLASS=net.forwardfire.vasc.demo.server.core.VascTechDemoStartup
|
||||
set CP=libs\*
|
||||
set CP=libs\tomcat-el-api-* libs\*
|
||||
|
||||
:: Launch application
|
||||
java %JAVA_OPTS% -cp "%CP%" %MAIN_CLASS%
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2011, Willem Cazander
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without modification, are permitted provided
|
||||
# that the following conditions are met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright notice, this list of conditions and the
|
||||
# following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
|
||||
# the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
||||
# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
# Run in app dir
|
||||
cd `dirname $0`/..;
|
||||
|
||||
# Config variables
|
||||
JAVA="java";
|
||||
JAVA_OPTS="-Xms128m -Xmx768m -XX:MaxPermSize=256m";
|
||||
MAIN_CLASS="org.apache.catalina.startup.Bootstrap";
|
||||
CP=`echo libs/tomcat-* | sed 's/ /:/g'`;
|
||||
|
||||
# Launch application
|
||||
$JAVA $JAVA_OPTS -cp $CP $MAIN_CLASS stop;
|
||||
|
||||
# EOF
|
||||
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
::
|
||||
:: Copyright (c) 2011, Willem Cazander
|
||||
:: All rights reserved.
|
||||
::
|
||||
:: Redistribution and use in source and binary forms, with or without modification, are permitted provided
|
||||
:: that the following conditions are met:
|
||||
::
|
||||
:: * Redistributions of source code must retain the above copyright notice, this list of conditions and the
|
||||
:: following disclaimer.
|
||||
:: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
|
||||
:: the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
::
|
||||
:: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
:: EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
:: MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
:: THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
:: SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
:: OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
:: HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
||||
:: TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
:: SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
::
|
||||
@echo off
|
||||
setlocal enableextensions
|
||||
|
||||
:: Run in app dir
|
||||
cd /d %~dp0
|
||||
cd ..
|
||||
|
||||
:: Config variables
|
||||
set JAVA_OPTS=-Xms128m -Xmx768m -XX:MaxPermSize=256m
|
||||
set MAIN_CLASS=net.forwardfire.vasc.demo.server.core.VascTechDemoStartup
|
||||
set CP=libs\tomcat-el-api-* libs\*
|
||||
|
||||
:: Launch application
|
||||
java %JAVA_OPTS% -cp "%CP%" %MAIN_CLASS%
|
||||
|
||||
endlocal
|
||||
:: EOF
|
||||
|
|
@ -23,13 +23,14 @@
|
|||
#
|
||||
|
||||
# Run in app dir
|
||||
cd `dirname $0`;
|
||||
cd `dirname $0`/..;
|
||||
|
||||
# Config variables
|
||||
JAVA="java";
|
||||
JAVA_OPTS="-Xms64m -Xmx256m";
|
||||
JAVA_OPTS="-Xms128m -Xmx768m -XX:MaxPermSize=256m";
|
||||
MAIN_CLASS="net.forwardfire.vasc.demo.server.core.VascTechDemoStartup";
|
||||
CP=`echo libs/*.jar | sed 's/ /:/g'`;
|
||||
CP=`echo libs/tomcat-el-api-* libs/*.jar | sed 's/ /:/g'`;
|
||||
# todo: tomcat-el-api needs loaded before javaee-api for ELResolver config.
|
||||
|
||||
# Launch application
|
||||
$JAVA $JAVA_OPTS -cp $CP $MAIN_CLASS;
|
||||
Loading…
Add table
Add a link
Reference in a new issue