2
0
Fork 0

Refactored internal api

This commit is contained in:
Willem Cazander 2012-06-04 22:49:12 +02:00
parent 3f31bb8a3a
commit 6ccd763d1f
361 changed files with 23049 additions and 4498 deletions

View file

@ -15,9 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>ui-dist-assembly</id>
@ -38,7 +36,12 @@
<dependencies>
<dependency>
<groupId>net.forwardfire.vasc.demo</groupId>
<artifactId>vasc-demo-tech-ui</artifactId>
<artifactId>vasc-demo-tech-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc.demo</groupId>
<artifactId>vasc-demo-tech-web</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

View file

@ -63,6 +63,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<fileSet>
<directory>${project.basedir}/src/main/directory/</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>conf/logback-server-console.xml</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Default context for all applications. -->
<Context>
<!-- Link global resources in local java:comp/env namespace -->
<ResourceLink name="config/START_GUI" global="config/START_GUI" type="java.lang.Boolean"/>
<ResourceLink name="config/START_EDITOR" global="config/START_EDITOR" type="java.lang.Boolean"/>
<ResourceLink name="config/DEPLOY_DEBUG" global="config/DEPLOY_DEBUG" type="java.lang.Boolean"/>
<ResourceLink name="config/DEPLOY_PATH" global="config/DEPLOY_PATH" type="java.lang.String"/>
<ResourceLink name="jdbc/DemoManagerDataDS" global="jdbc/DemoManagerDataDS" type="javax.sql.DataSource"/>
<ResourceLink name="vasc/DemoVascController" global="vasc/DemoVascController" type="net.forwardfire.vasc.core.VascController" />
<!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>
<!-- Disable session persistence across restarts -->
<Manager pathname="" />
</Context>

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/http-access.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/http-access-%d{yyyy-MM-dd}.log.zip</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>combined</pattern>
</encoder>
</appender>
<appender-ref ref="FILE" />
</configuration>

View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="90 seconds">
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
</contextListener>
<jmxConfigurator/>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/vasc-demo-tech.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} %msg%n</pattern>
</encoder>
</appender>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %level [%thread] %logger{10} %msg%n</pattern>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
</root>
<!-- Limit some startup messages. -->
<logger level="WARN" name="org.apache.catalina.startup.Catalina"/>
<logger level="WARN" name="org.apache.catalina.startup.ContextConfig"/>
<logger level="ERROR" name="org.apache.catalina.startup.ClassLoaderFactory"/>
<logger level="WARN" name="org.apache.catalina.core.AprLifecycleListener"/>
<logger level="WARN" name="org.ajax4jsf.cache.LRUMapCacheFactory"/>
<logger level="WARN" name="javax.enterprise.resource.webcontainer.jsf.application"/>
<logger level="WARN" name="net.jawr.web.resource.bundle.factory.BundlesHandlerFactory"/>
</configuration>

View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="90 seconds">
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
</contextListener>
<jmxConfigurator/>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/vasc-demo-tech.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/vasc-demo-tech-%d{yyyy-MM-dd}.log.zip</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>%date %level [%thread] %logger{10} %msg%n</pattern>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="FILE" />
</root>
<!-- Limit some startup messages. -->
<logger level="WARN" name="org.apache.catalina.startup.Catalina"/>
<logger level="WARN" name="org.apache.catalina.startup.ContextConfig"/>
<logger level="ERROR" name="org.apache.catalina.startup.ClassLoaderFactory"/>
<logger level="WARN" name="org.apache.catalina.core.AprLifecycleListener"/>
<logger level="WARN" name="org.ajax4jsf.cache.LRUMapCacheFactory"/>
<logger level="WARN" name="javax.enterprise.resource.webcontainer.jsf.application"/>
<logger level="WARN" name="net.jawr.web.resource.bundle.factory.BundlesHandlerFactory"/>
</configuration>

View file

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<Server port="8805" shutdown="SHUTDOWN">
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<Listener className="org.apache.catalina.core.JasperListener" />
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
<GlobalNamingResources>
<!-- Config Vasc Tech Demo -->
<Environment name="config/START_GUI" value="true" type="java.lang.Boolean"/>
<Environment name="config/START_EDITOR" value="true" type="java.lang.Boolean"/>
<Environment name="config/DEPLOY_DEBUG" value="true" type="java.lang.Boolean"/>
<Environment name="config/DEPLOY_PATH" value="/demo" type="java.lang.String"/>
<!-- Config Vasc Tech DataSource -->
<Resource name="jdbc/DemoManagerDataDS" auth="Container" type="javax.sql.DataSource"
factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
initialSize="1" minIdle="1"
driverClassName="org.h2.Driver"
url="jdbc:h2:tcp://localhost:9092/vasc-demo"
/>
<!-- Config The Vasc Demo Controller -->
<Resource name="vasc/DemoVascController" auth="Container" type="net.forwardfire.vasc.core.VascController" singleton="true" scope="Shareable"
factory="net.forwardfire.vasc.impl.jndi.JndiVascControllerFactory"
vascControllerProvider="net.forwardfire.vasc.demo.tech.core.VascTechDemoControllerConfig"
removeLocal="false"
/>
</GlobalNamingResources>
<Service name="Catalina">
<Connector port="8899" protocol="HTTP/1.1" connectionTimeout="5000" redirectPort="9988" />
<Engine name="Catalina" defaultHost="localhost">
<Realm className="org.apache.catalina.realm.LockOutRealm">
<Realm className="org.apache.catalina.realm.DataSourceRealm"
dataSourceName="jdbc/DemoManagerDataDS"
userTable="vasc_user"
userRoleTable="vasc_user_role"
userNameCol="username"
userCredCol="password"
roleNameCol="role"
digestEncoding="UTF-8"
/>
<!--
<Realm className="net.forwardfire.vasc.demo.tech.core.service.tomcat.MongoRealm"
hostname="localhost" port="27017" database="testdb" authUser="" authPass=""
userCollection="site_user"
userField="username"
userPassField="password"
roleCollection="site_user_role"
roleField="role"
roleUserField="site_user_id"
roleUserIdRef="true"
digestEncoding="UTF-8"
/>
<Realm className="org.apache.catalina.realm.JNDIRealm"
connectionURL="ldap://localhost:389"
userBase="ou=people,dc=mycompany,dc=com"
userSearch="(mail={0})"
userRoleName="memberOf"
roleBase="ou=groups,dc=mycompany,dc=com"
roleName="cn"
roleSearch="(uniqueMember={0})"
/>
-->
</Realm>
<Host name="localhost" unpackWARs="true" autoDeploy="true"
appBase="workdir/webapps" workDir="workdir/work"
>
<Valve className="ch.qos.logback.access.tomcat.LogbackValve"
quiet="true" filename="conf/logback-access.xml"
/>
<Valve className="org.apache.catalina.valves.CrawlerSessionManagerValve"
crawlerUserAgents=".*[bB]ot.*|.*ahoo.*|.*oogle.*"
sessionInactiveInterval="60"
/>
<Valve className="net.forwardfire.vasc.demo.tech.core.service.tomcat.AuthSessionTimeoutValve"
logInfo="true" minTimeout="30" maxTimeout="3600" authTimeout="1200"
/>
</Host>
</Engine>
</Service>
</Server>

File diff suppressed because it is too large Load diff

View file

@ -39,7 +39,7 @@
<v:entry id="metaProject" backendId="metaProjectBackend">
<v:field id="id" list="false"/>
<v:field id="name"/>
<v:field id="decription" vascEntryFieldType="TextAreaField"/>
<v:field id="description" vascEntryFieldType="TextAreaField"/>
</v:entry>
</v:root>

View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<v:root xmlns:v="http://vasc.forwardfire.net/eld/vasc-lang.eld"
xmlns:mm="http://vasc.forwardfire.net/eld/vasc-backend-metamodel.eld"
xmlns:td="http://demo.vasc.forwardfire.net/eld/vasc-tech-demo.eld"
>
<!-- 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"
backendType="xmlDomFile" backendFile="conf/server.xml"
/>
<td:tomcatResource name="mmdc/server/conf/logback-server.xml" auth="Container" type="org.eobjects.metamodel.DataContext"
factory="net.forwardfire.vasc.backend.metamodel.jndi.JndiDataContextObjectFactory"
backendType="xmlDomFile" backendFile="conf/logback-server.xml"
/>
<td:tomcatResource name="mmdc/server/conf/logback-access.xml" auth="Container" type="org.eobjects.metamodel.DataContext"
factory="net.forwardfire.vasc.backend.metamodel.jndi.JndiDataContextObjectFactory"
backendType="xmlDomFile" backendFile="conf/logback-access.xml"
/>
<td:tomcatResource name="mmdc/server/conf/context.xml" auth="Container" type="org.eobjects.metamodel.DataContext"
factory="net.forwardfire.vasc.backend.metamodel.jndi.JndiDataContextObjectFactory"
backendType="xmlDomFile" backendFile="conf/context.xml"
/>
<td:tomcatResource name="mmdc/server/conf/web.xml" auth="Container" type="org.eobjects.metamodel.DataContext"
factory="net.forwardfire.vasc.backend.metamodel.jndi.JndiDataContextObjectFactory"
backendType="xmlDomFile" backendFile="conf/web.xml"
/>
<!-- Get our references to the backends. -->
<mm:jndiDataContext el.id="mmdc1" jndiName="java:mmdc/server/conf/server.xml"/>
<mm:jndiDataContext el.id="mmdc2" jndiName="java:mmdc/server/conf/logback-server.xml"/>
<mm:jndiDataContext el.id="mmdc3" jndiName="java:mmdc/server/conf/logback-access.xml"/>
<mm:jndiDataContext el.id="mmdc4" jndiName="java:mmdc/server/conf/context.xml"/>
<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" />
</v:root>

View file

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<v:root xmlns:v="http://vasc.forwardfire.net/eld/vasc-lang.eld"
xmlns:mm="http://vasc.forwardfire.net/eld/vasc-backend-metamodel.eld"
xmlns:td="http://demo.vasc.forwardfire.net/eld/vasc-tech-demo.eld"
>
<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:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
<v:field id="username" backendName="USERNAME"/>
<v:field id="password" backendName="PASSWORD"/>
<v:field id="description" backendName="DESCRIPTION" vascEntryFieldType="TextAreaField"/>
</v:entry>
<mm:metaModelBackend id="AdminVascUserRoleBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_USER_ROLE" tableId="ID" />
<v:entry id="AdminVascUserRole" backendId="AdminVascUserRoleBackend" >
<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"/>
</v:field>
<v:field id="role" backendNAME="ROLE"/>
</v:entry>
<mm:metaModelBackend id="AdminVascUserChangeFieldBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_USER_CHANGE_FIELD" tableId="ID" />
<v:entry id="AdminVascUserChangeField" backendId="AdminVascUserChangeFieldBackend" adminEditReadOnly="true">
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
<v:field id="field" backendName="FIELD"/>
<v:field id="name" backendName="NAME"/>
<v:field id="active" backendNAME="ACTIVE" vascEntryFieldType="BooleanField"/>
</v:entry>
<mm:metaModelBackend id="AdminVascUserChangeLogBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_USER_CHANGE_LOG" tableId="ID" />
<v:entry id="AdminVascUserChangeLog" backendId="AdminVascUserChangeLogBackend" adminEditReadOnly="true">
<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"/>
</v:field>
<v:field id="change_field_id" backendName="CHANGE_FIELD_ID" vascEntryFieldType="ListField">
<v:vascSelectItemModel entryId="AdminVascUser" keyFieldId="id"/>
</v:field>
<v:field id="value_old" backendNAME="VALUE_OLD"/>
<v:field id="value_new" backendNAME="VALUE_NEW"/>
</v:entry>
<mm:metaModelBackend id="AdminVascMenuBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_MENU" tableId="ID" />
<v:entry id="AdminVascMenu" backendId="AdminVascMenuBackend">
<v:listOption id="menu_type" backendName="MENU_TYPE" vascEntryFieldType="ListField" optional="true">
<v:vascSelectItemModelString nullLabel="All" data="BAR_LEFT,BAR_RIGHT,BAR_BOTTOM,PAGE_INDEX,PAGE_USER_LEFT,PAGE_USER_RIGHT,PAGE_ADMIN"/>
</v:listOption>
<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="href" backendNAME="HREF"/>
<v:field id="title" backendNAME="TITLE"/>
<v:field id="target" backendNAME="TARGET"/>
<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_type" backendNAME="MENU_TYPE" vascEntryFieldType="ListField">
<v:vascSelectItemModelString data="BAR_LEFT,BAR_RIGHT,BAR_BOTTOM,MENU0,MENU1,MENU2,PAGE_INDEX,PAGE_USER_LEFT,PAGE_USER_RIGHT,PAGE_ADMIN"/>
</v:field>
</v:entry>
<mm:metaModelBackend id="AdminVascPageBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_PAGE" tableId="ID" />
<v:entry id="AdminVascPage" backendId="AdminVascPageBackend">
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
<v:field id="slug" backendNAME="SLUG"/>
<v:field id="title" backendNAME="TITLE"/>
<v:field id="i18n_key" backendNAME="I18N_KEY" vascEntryFieldType="BooleanField"/>
<!-- <v:field id="active" backendNAME="ACTIVE" vascEntryFieldType="BooleanField"/> -->
<v:field id="sitemap" backendNAME="SITEMAP" vascEntryFieldType="BooleanField"/>
</v:entry>
<mm:metaModelBackend id="AdminVascPagePartBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_PAGE_PART" tableId="ID" />
<v:entry id="AdminVascPagePart" backendId="AdminVascPagePartBackend">
<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"/>
</v:field>
<v:field id="title" backendNAME="TITLE"/>
<v:field id="text" backendNAME="TEXT"/>
<v:field id="i18n_key" backendNAME="I18N_KEY" vascEntryFieldType="BooleanField"/>
<v:field id="active" backendNAME="ACTIVE" vascEntryFieldType="BooleanField"/>
<v:field id="sitemap" backendNAME="SITEMAP" vascEntryFieldType="BooleanField"/>
<v:field id="part_order" backendNAME="PART_ORDER" vascEntryFieldType="IntegerField"/>
<v:field id="part_type" backendNAME="PART_TYPE" vascEntryFieldType="ListField">
<v:vascSelectItemModelEnum enumClass="net.forwardfire.vasc.demo.tech.web.menu.model.VascMenuType"/>
</v:field>
</v:entry>
</v:root>

View file

@ -1 +1,7 @@
All *.xml in this dir are automaticly started.
== Deploy directory ==
-- All *.xml files are deployed on startup.
-- Directory get scanned every 3 secs.
-- Files get redeployed when md5sum changes.
-- No undeploy and no removal of vasc entries only ADD/replace.

View file

@ -0,0 +1 @@
1234-56-78 90:12:34,123 INFO [install] Thank you for trying this vasc demo tech.

View file

@ -3,4 +3,18 @@ Readme for Vasc Tech Demo application.
To start:
execute: run.sh or run.bat
execute: run.sh or run.bat
Custom i18n keys web:
Application.web.meta.robots = index, follow
Application.web.meta.description = Vasc Tech Demo Web Frontends
Application.web.meta.keywords = demo,forwardfire,x4o,vasc,java
Application.web.header.logo.alt = Vasc Tech Demo Logo
Application.web.footer.center = Vasc Tech Demo Web Based on JSF and Faclets and Richfaces.
Application.web.footer.left = Copyright &copy; 2012
Application.web.footer.right = Version 0.4.x<i>(beta)</i>

View file

@ -28,7 +28,7 @@ cd /d %~dp0
:: Config variables
set JAVA_OPTS=-Xms64m -Xmx256m
set MAIN_CLASS=net.forwardfire.vasc.demo.tech.ui.TechUI
set MAIN_CLASS=net.forwardfire.vasc.demo.tech.core.VascTechDemo
set CP=lib\*
:: Launch application

View file

@ -28,7 +28,7 @@ cd `dirname $0`;
# Config variables
JAVA="java";
JAVA_OPTS="-Xms64m -Xmx256m";
MAIN_CLASS="net.forwardfire.vasc.demo.tech.ui.TechUI";
MAIN_CLASS="net.forwardfire.vasc.demo.tech.core.VascTechDemo";
CP=`echo lib/*.jar | sed 's/ /:/g'`;
# Launch application