diff --git a/.gitignore b/.gitignore index 3318a72..85fb83c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,12 +10,12 @@ */*/*/*/target # Inore some artifact dirs; -vasc-demo/vasc-demo-server/vasc-demo-server-core/conf -vasc-demo/vasc-demo-server/vasc-demo-server-core/data -vasc-demo/vasc-demo-server/vasc-demo-server-core/demo -vasc-demo/vasc-demo-server/vasc-demo-server-core/deploy -vasc-demo/vasc-demo-server/vasc-demo-server-core/logs -vasc-demo/vasc-demo-server/vasc-demo-server-core/workdir +vasc-demo/vasc-demo-server/conf +vasc-demo/vasc-demo-server/data +vasc-demo/vasc-demo-server/demo +vasc-demo/vasc-demo-server/deploy +vasc-demo/vasc-demo-server/logs +vasc-demo/vasc-demo-server/workdir # Ignore leftovers of really failed release build release.properties diff --git a/pom.xml b/pom.xml index 415a019..c36f199 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.forwardfire.vasc vasc -0.4.1-SNAPSHOT +0.4.2-SNAPSHOT pom vasc Very Amazing/Advanced/Amplified Simple CRUD'ing for all. @@ -26,9 +26,6 @@ vasc-core - vasc-xpql - vasc-xpql-ejb3-server - vasc-xpql-ejb3-client vasc-backend vasc-frontend vasc-demo @@ -80,7 +77,7 @@ 2.1.0 - 0.8.5-SNAPSHOT + 0.8.7-SNAPSHOT 4.3 diff --git a/vasc-backend/pom.xml b/vasc-backend/pom.xml index 53fdffe..59a6942 100644 --- a/vasc-backend/pom.xml +++ b/vasc-backend/pom.xml @@ -3,7 +3,7 @@ vasc net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-backend pom diff --git a/vasc-backend/vasc-backend-jdbc/pom.xml b/vasc-backend/vasc-backend-jdbc/pom.xml index 895734c..5f23602 100644 --- a/vasc-backend/vasc-backend-jdbc/pom.xml +++ b/vasc-backend/vasc-backend-jdbc/pom.xml @@ -3,7 +3,7 @@ vasc-backend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-backend-jdbc diff --git a/vasc-backend/vasc-backend-jdbc/src/main/resources/META-INF/vasc/vasc-backend-jdbc.eld b/vasc-backend/vasc-backend-jdbc/src/main/resources/META-INF/vasc/vasc-backend-jdbc.eld index dccdd31..bb37df8 100644 --- a/vasc-backend/vasc-backend-jdbc/src/main/resources/META-INF/vasc/vasc-backend-jdbc.eld +++ b/vasc-backend/vasc-backend-jdbc/src/main/resources/META-INF/vasc/vasc-backend-jdbc.eld @@ -4,8 +4,8 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Backend JDBC" + providerHost="vasc.forwardfire.net" + providerName="Vasc Backend JDBC" id="vasc-backend-jdbc" > Provides VASC JDBC backend support. diff --git a/vasc-backend/vasc-backend-jpa/pom.xml b/vasc-backend/vasc-backend-jpa/pom.xml index 94ad157..16b2081 100644 --- a/vasc-backend/vasc-backend-jpa/pom.xml +++ b/vasc-backend/vasc-backend-jpa/pom.xml @@ -3,7 +3,7 @@ vasc-backend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-backend-jpa vasc-backend-jpa diff --git a/vasc-backend/vasc-backend-jpa/src/main/resources/META-INF/vasc/vasc-backend-jpa.eld b/vasc-backend/vasc-backend-jpa/src/main/resources/META-INF/vasc/vasc-backend-jpa.eld index 7acd82e..1aed133 100644 --- a/vasc-backend/vasc-backend-jpa/src/main/resources/META-INF/vasc/vasc-backend-jpa.eld +++ b/vasc-backend/vasc-backend-jpa/src/main/resources/META-INF/vasc/vasc-backend-jpa.eld @@ -5,8 +5,8 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Backend JPA" + providerHost="vasc.forwardfire.net" + providerName="Vasc Backend JPA" id="vasc-backend-jpa" > Provides VASC JPA backend support. diff --git a/vasc-backend/vasc-backend-ldap/pom.xml b/vasc-backend/vasc-backend-ldap/pom.xml index 5007f4f..78c5775 100644 --- a/vasc-backend/vasc-backend-ldap/pom.xml +++ b/vasc-backend/vasc-backend-ldap/pom.xml @@ -3,7 +3,7 @@ vasc-backend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-backend-ldap vasc-backend-ldap diff --git a/vasc-backend/vasc-backend-ldap/src/main/resources/META-INF/vasc/vasc-backend-ldap.eld b/vasc-backend/vasc-backend-ldap/src/main/resources/META-INF/vasc/vasc-backend-ldap.eld index b03f10d..f048656 100644 --- a/vasc-backend/vasc-backend-ldap/src/main/resources/META-INF/vasc/vasc-backend-ldap.eld +++ b/vasc-backend/vasc-backend-ldap/src/main/resources/META-INF/vasc/vasc-backend-ldap.eld @@ -4,8 +4,8 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Backend LDAP" + providerHost="vasc.forwardfire.net" + providerName="Vasc Backend LDAP" id="vasc-backend-ldap" > Provides VASC LDAP backend support. diff --git a/vasc-backend/vasc-backend-metamodel/pom.xml b/vasc-backend/vasc-backend-metamodel/pom.xml index d3a12db..a9721ef 100644 --- a/vasc-backend/vasc-backend-metamodel/pom.xml +++ b/vasc-backend/vasc-backend-metamodel/pom.xml @@ -3,7 +3,7 @@ vasc-backend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-backend-metamodel diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/SchemaAutoEntryElementConfigurator.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/SchemaAutoEntryElementConfigurator.java index 9dd4ede..e396e69 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/SchemaAutoEntryElementConfigurator.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/SchemaAutoEntryElementConfigurator.java @@ -24,7 +24,7 @@ package net.forwardfire.vasc.backend.metamodel.x4o; import net.forwardfire.vasc.backend.metamodel.MetaModelSchemaAutoEntry; import net.forwardfire.vasc.core.VascController; -import net.forwardfire.vasc.impl.x4o.VascParser; +import net.forwardfire.vasc.impl.x4o.VascDriver; import org.x4o.xml.element.AbstractElementConfigurator; import org.x4o.xml.element.Element; @@ -50,7 +50,7 @@ public class SchemaAutoEntryElementConfigurator extends AbstractElementConfigura throw new ElementConfiguratorException(this,"ElementObject is not MetaModelSchemaAutoEntry object."); } MetaModelSchemaAutoEntry autoEntry = (MetaModelSchemaAutoEntry)element.getElementObject(); - VascController vascController = VascParser.getVascController(element.getElementLanguage()); + VascController vascController = VascDriver.getVascController(element.getLanguageSession()); autoEntry.autoFillResult(vascController); autoEntry.autoAddResultToController(); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/XmlSaxSchemaElement.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/XmlSaxSchemaElement.java index ec6f83a..3c2050e 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/XmlSaxSchemaElement.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/x4o/XmlSaxSchemaElement.java @@ -17,7 +17,7 @@ public class XmlSaxSchemaElement extends AbstractElement { */ @Override public void doElementRun() throws ElementException { - if (getElementClass().getTag().endsWith("Column")) { + if (getElementClass().getId().endsWith("Column")) { return; // save one object to code. } if (getParent()==null) { diff --git a/vasc-backend/vasc-backend-metamodel/src/main/resources/META-INF/vasc/vasc-backend-metamodel.eld b/vasc-backend/vasc-backend-metamodel/src/main/resources/META-INF/vasc/vasc-backend-metamodel.eld index 81aca34..3a1059b 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/resources/META-INF/vasc/vasc-backend-metamodel.eld +++ b/vasc-backend/vasc-backend-metamodel/src/main/resources/META-INF/vasc/vasc-backend-metamodel.eld @@ -4,8 +4,8 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Backend MetaModel" + providerHost="vasc.forwardfire.net" + providerName="Vasc Backend MetaModel" id="vasc-backend-metamodel" > Provides VASC MetaModel backend support. diff --git a/vasc-backend/vasc-backend-mongodb/pom.xml b/vasc-backend/vasc-backend-mongodb/pom.xml index 4312f53..b0e138e 100644 --- a/vasc-backend/vasc-backend-mongodb/pom.xml +++ b/vasc-backend/vasc-backend-mongodb/pom.xml @@ -3,7 +3,7 @@ vasc-backend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-backend-mongodb diff --git a/vasc-backend/vasc-backend-mongodb/src/main/resources/META-INF/vasc/vasc-backend-mongodb.eld b/vasc-backend/vasc-backend-mongodb/src/main/resources/META-INF/vasc/vasc-backend-mongodb.eld index 2ad5475..2167d63 100644 --- a/vasc-backend/vasc-backend-mongodb/src/main/resources/META-INF/vasc/vasc-backend-mongodb.eld +++ b/vasc-backend/vasc-backend-mongodb/src/main/resources/META-INF/vasc/vasc-backend-mongodb.eld @@ -4,8 +4,8 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Backend MongoDB" + providerHost="vasc.forwardfire.net" + providerName="Vasc Backend MongoDB" id="vasc-backend-mongodb" > Provides VASC MongoDB backend support. diff --git a/vasc-core-ejb3-client/pom.xml b/vasc-core-ejb3-client/pom.xml index dbf7713..b128e38 100644 --- a/vasc-core-ejb3-client/pom.xml +++ b/vasc-core-ejb3-client/pom.xml @@ -3,7 +3,7 @@ net.forwardfire.vasc vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-core-ejb3-client vasc-core-ejb3-client diff --git a/vasc-core-ejb3-server/pom.xml b/vasc-core-ejb3-server/pom.xml index 3d567f6..379813e 100644 --- a/vasc-core-ejb3-server/pom.xml +++ b/vasc-core-ejb3-server/pom.xml @@ -3,7 +3,7 @@ net.forwardfire.vasc vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-core-ejb3-server vasc-core-ejb3-server @@ -31,11 +31,5 @@ ${persistence-api.version} provided - - net.forwardfire.vasc - vasc-xpql-ejb3-client - ${project.version} - provided - \ No newline at end of file diff --git a/vasc-core-ejb3-server/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java b/vasc-core-ejb3-server/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java index bdd23e4..fe3f0ef 100644 --- a/vasc-core-ejb3-server/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java +++ b/vasc-core-ejb3-server/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java @@ -43,6 +43,8 @@ import javax.ejb.Stateless; import javax.naming.InitialContext; import javax.persistence.EntityManager; +import org.x4o.xml.io.X4OReader; + import net.forwardfire.vasc.backend.VascBackend; import net.forwardfire.vasc.backends.jpa.EntityManagerProvider; import net.forwardfire.vasc.core.VascController; @@ -50,8 +52,8 @@ import net.forwardfire.vasc.core.VascEntry; import net.forwardfire.vasc.core.VascEntryControllerLocal; import net.forwardfire.vasc.core.VascEntryLocal; import net.forwardfire.vasc.impl.DefaultVascFactory; -import net.forwardfire.vasc.impl.x4o.VascParser; -import net.forwardfire.vasc.xpql.ejb3.XpqlQueryManager; +import net.forwardfire.vasc.impl.x4o.VascDriver; +import net.forwardfire.vasc.xpql.execute.jpa.XpqlQueryManager; import net.forwardfire.vasc.xpql.query.Query; @@ -108,14 +110,16 @@ public class VascServiceManagerImpl implements VascServiceManagerRemote,VascServ String value = keys.get(key); if (key.startsWith("load")) { // TODO made reuse working. - VascParser vp = new VascParser(vascController); + VascDriver driver = VascDriver.getInstance(); + X4OReader reader = driver.createReader(); + driver.addVascController(reader, vascController); if (xpqlController!=null) { - vp.addELBean("xpqlController", new XpqlController()); + reader.addELBeanInstance("xpqlController", new XpqlController()); } if (entityManager!=null) { - vp.addELBean("entityManagerProvider", new LocalEntityManagerProvider()); + reader.addELBeanInstance("entityManagerProvider", new LocalEntityManagerProvider()); } - vp.parseResource(value); + reader.readResource(value); } } DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController); diff --git a/vasc-core/pom.xml b/vasc-core/pom.xml index 07eed1f..d8ddca6 100644 --- a/vasc-core/pom.xml +++ b/vasc-core/pom.xml @@ -3,7 +3,7 @@ vasc net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-core vasc-core @@ -11,7 +11,7 @@ org.x4o - x4o-core + x4o-driver ${x4o.version} @@ -20,8 +20,8 @@ ${x4o.version} - net.forwardfire.vasc - vasc-xpql + net.forwardfire.vasc.lib + vasc-lib-xpql ${project.version} diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java b/vasc-core/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java index 399f3f8..eeb2701 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java @@ -26,7 +26,7 @@ import net.forwardfire.vasc.core.VascEntryField; import net.forwardfire.vasc.core.entry.VascEntryFieldValue; import net.forwardfire.vasc.core.VascException; -import org.x4o.xml.impl.DefaultElementObjectPropertyValue; +import org.x4o.xml.element.DefaultElementObjectPropertyValue; /** * BeanVascEntryFieldValue provides get/set support for bean based backends. diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java index ba743f4..6de8310 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java @@ -22,6 +22,8 @@ package net.forwardfire.vasc.core; +import java.util.List; + import org.x4o.xml.conv.ObjectConverter; import net.forwardfire.vasc.core.base.VascBaseIdLocal; @@ -41,6 +43,7 @@ public interface VascEntryFieldTypeLocal extends VascEntryFieldType,VascBaseIdLo public void setAutoDetectClass(Class classObject); + public List getVascValidators(); public void addVascValidator(VascValidator vascValidator); public void removeVascValidator(VascValidator vascValidator); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java index 61a212f..842247b 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java @@ -27,7 +27,7 @@ import net.forwardfire.vasc.core.VascEntryField; import net.forwardfire.vasc.core.entry.VascEntryFieldValue; import net.forwardfire.vasc.core.VascException; -import org.x4o.xml.impl.DefaultElementObjectPropertyValue; +import org.x4o.xml.element.DefaultElementObjectPropertyValue; /** * diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java index 27b9ccd..9bb545d 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java @@ -45,11 +45,9 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo public DefaultVascEntryFieldTypeController() throws VascException { try { - FieldTypeParser parser = new FieldTypeParser(); - parser.parseVascFieldTypes(); - + FieldTypeDriver driver = new FieldTypeDriver(); vascEntryFieldTypes = new HashMap(35); - for(VascEntryFieldTypeLocal v:parser.getTypes()) { + for(VascEntryFieldTypeLocal v:driver.getVascFieldTypes()) { vascEntryFieldTypes.put(v.getId(),v); } } catch (Exception e) { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeParser.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeDriver.java similarity index 61% rename from vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeParser.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeDriver.java index b21d151..deef907 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeParser.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeDriver.java @@ -22,9 +22,9 @@ package net.forwardfire.vasc.impl.type; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; -import java.util.InvalidPropertiesFormatException; import java.util.List; import javax.xml.parsers.ParserConfigurationException; @@ -32,12 +32,16 @@ import javax.xml.parsers.ParserConfigurationException; import net.forwardfire.vasc.core.VascEntryFieldTypeLocal; import org.xml.sax.SAXException; - +import org.x4o.xml.X4ODriver; +import org.x4o.xml.X4ODriverManager; import org.x4o.xml.conv.DefaultObjectConverterProvider; import org.x4o.xml.conv.ObjectConverter; -import org.x4o.xml.core.X4OParser; -import org.x4o.xml.core.config.X4OLanguageProperty; import org.x4o.xml.element.Element; +import org.x4o.xml.io.X4OConnectionException; +import org.x4o.xml.io.X4OReaderSession; +import org.x4o.xml.lang.X4OLanguageSession; +import org.x4o.xml.lang.X4OLanguageSessionLocal; +import org.x4o.xml.lang.phase.X4OPhaseException; /** * @@ -45,30 +49,35 @@ import org.x4o.xml.element.Element; * @author Willem Cazander * @version 1.0 Sep 11, 2008 */ -public class FieldTypeParser extends X4OParser { +public class FieldTypeDriver extends X4ODriver { - static public final String FIELD_TYPE_LANGUAGE = "fieldtype"; + static public final String LANGUAGE_NAME = "fieldtype"; + static public final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION}; - /** - * - * @param language - * @throws IOException - * @throws InvalidPropertiesFormatException - * @throws Exception - */ - public FieldTypeParser() throws InvalidPropertiesFormatException, IOException { - super(FIELD_TYPE_LANGUAGE); - setProperty(X4OLanguageProperty.PHASE_SKIP_RELEASE.toUri(), true); + static public FieldTypeDriver getInstance() { + return (FieldTypeDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME); } - public void parseVascFieldTypes() throws IOException, SecurityException, NullPointerException, ParserConfigurationException, SAXException { - parseResource("META-INF/fieldtypes.xml"); + @Override + public String getLanguageName() { + return LANGUAGE_NAME; + } + + @Override + public String[] getLanguageVersions() { + return LANGUAGE_VERSIONS; } - public List getTypes() { + public List getVascFieldTypes() throws FileNotFoundException, SecurityException, NullPointerException, ParserConfigurationException, SAXException, IOException, X4OPhaseException, X4OConnectionException { + X4OReaderSession reader = createReaderSession(); + //reader.setProperty(X4OLanguageProperty.PHASE_SKIP_RELEASE.toUri(), true); + reader.addPhaseSkip("READ_RELEASE"); + X4OLanguageSession session = reader.readResourceSession("META-INF/fieldtypes.xml"); + //((X4OLanguageSessionLocal)session).addPhaseSkip("READ_RELEASE");// TODO: fixme + List result = new ArrayList(40); DefaultObjectConverterProvider convProvider = new DefaultObjectConverterProvider(true); - for (Element e:getDriver().getElementLanguage().getRootElement().getChilderen()) { + for (Element e:session.getRootElement().getChilderen()) { VascEntryFieldTypeLocal a = (VascEntryFieldTypeLocal)e.getElementObject(); if (a.getObjectConverter()==null && a.getAutoDetectClass()!=null) { ObjectConverter conv = convProvider.getObjectConverterForClass(a.getAutoDetectClass()); @@ -76,6 +85,7 @@ public class FieldTypeParser extends X4OParser { } result.add(a); } + reader.releaseSession(session); return result; } } \ No newline at end of file diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java index b0c8e6c..a510090 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java @@ -47,9 +47,9 @@ import net.forwardfire.vasc.impl.DefaultVascEntryField; import net.forwardfire.vasc.validators.VascValidator; import net.forwardfire.vasc.validators.VascValidatorClassParser; -import org.x4o.xml.core.config.X4OLanguageClassLoader; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; +import org.x4o.xml.lang.X4OLanguageClassLoader; /** @@ -269,7 +269,7 @@ public class AnnotationParserElement extends AbstractElement { field.addVascValidator(v); // todo: merg with already added list of template so we can override. } - VascController vascController = VascParser.getVascController(this.getElementLanguage()); + VascController vascController = VascDriver.getVascController(this.getLanguageSession()); VascChoices vc = parser.getVascChoices (modelClass, field.getId()); if (vc!=null) { VascEntryFieldType type = vascController.getVascEntryFieldTypeController().getVascEntryFieldTypeById("ListField"); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java index 35a538f..d6d85f7 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java @@ -22,9 +22,11 @@ package net.forwardfire.vasc.impl.x4o; - import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFieldLocal; import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.core.VascEntryListOptionLocal; +import net.forwardfire.vasc.core.VascEntryLocal; import net.forwardfire.vasc.core.ui.VascSelectItemModel; import org.x4o.xml.element.AbstractElementBindingHandler; @@ -38,7 +40,7 @@ import org.x4o.xml.element.ElementBindingHandlerException; * @author Willem Cazander * @version 1.0 Apr 02, 2009 */ -public class SelectItemModelBindingHandler extends AbstractElementBindingHandler { +public class SelectItemModelBindingHandler extends AbstractElementBindingHandler { private final static Class[] CLASSES_CHILD = new Class[] { VascSelectItemModel.class @@ -58,16 +60,16 @@ public class SelectItemModelBindingHandler extends AbstractElementBindingHandler return CLASSES_CHILD; } - /** - * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element) - */ - public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException { - if (parentObject instanceof VascEntryField) { - VascEntryField parent = (VascEntryField)parentObject; - if (childObject instanceof VascSelectItemModel) { - VascEntryFieldType type = parent.getVascEntryFieldType(); - type.setDataObject(childObject); - } + @Override + public void bindChild(Element childElement, VascEntryField parentObject,Object childObject) throws ElementBindingHandlerException { + if (childObject instanceof VascSelectItemModel) { + VascEntryFieldType type = parentObject.getVascEntryFieldType(); + type.setDataObject(childObject); } } + + @Override + public void createChilderen(Element parentElement, VascEntryField parentObject) throws ElementBindingHandlerException { + createChild(parentElement, parentObject.getVascEntryFieldType().getDataObject()); + } } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java index 01143c6..e87cb6a 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java @@ -50,7 +50,7 @@ public class SetParameterElement extends AbstractElement { VascEntry entry = (VascEntry)getParent().getElementObject(); logger.fine("Setting parameter name: "+name+" value: "+value+" type: "+type); - if ("setUserParameter".equals(getElementClass().getTag())) { + if ("setUserParameter".equals(getElementClass().getId())) { if (value==null) { value="id"; // default to ids } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java index 9ae663e..ade2473 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java @@ -48,7 +48,7 @@ public class VascBackendElementConfigurator extends AbstractElementConfigurator VascBackend backend = (VascBackend)element.getElementObject(); - VascController vascController = VascParser.getVascController(element.getElementLanguage()); + VascController vascController = VascDriver.getVascController(element.getLanguageSession()); VascBackendController backendController = vascController.getVascBackendController(); if (backendController instanceof VascBackendControllerLocal) { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParser.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascDriver.java similarity index 58% rename from vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParser.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascDriver.java index 8af9fbc..c18b2dc 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParser.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascDriver.java @@ -22,54 +22,48 @@ package net.forwardfire.vasc.impl.x4o; -import java.util.Map; - import javax.el.ValueExpression; import net.forwardfire.vasc.core.VascController; -import org.x4o.xml.core.X4OParser; -import org.x4o.xml.element.ElementLanguage; +import org.x4o.xml.X4ODriver; +import org.x4o.xml.X4ODriverManager; +import org.x4o.xml.io.X4OReader; +import org.x4o.xml.lang.X4OLanguageSession; /** - * VascParser the vasc xml streams. + * VascDriver the vasc xml streams. * * @author Willem Cazander * @version 1.0 Oct 27, 2008 */ -public class VascParser extends X4OParser { +public class VascDriver extends X4ODriver { - static public String VASC_LANGUAGE = "vasc"; - private VascController vascController = null; - private Map beanMap = null; + static final public String LANGUAGE_NAME = "vasc"; + static public final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION}; + static final public String EL_VASC_CONTROLLER = "el_vasc_controller"; - /** - * @see X4OParser#X4OParser(String) - */ - public VascParser(VascController vascController) { - super(VASC_LANGUAGE); - if (vascController==null) { - throw new NullPointerException("vascController may not be null"); - } - this.vascController=vascController; - addELBeanInstance("vascController", vascController); + static public VascDriver getInstance() { + return (VascDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME); } - protected VascParser() { - super(VASC_LANGUAGE); + @Override + public String getLanguageName() { + return LANGUAGE_NAME; + } + + @Override + public String[] getLanguageVersions() { + return LANGUAGE_VERSIONS; } - public void addELBean(String name,Object object) { - beanMap.put(name,object); + public void addVascController(X4OReader reader,VascController controller) { + reader.addELBeanInstance(EL_VASC_CONTROLLER, controller); } - public VascController getVascController() { - return vascController; - } - - static public VascController getVascController(ElementLanguage context) { - ValueExpression ee = context.getExpressionFactory().createValueExpression(context.getELContext(),"${vascController}", VascController.class); - VascController con = (VascController)ee.getValue(context.getELContext()); + static public VascController getVascController(X4OLanguageSession context) { + ValueExpression ee = context.getExpressionLanguageFactory().createValueExpression(context.getExpressionLanguageContext(),"${"+EL_VASC_CONTROLLER+"}", VascController.class); + VascController con = (VascController)ee.getValue(context.getExpressionLanguageContext()); return con; } -} \ No newline at end of file +} diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java index 807ac07..c1dcc7c 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java @@ -27,9 +27,9 @@ import net.forwardfire.vasc.core.actions.ColumnVascActionLocal; import net.forwardfire.vasc.core.actions.GlobalVascActionLocal; import net.forwardfire.vasc.core.actions.RowVascActionLocal; -import org.x4o.xml.core.config.X4OLanguageClassLoader; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; +import org.x4o.xml.lang.X4OLanguageClassLoader; /** * Handed the eventListener xml tag. diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java index 77961f0..03b6644 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java @@ -45,7 +45,7 @@ public class VascEntryElementConfigurator extends AbstractElementConfigurator { */ public void doConfigElement(Element element) throws ElementConfiguratorException { Object elementObject = element.getElementObject(); - VascController vascController = VascParser.getVascController(element.getElementLanguage()); + VascController vascController = VascDriver.getVascController(element.getLanguageSession()); VascEntryController entryController = vascController.getVascEntryController(); if (entryController instanceof VascEntryControllerLocal) { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java index 2090c98..d5184a8 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java @@ -37,7 +37,7 @@ import org.x4o.xml.element.ElementBindingHandlerException; * @author Willem Cazander * @version 1.0 Apr 02, 2009 */ -public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler { +public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler { private final static Class[] CLASSES_CHILD = new Class[] { VascEntryFieldLocal.class, @@ -58,20 +58,25 @@ public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler return CLASSES_CHILD; } - /** - * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element) - */ - public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException { - if (parentObject instanceof VascEntryLocal) { - VascEntryLocal parent = (VascEntryLocal)parentObject; - if (childObject instanceof VascEntryFieldLocal & (childObject instanceof VascEntryListOptionLocal)==false) { - VascEntryFieldLocal child = (VascEntryFieldLocal) childObject; - parent.addVascEntryField(child); - } - if (childObject instanceof VascEntryListOptionLocal) { - VascEntryListOptionLocal child = (VascEntryListOptionLocal) childObject; - parent.addVascEntryListOption(child); - } + @Override + public void bindChild(Element childElement, VascEntryLocal parentObject,Object childObject) throws ElementBindingHandlerException { + if (childObject instanceof VascEntryFieldLocal & (childObject instanceof VascEntryListOptionLocal)==false) { + VascEntryFieldLocal child = (VascEntryFieldLocal) childObject; + parentObject.addVascEntryField(child); + } + if (childObject instanceof VascEntryListOptionLocal) { + VascEntryListOptionLocal child = (VascEntryListOptionLocal) childObject; + parentObject.addVascEntryListOption(child); + } + } + + @Override + public void createChilderen(Element parentElement, VascEntryLocal parentObject) throws ElementBindingHandlerException { + for (VascEntryFieldLocal field:parentObject.getVascEntryFieldsLocal()) { + createChild(parentElement, field); + } + for (VascEntryListOptionLocal field:parentObject.getVascEntryListOptionsLocal()) { + createChild(parentElement, field); } } } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java index bb88a77..35f1dd3 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java @@ -49,7 +49,7 @@ public class VascEntryFieldConfigurator extends AbstractElementConfigurator { if ("".equals(fieldID)) { fieldID = "TextField"; // ?? } - VascController controller = VascParser.getVascController(element.getElementLanguage()); + VascController controller = VascDriver.getVascController(element.getLanguageSession()); VascEntryFieldType result = controller.getVascEntryFieldTypeController().getVascEntryFieldTypeById(fieldID); ((VascEntryFieldLocal)element.getElementObject()).setVascEntryFieldType(result); } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java index 0fb79c6..f1c780e 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java @@ -28,13 +28,13 @@ import java.util.logging.Logger; import net.forwardfire.vasc.core.VascEntryField; import net.forwardfire.vasc.core.VascEntryFieldType; -import org.x4o.xml.core.X4OPhase; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; +import org.x4o.xml.lang.phase.X4OPhase; /** - * + * VascEntryFieldTypeElement * * @author Willem Cazander * @version 1.0 Mar 27, 2009 @@ -56,6 +56,7 @@ public class VascEntryFieldTypeElement extends AbstractElement { VascEntryFieldType type = field.getVascEntryFieldType(); setElementObject(type); logger.info("Readding the element for reparsing"); - getElementLanguage().addDirtyElement(this, X4OPhase.startX4OPhase); + X4OPhase startX4OPhase = getLanguageSession().getLanguage().getPhaseManager().getPhase("READ_CONFIG_ELEMENT"); // TODO: back to enum ? + getLanguageSession().addDirtyElement(this, startX4OPhase); } } \ No newline at end of file diff --git a/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-lang.eld b/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-lang.eld index 408344d..21e0658 100644 --- a/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-lang.eld +++ b/vasc-core/src/main/resources/META-INF/fieldtype/fieldtype-lang.eld @@ -5,24 +5,23 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Field Type Language" + providerHost="vasc.forwardfire.net" + providerName="Vasc Field Type Language" id="mod-fieldtype-lang" > + parentClass="net.forwardfire.vasc.core.VascEntryFieldTypeLocal" childClass="net.forwardfire.vasc.validators.VascValidator" + addMethod="addVascValidator" getMethod="getVascValidators" + /> + parentClass="net.forwardfire.vasc.core.VascEntryFieldTypeLocal" childClass="org.x4o.xml.conv.ObjectConverter" + addMethod="setObjectConverter" getMethod="setObjectConverter" + /> - + parentClass="org.x4o.xml.conv.ObjectConverter" childClass="org.x4o.xml.conv.ObjectConverter" + addMethod="addObjectConverter" getMethod="getObjectConverters" + /> fieldtype-lang.eld - org.x4o.xml.meta.MetaLanguageSiblingLoader + org.x4o.xml.lang.meta.MetaLanguageSiblingLoader diff --git a/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld b/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld index 538777a..231d1a7 100644 --- a/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld +++ b/vasc-core/src/main/resources/META-INF/vasc/vasc-lang.eld @@ -5,20 +5,44 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Config Language" + providerHost="vasc.forwardfire.net" + providerName="Vasc Config Language" id="vasc-lang" > - - - - - - - - - - + + + + + + + + + @@ -60,7 +84,7 @@ - + @@ -81,7 +105,7 @@ - + @@ -93,7 +117,7 @@ - + diff --git a/vasc-core/src/main/resources/META-INF/vasc/vasc-modules.xml b/vasc-core/src/main/resources/META-INF/vasc/vasc-modules.xml index 6583d8e..14e47c7 100644 --- a/vasc-core/src/main/resources/META-INF/vasc/vasc-modules.xml +++ b/vasc-core/src/main/resources/META-INF/vasc/vasc-modules.xml @@ -6,6 +6,6 @@ > vasc-lang.eld - org.x4o.xml.meta.MetaLanguageSiblingLoader + org.x4o.xml.lang.meta.MetaLanguageSiblingLoader diff --git a/vasc-core/src/main/resources/META-INF/x4o-drivers.xml b/vasc-core/src/main/resources/META-INF/x4o-drivers.xml new file mode 100644 index 0000000..2e984ab --- /dev/null +++ b/vasc-core/src/main/resources/META-INF/x4o-drivers.xml @@ -0,0 +1,33 @@ + + + + + + diff --git a/vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java b/vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java index 815df57..ad0fe65 100644 --- a/vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java +++ b/vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java @@ -22,11 +22,8 @@ package net.forwardfire.vasc; -import java.io.InputStream; -import java.util.logging.LogManager; - import net.forwardfire.vasc.core.VascEntryFieldType; -import net.forwardfire.vasc.impl.type.FieldTypeParser; +import net.forwardfire.vasc.impl.type.FieldTypeDriver; @@ -39,27 +36,16 @@ import junit.framework.TestCase; * @version 1.0 Jul 24, 2006 */ public class FieldTypesTest extends TestCase { - - public void setUp() throws Exception { - // enable all logs - // //InputStream loggingProperties = this.getClass().getResourceAsStream("/META-INF/logging.properties"); - // LogManager.getLogManager().readConfiguration( loggingProperties ); - // loggingProperties.close(); - } - - public void tearDown() throws Exception { - } - public void testNull() throws Exception { - assertEquals(true, true); - } - public void testParse() throws Exception { - FieldTypeParser p = new FieldTypeParser(); - p.parseVascFieldTypes(); - - System.out.println("Got types;"); - for (VascEntryFieldType t:p.getTypes()) { - System.out.println("t= "+t.getId()); - } - } -} \ No newline at end of file + public void testNull() throws Exception { + assertEquals(true, true); + } + + public void testParse() throws Exception { + FieldTypeDriver p = new FieldTypeDriver(); + System.out.println("Got types;"); + for (VascEntryFieldType t:p.getVascFieldTypes()) { + System.out.println("t= "+t.getId()); + } + } +} diff --git a/vasc-demo/pom.xml b/vasc-demo/pom.xml index 9b59558..14269cf 100644 --- a/vasc-demo/pom.xml +++ b/vasc-demo/pom.xml @@ -3,7 +3,7 @@ vasc net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-demo @@ -12,8 +12,10 @@ vasc-demo vasc-demo - vasc-demo-petstore-j2ee5 - vasc-demo-tech - vasc-demo-server + vasc-demo-build + vasc-demo-client-swing + vasc-demo-server + vasc-demo-tech-domain + vasc-demo-tech-web \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech/.project b/vasc-demo/vasc-demo-build/.project similarity index 92% rename from vasc-demo/vasc-demo-tech/.project rename to vasc-demo/vasc-demo-build/.project index 297b9a1..df08c71 100644 --- a/vasc-demo/vasc-demo-tech/.project +++ b/vasc-demo/vasc-demo-build/.project @@ -1,6 +1,6 @@ - vasc-demo-tech + vasc-demo-build diff --git a/vasc-demo/vasc-demo-tech/pom.xml b/vasc-demo/vasc-demo-build/pom.xml similarity index 55% rename from vasc-demo/vasc-demo-tech/pom.xml rename to vasc-demo/vasc-demo-build/pom.xml index 0f4b451..e8d29f4 100644 --- a/vasc-demo/vasc-demo-tech/pom.xml +++ b/vasc-demo/vasc-demo-build/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - vasc-demo net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT - .. + vasc-demo + 0.4.2-SNAPSHOT - vasc-demo-tech + net.forwardfire.vasc.demo.build + vasc-demo-build pom - vasc-demo-tech - vasc-demo-tech + vasc-demo-build + vasc-demo-build - vasc-demo-tech-web - vasc-demo-tech-client-swing - vasc-demo-tech-ejb3 + vasc-demo-build-server + vasc-demo-build-client-swing \ No newline at end of file diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/.project b/vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/.project similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/.project rename to vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/.project diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/pom.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/pom.xml similarity index 74% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/pom.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/pom.xml index 3d07ea1..9c137eb 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/pom.xml +++ b/vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/pom.xml @@ -1,14 +1,14 @@ 4.0.0 - net.forwardfire.vasc.demo - vasc-demo-server - 0.4.1-SNAPSHOT + net.forwardfire.vasc.demo.build + vasc-demo-build + 0.4.2-SNAPSHOT - vasc-demo-server-build-client-swing + vasc-demo-build-client-swing pom - vasc-demo-server-build-client-swing - vasc-demo-server-build-client-swing + vasc-demo-build-client-swing + vasc-demo-build-client-swing @@ -35,7 +35,7 @@ net.forwardfire.vasc.demo - vasc-demo-tech-client-swing + vasc-demo-client-swing ${project.version} diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/src/main/assembly/bin.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/src/main/assembly/bin.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/src/main/assembly/bin.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/src/main/assembly/bin.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/src/main/scripts/client.bat b/vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/src/main/scripts/client.bat similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/src/main/scripts/client.bat rename to vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/src/main/scripts/client.bat diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/src/main/scripts/client.sh b/vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/src/main/scripts/client.sh similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build-client-swing/src/main/scripts/client.sh rename to vasc-demo/vasc-demo-build/vasc-demo-build-client-swing/src/main/scripts/client.sh diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/.project b/vasc-demo/vasc-demo-build/vasc-demo-build-server/.project similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/.project rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/.project diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/pom.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/pom.xml similarity index 88% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/pom.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/pom.xml index 97e6f72..d5ea06c 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-build/pom.xml +++ b/vasc-demo/vasc-demo-build/vasc-demo-build-server/pom.xml @@ -1,15 +1,15 @@ 4.0.0 - vasc-demo-server - net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT + vasc-demo-build + net.forwardfire.vasc.demo.build + 0.4.2-SNAPSHOT .. - vasc-demo-server-build + vasc-demo-build-server pom - vasc-demo-server-build - Vasc Demo Server Build + vasc-demo-build-server + Vasc Demo Build Server @@ -31,6 +31,7 @@ + net.forwardfire.vasc.demo - vasc-demo-server-core + vasc-demo-server ${project.version} @@ -92,8 +94,8 @@ ${project.version} - net.forwardfire.vasc.demo - vasc-demo-server-build-client-swing + net.forwardfire.vasc.demo.build + vasc-demo-build-client-swing ${project.version} pom diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/assembly/bin.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/assembly/bin.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/assembly/bin.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/assembly/bin.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/context.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/context.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/context.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/context.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/logback-access.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/logback-access.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/logback-access.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/logback-access.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/logback-server-console.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/logback-server-console.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/logback-server-console.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/logback-server-console.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/logback-server.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/logback-server.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/logback-server.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/logback-server.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/login.config b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/login.config similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/login.config rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/login.config diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/server.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/server.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/server.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/server.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/tomee.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/tomee.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/tomee.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/tomee.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/demo-csv.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/demo-csv.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/demo-csv.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/demo-csv.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/demo-pg.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/demo-pg.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/demo-pg.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/demo-pg.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/readme.txt b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/readme.txt similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/readme.txt rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/readme.txt diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/tech-admin.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/tech-admin.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/tech-admin.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/tech-admin.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/tech-server.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/tech-server.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/tech-server.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/vasc.d/tech-server.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/web.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/web.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/web.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/conf/web.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-people.csv b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-people.csv similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-people.csv rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-people.csv diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-project.csv b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-project.csv similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-project.csv rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-project.csv diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-todo.csv b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-todo.csv similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-todo.csv rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-todo.csv diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-tree.xml b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-tree.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/data/demo/meta-tree.xml rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/data/demo/meta-tree.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/logs/vasc-demo-tech.log b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/logs/vasc-demo-tech.log similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/logs/vasc-demo-tech.log rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/directory/logs/vasc-demo-tech.log diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/files/auto-readme.txt b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/files/auto-readme.txt similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/files/auto-readme.txt rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/files/auto-readme.txt diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/files/readme.txt b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/files/readme.txt similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/files/readme.txt rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/files/readme.txt diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/shutdown.bat b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/shutdown.bat similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/shutdown.bat rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/shutdown.bat diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/shutdown.sh b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/shutdown.sh similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/shutdown.sh rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/shutdown.sh diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/startup.bat b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/startup.bat similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/startup.bat rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/startup.bat diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/startup.sh b/vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/startup.sh similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/scripts/startup.sh rename to vasc-demo/vasc-demo-build/vasc-demo-build-server/src/main/scripts/startup.sh diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/.project b/vasc-demo/vasc-demo-client-swing/.project similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/.project rename to vasc-demo/vasc-demo-client-swing/.project diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/pom.xml b/vasc-demo/vasc-demo-client-swing/pom.xml similarity index 91% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/pom.xml rename to vasc-demo/vasc-demo-client-swing/pom.xml index 8f1f810..5faca41 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/pom.xml +++ b/vasc-demo/vasc-demo-client-swing/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - vasc-demo-tech + vasc-demo net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. - vasc-demo-tech-client-swing + vasc-demo-client-swing net.forwardfire.vasc @@ -40,7 +40,7 @@ net.forwardfire.vasc.demo - vasc-demo-tech-ejb3 + vasc-demo-tech-domain ${project.version} diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanel.java b/vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanel.java similarity index 98% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanel.java rename to vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanel.java index 9d6884b..f768549 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanel.java +++ b/vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanel.java @@ -50,9 +50,9 @@ import net.forwardfire.vasc.core.VascEntryConfigControllerLocal; import net.forwardfire.vasc.core.VascEntryControllerLocal; import net.forwardfire.vasc.core.VascEntryLocal; import net.forwardfire.vasc.core.VascException; -import net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuController; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenu; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuGroup; +import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuController; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenu; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuGroup; import net.forwardfire.vasc.ejb3.VascServiceManager; import net.forwardfire.vasc.ejb3.VascServiceRemoteBackend; import net.forwardfire.vasc.frontend.swing.SwingPanelIntegration; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanelMenuBar.java b/vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanelMenuBar.java similarity index 98% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanelMenuBar.java rename to vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanelMenuBar.java index ce8947a..349b46f 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanelMenuBar.java +++ b/vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/JMainPanelMenuBar.java @@ -31,7 +31,7 @@ import javax.swing.JMenuItem; import javax.swing.JTabbedPane; import net.forwardfire.vasc.core.VascException; -import net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuController; +import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuController; /** * JMainPanelMenuBar Adds all menu bar items. diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoSwingClient.java b/vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoSwingClient.java similarity index 98% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoSwingClient.java rename to vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoSwingClient.java index 0cf8bcf..8f63b3f 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoSwingClient.java +++ b/vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoSwingClient.java @@ -42,8 +42,8 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.UIManager; -import net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuController; -import net.forwardfire.vasc.demo.tech.ejb3.user.ClientUserController; +import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuController; +import net.forwardfire.vasc.demo.tech.domain.user.ClientUserController; import net.forwardfire.vasc.ejb3.VascServiceManager; import net.forwardfire.vasc.lib.i18n.bundle.RootApplicationBundle; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoUserLoginDialog.java b/vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoUserLoginDialog.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoUserLoginDialog.java rename to vasc-demo/vasc-demo-client-swing/src/main/java/net/forwardfire/vasc/demo/client/swing/VascDemoUserLoginDialog.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/resources/META-INF/root-bundle.properties b/vasc-demo/vasc-demo-client-swing/src/main/resources/META-INF/root-bundle.properties similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/resources/META-INF/root-bundle.properties rename to vasc-demo/vasc-demo-client-swing/src/main/resources/META-INF/root-bundle.properties diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/VascDemoSwingClient.properties b/vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/VascDemoSwingClient.properties similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/VascDemoSwingClient.properties rename to vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/VascDemoSwingClient.properties diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/net/forwardfire/vasc/demo/server/ui/resources/icon.png b/vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/icon.png similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/net/forwardfire/vasc/demo/server/ui/resources/icon.png rename to vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/icon.png diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/net/forwardfire/vasc/demo/server/ui/resources/laf-colors.properties b/vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/laf-colors.properties similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/net/forwardfire/vasc/demo/server/ui/resources/laf-colors.properties rename to vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/laf-colors.properties diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/logo.png b/vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/logo.png similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/logo.png rename to vasc-demo/vasc-demo-client-swing/src/main/resources/net/forwardfire/vasc/demo/client/swing/resources/logo.png diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/.project b/vasc-demo/vasc-demo-petstore-j2ee5/.project deleted file mode 100644 index 57bfae3..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - demo-petstore - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/pom.xml deleted file mode 100644 index 3f13a1e..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - - vasc-demo - net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT - - vasc-demo-petstore-j2ee5 - pom - vasc-demo-petstore-j2ee5 - vasc-demo-petstore-j2ee5 - - vasc-demo-petstore-j2ee5-ejb - vasc-demo-petstore-j2ee5-war - vasc-demo-petstore-j2ee5-ear - - \ No newline at end of file diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project deleted file mode 100644 index 82c2b99..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - demo-petstore-ear - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - - diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml deleted file mode 100644 index e5be158..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ear/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - vasc-demo-petstore-j2ee5 - net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT - - vasc-demo-petstore-j2ee5-ear - vasc-demo-petstore-j2ee5-ear - vasc-demo-petstore-j2ee5-ear - \ No newline at end of file diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project deleted file mode 100644 index 52ee197..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - demo-petstore-ejb - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml deleted file mode 100644 index 84bb69b..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - 4.0.0 - - vasc-demo-petstore-j2ee5 - net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT - - vasc-demo-petstore-j2ee5-ejb - ejb - vasc-demo-petstore-j2ee5-ejb - vasc-demo-petstore-j2ee5-ejb - - - - org.apache.maven.plugins - maven-ejb-plugin - ${maven-ejb-plugin.version} - - 3.0 - - - - - - - javax.el - el-api - ${el-api.version} - - - javax.ejb - ejb-api - ${ejb-api.version} - provided - - - javax.persistence - persistence-api - ${persistence-api.version} - provided - - - org.hibernate - hibernate-annotations - ${hibernate-annotations.version} - provided - - - org.x4o - x4o-core - ${x4o.version} - provided - - - net.forwardfire.vasc - vasc-core - ${project.version} - provided - - - net.forwardfire.vasc - vasc-backend-jpa - ${project.version} - provided - - - net.forwardfire.vasc - vasc-xpql - ${project.version} - - - net.forwardfire.vasc - vasc-xpql-ejb3-client - ${project.version} - - - net.forwardfire.vasc - vasc-core-ejb3-server - ${project.version} - - - \ No newline at end of file diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java deleted file mode 100644 index a507619..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreEntity.java +++ /dev/null @@ -1,5 +0,0 @@ -package demo.petstore.models; - -abstract public class AbstractPetStoreEntity { - -} diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 4e8d526..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - java:demo_petstore_dba - - demo.petstore.models.Category - demo.petstore.models.CategoryProduct - demo.petstore.models.Item - demo.petstore.models.ItemInventory - demo.petstore.models.ItemSupplier - demo.petstore.models.Order - demo.petstore.models.OrderLine - demo.petstore.models.OrderStatus - demo.petstore.models.UserAccount - demo.petstore.models.UserCredential - demo.petstore.models.UserProfile - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project deleted file mode 100644 index 29fbc66..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - demo-petstore-war - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - - diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml b/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml deleted file mode 100644 index e998b94..0000000 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-war/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - vasc-demo-petstore-j2ee5 - net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT - - vasc-demo-petstore-j2ee5-war - vasc-demo-petstore-j2ee5-war - vasc-demo-petstore-j2ee5-war - \ No newline at end of file diff --git a/vasc-demo/vasc-demo-server/.project b/vasc-demo/vasc-demo-server/.project index d39df79..8b1c93d 100644 --- a/vasc-demo/vasc-demo-server/.project +++ b/vasc-demo/vasc-demo-server/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.m2e.core.maven2Builder @@ -12,6 +17,7 @@ + org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature diff --git a/vasc-demo/vasc-demo-server/pom.xml b/vasc-demo/vasc-demo-server/pom.xml index c25c433..eb1ae7c 100644 --- a/vasc-demo/vasc-demo-server/pom.xml +++ b/vasc-demo/vasc-demo-server/pom.xml @@ -3,16 +3,303 @@ vasc-demo net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-demo-server - pom vasc-demo-server - Vasc Demo Server - - vasc-demo-server-build - vasc-demo-server-core - vasc-demo-server-build-client-swing - + vasc-demo-server + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + generate-version-class + generate-sources + + run + + + + + + package net.forwardfire.vasc.demo.server.core; + /** Automatically generated by ant. */ + public class VascTechDemoBuildInfoImpl implements VascTechDemoBuildInfo { + static public final String VERSION = "${project.version}"; + static public final String BUILD_DATE = "${maven.build.timestamp}"; + public String getVersion() { + return VERSION; + } + public String getBuildDate() { + return BUILD_DATE; + } + } + + + + ${project.build.directory}/generated-sources + + + + + + + + + + org.x4o + x4o-driver + ${x4o.version} + + + org.apache.tomcat + jasper-el + + + javax.el + el-api + + + + + net.forwardfire.vasc.demo + vasc-demo-tech-web + ${project.version} + jar + + + net.forwardfire.vasc.demo + vasc-demo-tech-domain + ${project.version} + jar + + + net.forwardfire.vasc + vasc-core + ${project.version} + + + net.forwardfire.vasc + vasc-frontend-swing + ${project.version} + + + net.forwardfire.vasc + vasc-frontend-web-jsf + ${project.version} + + + net.forwardfire.vasc + vasc-frontend-web-export + ${project.version} + + + net.forwardfire.vasc + vasc-frontend-cxf-server + ${project.version} + + + net.forwardfire.vasc + vasc-backend-ldap + ${project.version} + + + net.forwardfire.vasc + vasc-backend-mongodb + ${project.version} + + + net.forwardfire.vasc + vasc-backend-metamodel + ${project.version} + + + net.forwardfire.vasc + vasc-backend-jdbc + ${project.version} + + + net.forwardfire.vasc.export + vasc-export-jr4o + ${project.version} + + + net.forwardfire.vasc.export + vasc-export-json + ${project.version} + + + net.forwardfire.vasc.lib + vasc-lib-i18n + ${project.version} + + + net.forwardfire.vasc.lib + vasc-lib-editor + ${project.version} + + + net.forwardfire.vasc.test + vasc-test-i18n + ${project.version} + + + net.forwardfire.vasc + vasc-core-ejb3-server + ${project.version} + + + net.forwardfire.vasc.demo + vasc-demo-tech-web + ${project.version} + + + org.jdesktop.bsaf + bsaf + ${bsaf.version} + + + jnlp + javax.jnlp + + + + + commons-io + commons-io + ${commons-io.version} + + + net.jawr + jawr + ${jawr.version} + + + de.tudarmstadt.ukp.wikipedia + de.tudarmstadt.ukp.wikipedia.api + 0.9.1 + + + log4j + log4j + + + javassist + javassist + + + + + + org.apache.openejb + tomee-mojarra + ${tomee.version} + + + slf4j-jdk14 + org.slf4j + + + + + org.apache.openejb + tomee-embedded + ${tomee.version} + + + tomee-myfaces + org.apache.openejb + + + myfaces-api + org.apache.myfaces.core + + + myfaces-impl + org.apache.myfaces.core + + + + + + + javax.servlet + jstl + ${jstl.version} + + + org.glassfish + javax.faces + ${javax.faces.version} + + + + + org.richfaces.core + richfaces-core-impl + + + org.richfaces.ui + richfaces-components-ui + + + org.ocpsoft.rewrite + rewrite-servlet + ${rewrite-servlet.version} + + + + + com.h2database + h2 + ${h2.version} + + + postgresql + postgresql + ${postgresql.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + + + org.apache.derby + derby + ${derby.version} + + + org.xerial + sqlite-jdbc + 3.7.2 + + + + + ch.qos.logback + logback-access + ${logback-access.version} + + + ch.qos.logback + logback-classic + ${logback-classic.version} + + + org.slf4j + jul-to-slf4j + ${jul-to-slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${log4j-over-slf4j.version} + + + \ No newline at end of file diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoBuildInfo.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoBuildInfo.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoBuildInfo.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoBuildInfo.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoControllerConfig.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoControllerConfig.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoControllerConfig.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoControllerConfig.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoStartup.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoStartup.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoStartup.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoStartup.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/DatabaseService.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/DatabaseService.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/DatabaseService.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/DatabaseService.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerConfigService.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerConfigService.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerConfigService.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerConfigService.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerGuiService.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerGuiService.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerGuiService.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/ServerGuiService.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/VascControllerService.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/VascControllerService.java similarity index 96% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/VascControllerService.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/VascControllerService.java index bbdb951..a4c1e0e 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/core/service/VascControllerService.java +++ b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/service/VascControllerService.java @@ -36,6 +36,8 @@ import java.util.Properties; import java.util.ResourceBundle; import java.util.logging.Logger; +import org.x4o.xml.io.X4OReader; + import com.sun.faces.application.ApplicationAssociate; import com.sun.faces.application.ApplicationResourceBundle; @@ -49,7 +51,7 @@ import net.forwardfire.vasc.core.VascEventControllerListener; import net.forwardfire.vasc.core.VascEventControllerType; import net.forwardfire.vasc.demo.server.core.VascTechDemoStartup; import net.forwardfire.vasc.impl.DefaultVascFactory; -import net.forwardfire.vasc.impl.x4o.VascParser; +import net.forwardfire.vasc.impl.x4o.VascDriver; import net.forwardfire.vasc.lib.i18n.bundle.RootApplicationBundle; import net.forwardfire.vasc.test.i18n.VascBundleCheckEntryKeys; @@ -99,8 +101,11 @@ public class VascControllerService { public void startEditor() { try { vascController.getVascEventChannelController().fireEvent(VascEventControllerType.LOAD_ENTRIES_BEFORE, vascController); - VascParser parser = new VascParser(vascController); - parser.parseResource("net/forwardfire/vasc/lib/editor/vasc-edit.xml"); + + VascDriver driver = VascDriver.getInstance(); + X4OReader reader = driver.createReader(); + driver.addVascController(reader, vascController); + reader.readResource("net/forwardfire/vasc/lib/editor/vasc-edit.xml"); DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController); vascController.getVascEventChannelController().fireEvent(VascEventControllerType.LOAD_ENTRIES_AFTER, vascController); diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/AuthSessionTimeoutValve.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/AuthSessionTimeoutValve.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/AuthSessionTimeoutValve.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/AuthSessionTimeoutValve.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JdniTreePrinter.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JdniTreePrinter.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JdniTreePrinter.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JdniTreePrinter.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiDebugServlet.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiDebugServlet.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiDebugServlet.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiDebugServlet.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployer.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployer.java similarity index 96% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployer.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployer.java index 20f305d..aa2d120 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployer.java +++ b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployer.java @@ -39,10 +39,11 @@ import net.forwardfire.vasc.core.VascController; import net.forwardfire.vasc.core.VascEntryControllerLocal; import net.forwardfire.vasc.core.VascEventControllerType; import net.forwardfire.vasc.impl.DefaultVascFactory; -import net.forwardfire.vasc.impl.x4o.VascParser; +import net.forwardfire.vasc.impl.x4o.VascDriver; import org.apache.catalina.Server; import org.apache.naming.ContextBindings; +import org.x4o.xml.io.X4OReader; /** * VascDeployService parses "deploy/*.xml" automaticly for hotdeployments. @@ -145,12 +146,15 @@ public class JndiVascDeployer { public void parseVascFile(File file) { logger.info("Vasc open file: "+file.getAbsoluteFile()); try { - VascParser parser = new VascParser(vascController); + VascDriver driver = VascDriver.getInstance(); + X4OReader reader = driver.createReader(); + driver.addVascController(reader,vascController); + //File f = File.createTempFile("test-vasc", ".xml"); //parser.setDebugOutputStream(new FileOutputStream(f)); vascController.getVascEventChannelController().fireEvent(VascEventControllerType.LOAD_ENTRIES_BEFORE, vascController); - parser.parseFile(file); + reader.readFile(file); DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController); vascController.getVascEventChannelController().fireEvent(VascEventControllerType.LOAD_ENTRIES_AFTER, vascController); diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployerListener.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployerListener.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployerListener.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/JndiVascDeployerListener.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/MongoRealm.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/MongoRealm.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/MongoRealm.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/MongoRealm.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/TomcatService.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/TomcatService.java similarity index 96% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/TomcatService.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/TomcatService.java index fa10d06..f45b91f 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/tomcat/TomcatService.java +++ b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/tomcat/TomcatService.java @@ -105,7 +105,7 @@ public class TomcatService { String deployPath = null; if (VascTechDemoStartup.getInstance().isMavenRun()) { - String webappPathLocation = "../../vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/"; + String webappPathLocation = "../vasc-demo-tech-web/src/main/webapp/"; deployPath = new File(webappPathLocation).getAbsolutePath(); logger.info("Deploy demo app from workspace path: "+deployPath); } else { @@ -156,9 +156,9 @@ public class TomcatService { ContextConfig ctxCfg = new ContextConfig(); ctx.addLifecycleListener(ctxCfg); - VirtualDirContext vDir = new VirtualDirContext(); - vDir.setExtraResourcePaths("../../vasc-demo-tech/vasc-demo-tech-web/target/classes"); - ctx.setResources(vDir); + //VirtualDirContext vDir = new VirtualDirContext(); + //vDir.setExtraResourcePaths("../vasc-demo-tech-web/target/classes;"); + //ctx.setResources(vDir); host.addChild(ctx); diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/JConsolePanel.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/JConsolePanel.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/JConsolePanel.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/JConsolePanel.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/JFireBorder.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/JFireBorder.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/JFireBorder.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/JFireBorder.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/JStatusPanel.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/JStatusPanel.java similarity index 95% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/JStatusPanel.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/JStatusPanel.java index 211370c..9bc8111 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/JStatusPanel.java +++ b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/JStatusPanel.java @@ -30,12 +30,14 @@ import java.lang.management.ThreadMXBean; import javax.swing.JButton; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SpringLayout; import org.apache.catalina.Context; import org.apache.catalina.Server; import org.apache.catalina.Service; +import org.apache.catalina.connector.Connector; import net.forwardfire.vasc.core.VascController; import net.forwardfire.vasc.demo.server.core.VascTechDemoStartup; @@ -229,7 +231,11 @@ public class JStatusPanel extends JPanel implements ActionListener { @Override public void actionPerformed(ActionEvent e) { if (e.getSource().equals(shutdownButton)) { - VascTechDemoStartup.getInstance().shutdown(); + int confirmResult = JOptionPane.showConfirmDialog(ServerGuiApplication.getInstance().getMainFrame(), "Are you sure to exit ?"); + if (confirmResult==JOptionPane.YES_OPTION) { + VascTechDemoStartup.getInstance().shutdown(); + } + return; } else if (e.getSource().equals(importJdbcButton)) { JLoadDialog dialog = new JLoadDialog(ServerGuiApplication.getInstance().getMainFrame(),LoadType.JDBC); dialog.setVisible(true); @@ -265,8 +271,11 @@ public class JStatusPanel extends JPanel implements ActionListener { infoVascEntries.setText(""+vc.getVascEntryController().getVascEntryIds().size()); infoVascBackends.setText(""+vc.getVascBackendController().getVascBackendIds().size()); - int httpPort = service.findConnectors()[0].getPort(); - infoHttpPort.setText(""+httpPort); + Connector[] connectors = service.findConnectors(); + if (connectors.length>0) { + int httpPort = connectors[0].getPort(); + infoHttpPort.setText(""+httpPort); + } infoThreads.setText(""+Thread.activeCount()); int sessions = 0; @@ -282,7 +291,6 @@ public class JStatusPanel extends JPanel implements ActionListener { if (info.getThreadName()!=null && info.getThreadName().startsWith("http")) { workers++; } - } infoWorkers.setText(""+workers); diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/ServerGuiApplication.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/ServerGuiApplication.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/ServerGuiApplication.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/ServerGuiApplication.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/SpringLayoutGrid.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/SpringLayoutGrid.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/SpringLayoutGrid.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/SpringLayoutGrid.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadDialog.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadDialog.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadDialog.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadDialog.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaCsv.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaCsv.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaCsv.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaCsv.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaJdbc.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaJdbc.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaJdbc.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaJdbc.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaMongodb.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaMongodb.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaMongodb.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMetaMongodb.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMiscInfo.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMiscInfo.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMiscInfo.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepMiscInfo.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepSelectTables.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepSelectTables.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepSelectTables.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepSelectTables.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepWriteFile.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepWriteFile.java similarity index 97% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepWriteFile.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepWriteFile.java index 6527d31..c70cde7 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepWriteFile.java +++ b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepWriteFile.java @@ -38,7 +38,7 @@ import javax.swing.JTextArea; import javax.swing.ScrollPaneConstants; import javax.swing.SpringLayout; -import org.x4o.xml.sax.XMLWriter; +import org.x4o.xml.io.sax.ext.ContentWriterXml; import net.forwardfire.vasc.core.VascController; import net.forwardfire.vasc.demo.server.core.VascTechDemoStartup; @@ -87,7 +87,7 @@ public class JLoadStepWriteFile extends JPanel implements LoadStep,ActionListene try { VascController vc = VascTechDemoStartup.getInstance().getVascControllerService().getVascController(); StringWriter out = new StringWriter(); - XMLWriter outXml = new XMLWriter(out); + ContentWriterXml outXml = new ContentWriterXml(out); LoadVascXmlWriter writer = new LoadVascXmlWriter(outXml,vc); writer.writeXml(model); diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStep.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStep.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStep.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStep.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStepData.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStepData.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStepData.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadStepData.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadVascXmlWriter.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadVascXmlWriter.java similarity index 98% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadVascXmlWriter.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadVascXmlWriter.java index 0e80e39..0d6935e 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadVascXmlWriter.java +++ b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadVascXmlWriter.java @@ -34,6 +34,7 @@ import net.forwardfire.vasc.core.VascEntryLink; import net.forwardfire.vasc.core.VascEntryLinkType; import net.forwardfire.vasc.impl.ui.VascSelectItemModelEntry; +import org.x4o.xml.io.sax.ext.ContentWriterXml; import org.xml.sax.SAXException; import org.xml.sax.ext.DefaultHandler2; import org.xml.sax.helpers.AttributesImpl; @@ -48,14 +49,14 @@ import org.xml.sax.helpers.AttributesImpl; public class LoadVascXmlWriter { private VascController vc = null; - private DefaultHandler2 xmlWriter = null; + private ContentWriterXml xmlWriter = null; static private final String URI_VASC_ROOT = "http://vasc.forwardfire.net/xml/ns/vasc-root"; static private final String URI_VASC_LANG = "http://vasc.forwardfire.net/xml/ns/vasc-lang"; static private final String URI_META_MODEL = "http://vasc.forwardfire.net/xml/ns/vasc-backend-metamodel"; static private final String URI_VASC_DEMO = "http://vasc.forwardfire.net/xml/ns/vasc-tech-demo"; - public LoadVascXmlWriter(DefaultHandler2 xmlWriter,VascController vc) { + public LoadVascXmlWriter(ContentWriterXml xmlWriter,VascController vc) { this.xmlWriter=xmlWriter; this.vc=vc; } diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/x4o/TomcatResourceElement.java b/vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/x4o/TomcatResourceElement.java similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/x4o/TomcatResourceElement.java rename to vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/x4o/TomcatResourceElement.java diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/META-INF/root-bundle.properties b/vasc-demo/vasc-demo-server/src/main/resources/META-INF/root-bundle.properties similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/META-INF/root-bundle.properties rename to vasc-demo/vasc-demo-server/src/main/resources/META-INF/root-bundle.properties diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/META-INF/vasc/vasc-modules.xml b/vasc-demo/vasc-demo-server/src/main/resources/META-INF/vasc/vasc-modules.xml similarity index 100% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/META-INF/vasc/vasc-modules.xml rename to vasc-demo/vasc-demo-server/src/main/resources/META-INF/vasc/vasc-modules.xml diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/META-INF/vasc/vasc-tech-demo.eld b/vasc-demo/vasc-demo-server/src/main/resources/META-INF/vasc/vasc-tech-demo.eld similarity index 89% rename from vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/META-INF/vasc/vasc-tech-demo.eld rename to vasc-demo/vasc-demo-server/src/main/resources/META-INF/vasc/vasc-tech-demo.eld index a589a27..aecfcfc 100644 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/META-INF/vasc/vasc-tech-demo.eld +++ b/vasc-demo/vasc-demo-server/src/main/resources/META-INF/vasc/vasc-tech-demo.eld @@ -4,8 +4,8 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="vasc.forwardfire.net" - name="Vasc Tomcat Resource binding" + providerHost="vasc.forwardfire.net" + providerName="Vasc Tomcat Resource binding" id="vasc-tech-demo" > - - vasc-demo-server-core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/vasc-demo/vasc-demo-server/vasc-demo-server-core/pom.xml b/vasc-demo/vasc-demo-server/vasc-demo-server-core/pom.xml deleted file mode 100644 index 2f2c6c6..0000000 --- a/vasc-demo/vasc-demo-server/vasc-demo-server-core/pom.xml +++ /dev/null @@ -1,304 +0,0 @@ - - 4.0.0 - - vasc-demo-server - net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT - .. - - vasc-demo-server-core - vasc-demo-server-core - vasc-server-tech-core - - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven-antrun-plugin.version} - - - generate-version-class - generate-sources - - run - - - - - - package net.forwardfire.vasc.demo.server.core; - /** Automatically generated by ant. */ - public class VascTechDemoBuildInfoImpl implements VascTechDemoBuildInfo { - static public final String VERSION = "${project.version}"; - static public final String BUILD_DATE = "${maven.build.timestamp}"; - public String getVersion() { - return VERSION; - } - public String getBuildDate() { - return BUILD_DATE; - } - } - - - - ${project.build.directory}/generated-sources - - - - - - - - - - org.x4o - x4o-core - ${x4o.version} - - - org.apache.tomcat - jasper-el - - - javax.el - el-api - - - - - net.forwardfire.vasc.demo - vasc-demo-tech-web - ${project.version} - jar - - - net.forwardfire.vasc - vasc-core - ${project.version} - - - net.forwardfire.vasc - vasc-frontend-swing - ${project.version} - - - net.forwardfire.vasc - vasc-frontend-web-jsf - ${project.version} - - - net.forwardfire.vasc - vasc-frontend-web-export - ${project.version} - - - net.forwardfire.vasc - vasc-frontend-cxf-server - ${project.version} - - - net.forwardfire.vasc - vasc-backend-ldap - ${project.version} - - - net.forwardfire.vasc - vasc-backend-mongodb - ${project.version} - - - net.forwardfire.vasc - vasc-backend-metamodel - ${project.version} - - - net.forwardfire.vasc - vasc-backend-jdbc - ${project.version} - - - net.forwardfire.vasc.export - vasc-export-jr4o - ${project.version} - - - net.forwardfire.vasc.export - vasc-export-json - ${project.version} - - - net.forwardfire.vasc.lib - vasc-lib-i18n - ${project.version} - - - net.forwardfire.vasc.lib - vasc-lib-editor - ${project.version} - - - net.forwardfire.vasc.test - vasc-test-i18n - ${project.version} - - - net.forwardfire.vasc - vasc-xpql-ejb3-server - ${project.version} - - - net.forwardfire.vasc - vasc-core-ejb3-server - ${project.version} - - - net.forwardfire.vasc.demo - vasc-demo-tech-ejb3 - ${project.version} - - - org.jdesktop.bsaf - bsaf - ${bsaf.version} - - - jnlp - javax.jnlp - - - - - commons-io - commons-io - ${commons-io.version} - - - net.jawr - jawr - ${jawr.version} - - - de.tudarmstadt.ukp.wikipedia - de.tudarmstadt.ukp.wikipedia.api - 0.9.1 - - - log4j - log4j - - - javassist - javassist - - - - - - org.apache.openejb - tomee-mojarra - ${tomee.version} - - - slf4j-jdk14 - org.slf4j - - - - - org.apache.openejb - tomee-embedded - ${tomee.version} - - - tomee-myfaces - org.apache.openejb - - - myfaces-api - org.apache.myfaces.core - - - myfaces-impl - org.apache.myfaces.core - - - - - - - javax.servlet - jstl - ${jstl.version} - - - org.glassfish - javax.faces - ${javax.faces.version} - - - - - org.richfaces.core - richfaces-core-impl - - - org.richfaces.ui - richfaces-components-ui - - - org.ocpsoft.rewrite - rewrite-servlet - ${rewrite-servlet.version} - - - - - com.h2database - h2 - ${h2.version} - - - postgresql - postgresql - ${postgresql.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - - - org.apache.derby - derby - ${derby.version} - - - org.xerial - sqlite-jdbc - 3.7.2 - - - - - ch.qos.logback - logback-access - ${logback-access.version} - - - ch.qos.logback - logback-classic - ${logback-classic.version} - - - org.slf4j - jul-to-slf4j - ${jul-to-slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${log4j-over-slf4j.version} - - - - \ No newline at end of file diff --git a/vasc-xpql-ejb3-client/.project b/vasc-demo/vasc-demo-tech-domain/.project similarity index 93% rename from vasc-xpql-ejb3-client/.project rename to vasc-demo/vasc-demo-tech-domain/.project index a7cf84a..088691d 100644 --- a/vasc-xpql-ejb3-client/.project +++ b/vasc-demo/vasc-demo-tech-domain/.project @@ -1,6 +1,6 @@ - vasc-xpql-ejb3-client + vasc-demo-tech-remote diff --git a/vasc-demo/vasc-demo-tech-domain/pom.xml b/vasc-demo/vasc-demo-tech-domain/pom.xml new file mode 100644 index 0000000..a2352a2 --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + + net.forwardfire.vasc.demo + vasc-demo + 0.4.2-SNAPSHOT + + vasc-demo-tech-domain + vasc-demo-tech-domain + vasc-demo-tech-domain + + + javax + javaee-api + ${javaee-api.version} + provided + + + net.forwardfire.vasc + vasc-core + ${project.version} + provided + + + \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuController.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuController.java new file mode 100644 index 0000000..30bd4df --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuController.java @@ -0,0 +1,17 @@ +package net.forwardfire.vasc.demo.tech.domain.menu; + +import java.util.List; + +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenu; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuGroup; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuWeb; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuWebType; + +public interface VascMenuController { + + List getFilteredMenuWeb(VascMenuWebType type); + + List getFilteredMenuGroup(); + + List getFilteredMenu(String groupId); +} diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerLocal.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuControllerLocal.java similarity index 67% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerLocal.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuControllerLocal.java index a676bae..446876e 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerLocal.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuControllerLocal.java @@ -1,4 +1,4 @@ -package net.forwardfire.vasc.demo.tech.ejb3.menu; +package net.forwardfire.vasc.demo.tech.domain.menu; import javax.ejb.Local; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerRemote.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuControllerRemote.java similarity index 67% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerRemote.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuControllerRemote.java index cba5607..814d6cb 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerRemote.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/VascMenuControllerRemote.java @@ -1,4 +1,4 @@ -package net.forwardfire.vasc.demo.tech.ejb3.menu; +package net.forwardfire.vasc.demo.tech.domain.menu; import javax.ejb.Remote; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenu.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenu.java similarity index 97% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenu.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenu.java index 3c0037b..f9334e4 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenu.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenu.java @@ -20,7 +20,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.demo.tech.ejb3.menu.model; +package net.forwardfire.vasc.demo.tech.domain.menu.model; import java.io.Serializable; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuGroup.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuGroup.java similarity index 97% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuGroup.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuGroup.java index ab4e494..5750678 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuGroup.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuGroup.java @@ -20,7 +20,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.demo.tech.ejb3.menu.model; +package net.forwardfire.vasc.demo.tech.domain.menu.model; import java.io.Serializable; import java.util.List; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWeb.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWeb.java similarity index 98% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWeb.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWeb.java index fc94501..ad56ab5 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWeb.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWeb.java @@ -20,7 +20,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.demo.tech.ejb3.menu.model; +package net.forwardfire.vasc.demo.tech.domain.menu.model; import java.io.Serializable; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWebComparator.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWebComparator.java similarity index 96% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWebComparator.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWebComparator.java index 27ed974..9746d39 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWebComparator.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWebComparator.java @@ -20,7 +20,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.demo.tech.ejb3.menu.model; +package net.forwardfire.vasc.demo.tech.domain.menu.model; import java.io.Serializable; import java.util.Comparator; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWebType.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWebType.java similarity index 96% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWebType.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWebType.java index 31dd3a2..b92c203 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/model/VascMenuWebType.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/VascMenuWebType.java @@ -20,7 +20,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.demo.tech.ejb3.menu.model; +package net.forwardfire.vasc.demo.tech.domain.menu.model; /** * VascMenuType defines all menu lists on page. diff --git a/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/package-info.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/package-info.java new file mode 100644 index 0000000..c83ec65 --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/model/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author willemc + * + */ +package net.forwardfire.vasc.demo.tech.domain.menu.model; \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/package-info.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/package-info.java new file mode 100644 index 0000000..53de9db --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/menu/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author willemc + * + */ +package net.forwardfire.vasc.demo.tech.domain.menu; \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/AbstractPetStoreEntity.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/AbstractPetStoreEntity.java new file mode 100644 index 0000000..a6a6f89 --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/AbstractPetStoreEntity.java @@ -0,0 +1,5 @@ +package net.forwardfire.vasc.demo.tech.domain.petstore.model; + +abstract public class AbstractPetStoreEntity { + +} diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/AbstractPetStoreFieldTemplates.java similarity index 97% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/AbstractPetStoreFieldTemplates.java index 14ea717..0eef643 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/AbstractPetStoreFieldTemplates.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import java.util.Date; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Category.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Category.java similarity index 90% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Category.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Category.java index 9c58b9c..771ba6c 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Category.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Category.java @@ -1,13 +1,15 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.Table; import net.forwardfire.vasc.annotations.VascField; import net.forwardfire.vasc.annotations.VascFieldTemplate; @Entity +@Table(name="category",schema="petstore") public class Category extends AbstractPetStoreEntity{ private Integer id = null; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/CategoryProduct.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/CategoryProduct.java similarity index 96% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/CategoryProduct.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/CategoryProduct.java index af3d887..0adff2b 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/CategoryProduct.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/CategoryProduct.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Item.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Item.java similarity index 97% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Item.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Item.java index 57c30ec..03efb54 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Item.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Item.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemInventory.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/ItemInventory.java similarity index 94% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemInventory.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/ItemInventory.java index b7cccc1..6c0da79 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemInventory.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/ItemInventory.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemSupplier.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/ItemSupplier.java similarity index 95% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemSupplier.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/ItemSupplier.java index ecf7ce0..ab0da4f 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/ItemSupplier.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/ItemSupplier.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Order.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Order.java similarity index 98% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Order.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Order.java index bbcae95..2462815 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/Order.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/Order.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import java.util.Date; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderLine.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/OrderLine.java similarity index 96% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderLine.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/OrderLine.java index 66cbf79..2e122e4 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderLine.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/OrderLine.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderStatus.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/OrderStatus.java similarity index 96% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderStatus.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/OrderStatus.java index 7669a4f..93ecbfa 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/OrderStatus.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/OrderStatus.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserAccount.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserAccount.java similarity index 97% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserAccount.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserAccount.java index 6b00c38..1834683 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserAccount.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserAccount.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserCredential.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserCredential.java similarity index 97% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserCredential.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserCredential.java index 6b3497f..49b185d 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserCredential.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserCredential.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserProfile.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserProfile.java similarity index 97% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserProfile.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserProfile.java index 8b3676f..14f6240 100644 --- a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/java/demo/petstore/models/UserProfile.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/UserProfile.java @@ -1,4 +1,4 @@ -package demo.petstore.models; +package net.forwardfire.vasc.demo.tech.domain.petstore.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/package-info.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/package-info.java new file mode 100644 index 0000000..803183a --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/petstore/model/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author willemc + * + */ +package net.forwardfire.vasc.demo.tech.domain.petstore.model; \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserController.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserController.java similarity index 87% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserController.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserController.java index f472cd1..e12b157 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserController.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserController.java @@ -1,4 +1,4 @@ -package net.forwardfire.vasc.demo.tech.ejb3.user; +package net.forwardfire.vasc.demo.tech.domain.user; import java.util.List; import java.util.Locale; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerLocal.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserControllerLocal.java similarity index 68% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerLocal.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserControllerLocal.java index 0718fe7..735c4eb 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerLocal.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserControllerLocal.java @@ -1,4 +1,4 @@ -package net.forwardfire.vasc.demo.tech.ejb3.user; +package net.forwardfire.vasc.demo.tech.domain.user; import javax.ejb.Local; diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerRemote.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserControllerRemote.java similarity index 68% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerRemote.java rename to vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserControllerRemote.java index 27a5e35..6ae212c 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerRemote.java +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/ClientUserControllerRemote.java @@ -1,4 +1,4 @@ -package net.forwardfire.vasc.demo.tech.ejb3.user; +package net.forwardfire.vasc.demo.tech.domain.user; import javax.ejb.Remote; diff --git a/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/package-info.java b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/package-info.java new file mode 100644 index 0000000..79c8fe5 --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/src/main/java/net/forwardfire/vasc/demo/tech/domain/user/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author willemc + * + */ +package net.forwardfire.vasc.demo.tech.domain.user; \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech-domain/src/main/resources/META-INF/persistence.xml b/vasc-demo/vasc-demo-tech-domain/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000..8ca06b3 --- /dev/null +++ b/vasc-demo/vasc-demo-tech-domain/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,31 @@ + + + + java:demo_petstore_dba + + net.forwardfire.vasc.demo.tech.domain.petstore.model.Category + net.forwardfire.vasc.demo.tech.domain.petstore.model.CategoryProduct + net.forwardfire.vasc.demo.tech.domain.petstore.model.Item + net.forwardfire.vasc.demo.tech.domain.petstore.model.ItemInventory + net.forwardfire.vasc.demo.tech.domain.petstore.model.ItemSupplier + net.forwardfire.vasc.demo.tech.domain.petstore.model.Order + net.forwardfire.vasc.demo.tech.domain.petstore.model.OrderLine + net.forwardfire.vasc.demo.tech.domain.petstore.model.OrderStatus + net.forwardfire.vasc.demo.tech.domain.petstore.model.UserAccount + net.forwardfire.vasc.demo.tech.domain.petstore.model.UserCredential + net.forwardfire.vasc.demo.tech.domain.petstore.model.UserProfile + + + + + + + + + + + + \ No newline at end of file diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/vasc-ejb3.xml b/vasc-demo/vasc-demo-tech-domain/src/main/resources/META-INF/vasc-ejb3.xml similarity index 100% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/vasc-ejb3.xml rename to vasc-demo/vasc-demo-tech-domain/src/main/resources/META-INF/vasc-ejb3.xml diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/xtes-xpql-ejb3.xml b/vasc-demo/vasc-demo-tech-domain/src/main/resources/META-INF/xtes-xpql-ejb3.xml similarity index 100% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/META-INF/xtes-xpql-ejb3.xml rename to vasc-demo/vasc-demo-tech-domain/src/main/resources/META-INF/xtes-xpql-ejb3.xml diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/vasc/petstore.xml b/vasc-demo/vasc-demo-tech-domain/src/main/resources/demo/petstore/resources/vasc/petstore.xml similarity index 100% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/vasc/petstore.xml rename to vasc-demo/vasc-demo-tech-domain/src/main/resources/demo/petstore/resources/vasc/petstore.xml diff --git a/vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/xpql/petstore.xml b/vasc-demo/vasc-demo-tech-domain/src/main/resources/demo/petstore/resources/xpql/petstore.xml similarity index 100% rename from vasc-demo/vasc-demo-petstore-j2ee5/vasc-demo-petstore-j2ee5-ejb/src/main/resources/demo/petstore/resources/xpql/petstore.xml rename to vasc-demo/vasc-demo-tech-domain/src/main/resources/demo/petstore/resources/xpql/petstore.xml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.project b/vasc-demo/vasc-demo-tech-web/.project similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/.project rename to vasc-demo/vasc-demo-tech-web/.project diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/pom.xml b/vasc-demo/vasc-demo-tech-web/pom.xml similarity index 70% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/pom.xml rename to vasc-demo/vasc-demo-tech-web/pom.xml index 2c8edbd..7928a14 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/pom.xml +++ b/vasc-demo/vasc-demo-tech-web/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - vasc-demo-tech + vasc-demo net.forwardfire.vasc.demo - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-demo-tech-web @@ -35,7 +35,7 @@ net.forwardfire.vasc.demo - vasc-demo-tech-ejb3 + vasc-demo-tech-domain ${project.version} provided @@ -68,5 +68,31 @@ ${rewrite-servlet.version} provided + + + + net.forwardfire.vasc + vasc-core + ${project.version} + provided + + + net.forwardfire.vasc + vasc-core-ejb3-client + ${project.version} + provided + + + javax + javaee-api + ${javaee-api.version} + provided + + + net.forwardfire.vasc.lib + vasc-lib-i18n + ${project.version} + provided + \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerImpl.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/ClientUserControllerImpl.java similarity index 93% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerImpl.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/ClientUserControllerImpl.java index 306cadb..e5def0c 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/user/ClientUserControllerImpl.java +++ b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/ClientUserControllerImpl.java @@ -1,4 +1,4 @@ -package net.forwardfire.vasc.demo.tech.ejb3.user; +package net.forwardfire.vasc.demo.tech.ejb3; import java.util.List; import java.util.Locale; @@ -10,6 +10,8 @@ import javax.annotation.security.RolesAllowed; import javax.ejb.SessionContext; import javax.ejb.Stateless; +import net.forwardfire.vasc.demo.tech.domain.user.ClientUserControllerLocal; +import net.forwardfire.vasc.demo.tech.domain.user.ClientUserControllerRemote; import net.forwardfire.vasc.lib.i18n.bundle.RootApplicationBundle; @Stateless(name="clientUserController") diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerImpl.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/VascMenuControllerImpl.java similarity index 92% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerImpl.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/VascMenuControllerImpl.java index 4405595..73c362e 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuControllerImpl.java +++ b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/VascMenuControllerImpl.java @@ -20,7 +20,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.demo.tech.ejb3.menu; +package net.forwardfire.vasc.demo.tech.ejb3; import java.sql.Connection; import java.sql.ResultSet; @@ -41,11 +41,13 @@ import net.forwardfire.vasc.core.VascController; import net.forwardfire.vasc.core.VascEntry; import net.forwardfire.vasc.core.VascEntryAccessType; import net.forwardfire.vasc.core.VascEntryGroup; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenu; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWebComparator; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuGroup; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWeb; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWebType; +import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuControllerLocal; +import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuControllerRemote; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenu; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuGroup; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuWeb; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuWebComparator; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuWebType; /** * MenuController Shows the menu for the user. diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ContextPathController.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ContextPathController.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ContextPathController.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ContextPathController.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ExportController.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ExportController.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ExportController.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/ExportController.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/I18nController.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/I18nController.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/I18nController.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/I18nController.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/MenuController.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/MenuController.java similarity index 93% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/MenuController.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/MenuController.java index c8afc0e..70a6eb8 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/MenuController.java +++ b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/MenuController.java @@ -28,10 +28,10 @@ import java.util.List; import javax.naming.InitialContext; import javax.naming.NamingException; -import net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuController; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuGroup; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWeb; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWebType; +import net.forwardfire.vasc.demo.tech.domain.menu.VascMenuController; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuGroup; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuWeb; +import net.forwardfire.vasc.demo.tech.domain.menu.model.VascMenuWebType; /** * MenuController Shows the menu for the user. diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/UserController.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/UserController.java similarity index 98% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/UserController.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/UserController.java index 89c19cb..aba4371 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/UserController.java +++ b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/beans/UserController.java @@ -32,7 +32,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.servlet.http.HttpSession; -import net.forwardfire.vasc.demo.tech.ejb3.user.ClientUserController; +import net.forwardfire.vasc.demo.tech.domain.user.ClientUserController; import net.forwardfire.vasc.demo.tech.web.models.WebUser; /** diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/NoneLoadStyleResourceEventListener.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/NoneLoadStyleResourceEventListener.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/NoneLoadStyleResourceEventListener.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/NoneLoadStyleResourceEventListener.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/UrlRewriteConfigurationProvider.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/UrlRewriteConfigurationProvider.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/UrlRewriteConfigurationProvider.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/faces/UrlRewriteConfigurationProvider.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/models/WebUser.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/models/WebUser.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/models/WebUser.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/models/WebUser.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageController.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageController.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageController.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageController.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageFilter.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageFilter.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageFilter.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/VascPageFilter.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPage.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPage.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPage.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPage.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePart.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePart.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePart.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePart.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePartType.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePartType.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePartType.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/pages/model/VascPagePartType.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/servlets/TestServlet.java b/vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/servlets/TestServlet.java similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/servlets/TestServlet.java rename to vasc-demo/vasc-demo-tech-web/src/main/java/net/forwardfire/vasc/demo/tech/web/servlets/TestServlet.java diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/resources/META-INF/ejb-jar.xml b/vasc-demo/vasc-demo-tech-web/src/main/resources/META-INF/ejb-jar.xml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/resources/META-INF/ejb-jar.xml rename to vasc-demo/vasc-demo-tech-web/src/main/resources/META-INF/ejb-jar.xml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/resources/META-INF/vasc-ejb3.xml b/vasc-demo/vasc-demo-tech-web/src/main/resources/META-INF/vasc-ejb3.xml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/resources/META-INF/vasc-ejb3.xml rename to vasc-demo/vasc-demo-tech-web/src/main/resources/META-INF/vasc-ejb3.xml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/META-INF/jawr.properties b/vasc-demo/vasc-demo-tech-web/src/main/webapp/META-INF/jawr.properties similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/META-INF/jawr.properties rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/META-INF/jawr.properties diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider b/vasc-demo/vasc-demo-tech-web/src/main/webapp/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/META-INF/services/org.ocpsoft.rewrite.config.ConfigurationProvider diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/ejb-jar.xml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/ejb-jar.xml similarity index 63% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/ejb-jar.xml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/ejb-jar.xml index 924e08b..2a7d6e4 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/ejb-jar.xml +++ b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/ejb-jar.xml @@ -13,17 +13,17 @@ clientUserController - net.forwardfire.vasc.demo.tech.ejb3.user.ClientUserControllerLocal - net.forwardfire.vasc.demo.tech.ejb3.user.ClientUserControllerRemote - net.forwardfire.vasc.demo.tech.ejb3.user.ClientUserControllerImpl + net.forwardfire.vasc.demo.tech.domain.user.ClientUserControllerLocal + net.forwardfire.vasc.demo.tech.domain.user.ClientUserControllerRemote + net.forwardfire.vasc.demo.tech.ejb3.ClientUserControllerImpl Stateless Container vascMenuController - net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuControllerLocal - net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuControllerRemote - net.forwardfire.vasc.demo.tech.ejb3.menu.VascMenuControllerImpl + net.forwardfire.vasc.demo.tech.domain.menu.VascMenuControllerLocal + net.forwardfire.vasc.demo.tech.domain.menu.VascMenuControllerRemote + net.forwardfire.vasc.demo.tech.ejb3.VascMenuControllerImpl Stateless Container diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/faces-config.xml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/faces-config.xml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/faces-config.xml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/faces-config.xml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-error.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-error.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-error.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-error.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-no-js.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-no-js.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-no-js.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-no-js.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-public.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-public.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-public.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-public.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-user.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-user.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-user.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-user.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-vasc.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-vasc.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-vasc.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-vasc.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-wiki.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-wiki.xhtml similarity index 97% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-wiki.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-wiki.xhtml index 422f2a5..bf211cc 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-wiki.xhtml +++ b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/page-wiki.xhtml @@ -13,7 +13,9 @@

+

diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-decorator.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-decorator.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-decorator.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-decorator.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-footer.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-footer.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-footer.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-footer.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-header.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-header.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-header.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-header.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-login.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-login.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-login.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-login.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-menu.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-menu.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-menu.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body-menu.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-body.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-head.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-head.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-head.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main-head.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/template/structure/main.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/web.xml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/WEB-INF/web.xml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/WEB-INF/web.xml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/html.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/html.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/html.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/html.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/layout.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/layout.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/layout.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/layout.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/richfaces.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/richfaces.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/richfaces.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/richfaces.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/style.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/style.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/style.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/style.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/theme.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/theme.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/theme.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/theme.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/vasc-jsf.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/vasc-jsf.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/default/vasc-jsf.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/default/vasc-jsf.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/green/theme.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/green/theme.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/green/theme.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/green/theme.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/notheme/theme.css b/vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/notheme/theme.css similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/css/skins/notheme/theme.css rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/css/skins/notheme/theme.css diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/admin/debug-style.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/admin/debug-style.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/admin/debug-style.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/admin/debug-style.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/admin/debug.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/admin/debug.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/admin/debug.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/admin/debug.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/admin/index.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/admin/index.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/admin/index.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/admin/index.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/error.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/error.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/error.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/error.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/forgot.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/forgot.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/forgot.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/forgot.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/login.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/login.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/login.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/login.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/logout.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/logout.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/auth/logout.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/auth/logout.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/error/status/400-bad-request.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/error/status/400-bad-request.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/error/status/400-bad-request.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/error/status/400-bad-request.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/error/status/404-not-found.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/error/status/404-not-found.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/error/status/404-not-found.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/error/status/404-not-found.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/error/view-expired.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/error/view-expired.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/error/view-expired.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/error/view-expired.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/index.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/index.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/index.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/index.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/user/index.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/user/index.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/user/index.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/user/index.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/user/profile.xhtml b/vasc-demo/vasc-demo-tech-web/src/main/webapp/html/user/profile.xhtml similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/html/user/profile.xhtml rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/html/user/profile.xhtml diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/favicon.ico b/vasc-demo/vasc-demo-tech-web/src/main/webapp/img/favicon.ico similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/favicon.ico rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/img/favicon.ico diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/icon_download.png b/vasc-demo/vasc-demo-tech-web/src/main/webapp/img/icon_download.png similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/icon_download.png rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/img/icon_download.png diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/icon_print.png b/vasc-demo/vasc-demo-tech-web/src/main/webapp/img/icon_print.png similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/icon_print.png rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/img/icon_print.png diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/logo.png b/vasc-demo/vasc-demo-tech-web/src/main/webapp/img/logo.png similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/logo.png rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/img/logo.png diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-bg.jpg b/vasc-demo/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-bg.jpg similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-bg.jpg rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-bg.jpg diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-view-bg.png b/vasc-demo/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-view-bg.png similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-view-bg.png rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/img/skin/default/body-view-bg.png diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/js/vasc-jsf.js b/vasc-demo/vasc-demo-tech-web/src/main/webapp/js/vasc-jsf.js similarity index 100% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-web/src/main/webapp/js/vasc-jsf.js rename to vasc-demo/vasc-demo-tech-web/src/main/webapp/js/vasc-jsf.js diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/pom.xml b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/pom.xml deleted file mode 100644 index c37ace3..0000000 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - - net.forwardfire.vasc.demo - vasc-demo-tech - 0.4.1-SNAPSHOT - - vasc-demo-tech-ejb3 - vasc-demo-tech-ejb3 - vasc-demo-tech-ejb3 - - - net.forwardfire.vasc - vasc-core - ${project.version} - provided - - - net.forwardfire.vasc - vasc-core-ejb3-client - ${project.version} - provided - - - javax - javaee-api - ${javaee-api.version} - provided - - - net.forwardfire.vasc.lib - vasc-lib-i18n - ${project.version} - provided - - - \ No newline at end of file diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuController.java b/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuController.java deleted file mode 100644 index 78f375e..0000000 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/src/main/java/net/forwardfire/vasc/demo/tech/ejb3/menu/VascMenuController.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.forwardfire.vasc.demo.tech.ejb3.menu; - -import java.util.List; - -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenu; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuGroup; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWeb; -import net.forwardfire.vasc.demo.tech.ejb3.menu.model.VascMenuWebType; - -public interface VascMenuController { - - List getFilteredMenuWeb(VascMenuWebType type); - - List getFilteredMenuGroup(); - - List getFilteredMenu(String groupId); -} diff --git a/vasc-export/pom.xml b/vasc-export/pom.xml index b0e01c5..8362d45 100644 --- a/vasc-export/pom.xml +++ b/vasc-export/pom.xml @@ -3,7 +3,7 @@ net.forwardfire.vasc vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-export net.forwardfire.vasc.export diff --git a/vasc-export/vasc-export-generic/pom.xml b/vasc-export/vasc-export-generic/pom.xml index b869215..a6e84c4 100644 --- a/vasc-export/vasc-export-generic/pom.xml +++ b/vasc-export/vasc-export-generic/pom.xml @@ -3,7 +3,7 @@ net.forwardfire.vasc.export vasc-export - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-export-generic vasc-export-generic diff --git a/vasc-export/vasc-export-jr4o/pom.xml b/vasc-export/vasc-export-jr4o/pom.xml index 006dbf5..7e83dd4 100644 --- a/vasc-export/vasc-export-jr4o/pom.xml +++ b/vasc-export/vasc-export-jr4o/pom.xml @@ -3,7 +3,7 @@ net.forwardfire.vasc.export vasc-export - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-export-jr4o vasc-export-jr4o diff --git a/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/VascEntryExportWriterJR4O.java b/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/VascEntryExportWriterJR4O.java index 8408b7e..eac5423 100644 --- a/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/VascEntryExportWriterJR4O.java +++ b/vasc-export/vasc-export-jr4o/src/main/java/net/forwardfire/vasc/export/jr4o/VascEntryExportWriterJR4O.java @@ -43,7 +43,6 @@ import net.forwardfire.vasc.lib.jr4o.JR4ODesignManager.JRExportType; public class VascEntryExportWriterJR4O implements VascEntryExportWriter { private static final long serialVersionUID = -3951608685719832654L; - static public final String EXPORT_TYPE = "pdf"; private VascEntry entry = null; private JRExportType reportType = JRExportType.PDF; private String reportResource = null; @@ -107,13 +106,13 @@ public class VascEntryExportWriterJR4O implements VascEntryExportWriter { * @see net.forwardfire.vasc.core.entry.VascEntryExport#getMineType() */ public String getMineType() { - return "text/pdf"; + return reportType.getMineType(); } /** * @see net.forwardfire.vasc.core.entry.VascEntryExport#getFileType() */ public String getFileType() { - return EXPORT_TYPE; + return reportType.getFileType(); } } \ No newline at end of file diff --git a/vasc-export/vasc-export-json/pom.xml b/vasc-export/vasc-export-json/pom.xml index 45b3760..dec9d6a 100644 --- a/vasc-export/vasc-export-json/pom.xml +++ b/vasc-export/vasc-export-json/pom.xml @@ -3,7 +3,7 @@ net.forwardfire.vasc.export vasc-export - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-export-json vasc-export-json diff --git a/vasc-frontend/pom.xml b/vasc-frontend/pom.xml index bf04af1..98b27ff 100644 --- a/vasc-frontend/pom.xml +++ b/vasc-frontend/pom.xml @@ -3,7 +3,7 @@ vasc net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-frontend diff --git a/vasc-frontend/vasc-frontend-cxf/pom.xml b/vasc-frontend/vasc-frontend-cxf/pom.xml index b74f47c..5b17b5f 100644 --- a/vasc-frontend/vasc-frontend-cxf/pom.xml +++ b/vasc-frontend/vasc-frontend-cxf/pom.xml @@ -3,7 +3,7 @@ vasc-frontend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-frontend-cxf diff --git a/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-client/pom.xml b/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-client/pom.xml index 00f227e..5f83a39 100644 --- a/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-client/pom.xml +++ b/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-client/pom.xml @@ -3,7 +3,7 @@ vasc-frontend-cxf net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-frontend-cxf-client diff --git a/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-server/pom.xml b/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-server/pom.xml index a7362f3..1ade78d 100644 --- a/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-server/pom.xml +++ b/vasc-frontend/vasc-frontend-cxf/vasc-frontend-cxf-server/pom.xml @@ -3,7 +3,7 @@ vasc-frontend-cxf net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-frontend-cxf-server diff --git a/vasc-frontend/vasc-frontend-swing/pom.xml b/vasc-frontend/vasc-frontend-swing/pom.xml index 4c855a7..088ac7d 100644 --- a/vasc-frontend/vasc-frontend-swing/pom.xml +++ b/vasc-frontend/vasc-frontend-swing/pom.xml @@ -3,7 +3,7 @@ vasc-frontend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-frontend-swing vasc-frontend-swing @@ -27,7 +27,7 @@ net.forwardfire.vasc.test - vasc-test-frontend-data + vasc-test-frontend ${project.version} test diff --git a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascFrontend.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascFrontend.java index 9c12189..04f439a 100644 --- a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascFrontend.java +++ b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascFrontend.java @@ -30,7 +30,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/vasc-frontend/vasc-frontend-swt/pom.xml b/vasc-frontend/vasc-frontend-swt/pom.xml index 83ff09c..992dd47 100644 --- a/vasc-frontend/vasc-frontend-swt/pom.xml +++ b/vasc-frontend/vasc-frontend-swt/pom.xml @@ -3,7 +3,7 @@ vasc-frontend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-frontend-swt vasc-frontend-swt @@ -64,7 +64,7 @@ net.forwardfire.vasc.test - vasc-test-frontend-data + vasc-test-frontend ${project.version} test diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java index 3583e54..5b513ec 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java @@ -22,7 +22,6 @@ package net.forwardfire.vasc.frontend.swt; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -472,6 +471,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { }; entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() { + private static final long serialVersionUID = -5558286028449368490L; public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; return result; @@ -527,12 +527,12 @@ public class SwtVascFrontend extends AbstractVascFrontend { public void controlResized(ControlEvent e) { Rectangle area = comp.getClientArea(); Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT); - int width = area.width - 2*table.getBorderWidth(); + // int width = area.width - 2*table.getBorderWidth(); if (preferredSize.y > area.height + table.getHeaderHeight()) { // Subtract the scrollbar width from the total column width // if a vertical scrollbar will be required - Point vBarSize = table.getVerticalBar().getSize(); - width -= vBarSize.x; + // Point vBarSize = table.getVerticalBar().getSize(); + // width -= vBarSize.x; } Point oldSize = table.getSize(); if (oldSize.x > area.width) { diff --git a/vasc-frontend/vasc-frontend-web-export/pom.xml b/vasc-frontend/vasc-frontend-web-export/pom.xml index 8da1112..4cae300 100644 --- a/vasc-frontend/vasc-frontend-web-export/pom.xml +++ b/vasc-frontend/vasc-frontend-web-export/pom.xml @@ -3,7 +3,7 @@ vasc-frontend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-frontend-web-export diff --git a/vasc-frontend/vasc-frontend-web-jsf/pom.xml b/vasc-frontend/vasc-frontend-web-jsf/pom.xml index 7cd9a52..0064c66 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/pom.xml +++ b/vasc-frontend/vasc-frontend-web-jsf/pom.xml @@ -3,7 +3,7 @@ vasc-frontend net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT vasc-frontend-web-jsf vasc-frontend-web-jsf diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java index 5822471..d5d962a 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java @@ -33,6 +33,8 @@ import java.util.ResourceBundle; import javax.xml.parsers.ParserConfigurationException; +import org.x4o.xml.io.X4OConnectionException; +import org.x4o.xml.io.X4OReader; import org.xml.sax.SAXException; import net.forwardfire.vasc.core.VascController; @@ -40,7 +42,7 @@ import net.forwardfire.vasc.core.VascEntryControllerLocal; import net.forwardfire.vasc.core.VascException; import net.forwardfire.vasc.frontend.VascFrontendException; import net.forwardfire.vasc.impl.DefaultVascFactory; -import net.forwardfire.vasc.impl.x4o.VascParser; +import net.forwardfire.vasc.impl.x4o.VascDriver; @@ -140,12 +142,14 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas // Load vasc resources for (String res:getVascParseResources()) { - VascParser vp = new VascParser(c); + VascDriver driver = VascDriver.getInstance(); + X4OReader reader = driver.createReader(); + driver.addVascController(reader, c); for (String name:vascGlobalELBeans.keySet()) { Object value = vascGlobalELBeans.get(name); - vp.addELBean(name, value); + reader.addELBeanInstance(name, value); } - vp.parseResource(res); + reader.readResource(res); } DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) c.getVascEntryController(), c); @@ -159,12 +163,12 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas throw new VascFrontendException(e); } catch (NullPointerException e) { throw new VascFrontendException(e); - } catch (ParserConfigurationException e) { - throw new VascFrontendException(e); } catch (SAXException e) { throw new VascFrontendException(e); } catch (IOException e) { throw new VascFrontendException(e); + } catch (X4OConnectionException e) { + throw new VascFrontendException(e); } } diff --git a/vasc-lib/pom.xml b/vasc-lib/pom.xml index 7fefebe..9a01fb2 100644 --- a/vasc-lib/pom.xml +++ b/vasc-lib/pom.xml @@ -3,7 +3,7 @@ vasc net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-lib @@ -15,5 +15,6 @@ vasc-lib-i18n vasc-lib-jr4o vasc-lib-editor + vasc-lib-xpql diff --git a/vasc-lib/vasc-lib-editor/pom.xml b/vasc-lib/vasc-lib-editor/pom.xml index ce71fd6..e3d84c3 100644 --- a/vasc-lib/vasc-lib-editor/pom.xml +++ b/vasc-lib/vasc-lib-editor/pom.xml @@ -3,7 +3,7 @@ vasc-lib net.forwardfire.vasc.lib - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-lib-editor diff --git a/vasc-lib/vasc-lib-i18n/pom.xml b/vasc-lib/vasc-lib-i18n/pom.xml index e97f343..a45ea10 100644 --- a/vasc-lib/vasc-lib-i18n/pom.xml +++ b/vasc-lib/vasc-lib-i18n/pom.xml @@ -3,7 +3,7 @@ vasc-lib net.forwardfire.vasc.lib - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-lib-i18n diff --git a/vasc-lib/vasc-lib-jr4o/pom.xml b/vasc-lib/vasc-lib-jr4o/pom.xml index c887a56..a8c7a35 100644 --- a/vasc-lib/vasc-lib-jr4o/pom.xml +++ b/vasc-lib/vasc-lib-jr4o/pom.xml @@ -3,7 +3,7 @@ vasc-lib net.forwardfire.vasc.lib - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-lib-jr4o @@ -12,7 +12,7 @@ org.x4o - x4o-core + x4o-driver ${x4o.version} diff --git a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignManager.java b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignManager.java index 28876e7..3f492c9 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignManager.java +++ b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignManager.java @@ -29,8 +29,8 @@ import java.io.OutputStream; import java.util.HashMap; import java.util.Map; -import javax.xml.parsers.ParserConfigurationException; - +import org.x4o.xml.io.X4OConnectionException; +import org.x4o.xml.io.X4OReader; import org.xml.sax.SAXException; import net.forwardfire.vasc.lib.jr4o.data.JRDynamicDataSource; @@ -96,37 +96,42 @@ public class JR4ODesignManager { if (design==null) { throw new NullPointerException("Can add null design."); } + if (design.getResourceBundle()==null) { + design.setResourceBundle(resourceBundle); + } reportDesigns.put(design.getName(), design); } - private JR4OParser createParser() { - JR4OParser parser = new JR4OParser(dataSource,resourceBundle); + private X4OReader createParser() { + JR4ODriver driver = new JR4ODriver(); + X4OReader reader = driver.createReader(); + reader.addELBeanInstance(JR4ODriver.EL_DATASOURCE_NAME, dataSource); Map elBeans = dataSource.addDynamicELBean(); for (String key:elBeans.keySet()) { Object value = elBeans.get(key); - parser.addELBean(key, value); + reader.addELBeanInstance(key, value); } - return parser; + return reader; } - public void parseFile(File file) throws FileNotFoundException, SecurityException, NullPointerException, ParserConfigurationException, SAXException, IOException { + public void parseFile(File file) throws FileNotFoundException, X4OConnectionException, SAXException, IOException { if (file==null) { throw new NullPointerException("Can't parse null file."); } - JR4OParser parser = createParser(); - parser.parseFile(file); - for (JasperDesign design:parser.getJasperDesigns()) { + X4OReader parser = createParser(); + JR4ODesignRoot root = parser.readFile(file); + for (JasperDesign design:root.getDesigns()) { addJasperDesign(design); } } - public void parseResource(String resourceName) throws FileNotFoundException, SecurityException, NullPointerException, ParserConfigurationException, SAXException, IOException { + public void parseResource(String resourceName) throws X4OConnectionException, SAXException, IOException { if (resourceName==null) { throw new NullPointerException("Can't parse null resouce."); } - JR4OParser parser = createParser(); - parser.parseResource(resourceName); - for (JasperDesign design:parser.getJasperDesigns()) { + X4OReader parser = createParser(); + JR4ODesignRoot root = parser.readResource(resourceName); + for (JasperDesign design:root.getDesigns()) { addJasperDesign(design); } } @@ -154,7 +159,7 @@ public class JR4ODesignManager { return JasperCompileManager.compileReport(design); } - public JasperPrint printReport(JasperReport report) throws JRException { + public JasperPrint printReport(JasperReport report) throws JRException { return JasperFillManager.fillReport(report, parameters, dataSource); } @@ -194,10 +199,23 @@ public class JR4ODesignManager { } public enum JRExportType { - PDF, - RTF, - CSV, - XLS, - XML; + PDF("text/pdf","pdf"), + RTF("text/rtf","rtf"), + CSV("text/csv","csv"), + XLS("text/xls","xls"), + XML("text/xml","xml"); + + private String mineType = null; + private String fileType = null; + private JRExportType(String mineType,String fileType) { + this.mineType=mineType; + this.fileType=fileType; + } + public String getMineType() { + return mineType; + } + public String getFileType() { + return fileType; + } } } diff --git a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignRoot.java b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignRoot.java new file mode 100644 index 0000000..5f89217 --- /dev/null +++ b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignRoot.java @@ -0,0 +1,23 @@ +package net.forwardfire.vasc.lib.jr4o; + +import java.util.ArrayList; +import java.util.List; + +import net.sf.jasperreports.engine.design.JasperDesign; + +public class JR4ODesignRoot { + + private List designs = null; + + public JR4ODesignRoot() { + designs = new ArrayList(10); + } + + public List getDesigns() { + return designs; + } + + public void addDesign(JasperDesign design) { + designs.add(design); + } +} diff --git a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4OParser.java b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODriver.java similarity index 52% rename from vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4OParser.java rename to vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODriver.java index 1a46724..4f4ea30 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4OParser.java +++ b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/JR4ODriver.java @@ -22,17 +22,14 @@ package net.forwardfire.vasc.lib.jr4o; -import java.util.ArrayList; -import java.util.List; import javax.el.ValueExpression; import net.forwardfire.vasc.lib.jr4o.data.JRDynamicDataSource; -import net.sf.jasperreports.engine.design.JasperDesign; -import org.x4o.xml.core.X4OParser; -import org.x4o.xml.element.ElementLanguage; +import org.x4o.xml.X4ODriver; import org.x4o.xml.element.ElementException; +import org.x4o.xml.lang.X4OLanguageSession; /** * JR4OParser parses xml layer for JasperReports @@ -42,41 +39,27 @@ import org.x4o.xml.element.ElementException; * @author Willem Cazander * @version 1.0 Aug 31, 2007 */ -public class JR4OParser extends X4OParser { +public class JR4ODriver extends X4ODriver { /** The jr40 language name */ - static public final String LANGUAGE = "jr4o"; + static public final String LANGUAGE_NAME = "jr4o"; + static public final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION}; static public final String EL_DATASOURCE_NAME = "dynamicDataSource"; - static public final String EL_DESIGN_LIST_NAME = "dynamicDesignList"; - private List dynamicDesignList = null; - private String resourceBundle = null; /** * creates an JR4OParser */ - public JR4OParser(JRDynamicDataSource dataSource,String resourceBundle) { - super(LANGUAGE); - this.resourceBundle = resourceBundle; - dynamicDesignList = new ArrayList(10); - addELBeanInstance(EL_DATASOURCE_NAME, dataSource); - addELBeanInstance(EL_DESIGN_LIST_NAME, dynamicDesignList); - + public JR4ODriver() { } - public void addELBean(String name,Object bean) { - addELBeanInstance(name, bean); + @Override + public String getLanguageName() { + return LANGUAGE_NAME; } - /** - * @return The list of JasperDesigns after parsing. - */ - public List getJasperDesigns() { - for (JasperDesign d:dynamicDesignList) { - if (d.getResourceBundle()==null) { - d.setResourceBundle(resourceBundle); - } - } - return dynamicDesignList; + @Override + public String[] getLanguageVersions() { + return LANGUAGE_VERSIONS; } /** @@ -84,27 +67,12 @@ public class JR4OParser extends X4OParser { * @param elementLanguage The ElementLanguage to get the datasource from. * @return The JRDynamicDataSource of this parser instance. */ - static public JRDynamicDataSource getELDataSource(ElementLanguage elementLanguage) throws ElementException { - ValueExpression ee = elementLanguage.getExpressionFactory().createValueExpression(elementLanguage.getELContext(),"${"+EL_DATASOURCE_NAME+"}",JRDynamicDataSource.class); - JRDynamicDataSource dataSource = (JRDynamicDataSource)ee.getValue(elementLanguage.getELContext()); + static public JRDynamicDataSource getELDataSource(X4OLanguageSession elementLanguage) throws ElementException { + ValueExpression ee = elementLanguage.getExpressionLanguageFactory().createValueExpression(elementLanguage.getExpressionLanguageContext(),"${"+EL_DATASOURCE_NAME+"}",JRDynamicDataSource.class); + JRDynamicDataSource dataSource = (JRDynamicDataSource)ee.getValue(elementLanguage.getExpressionLanguageContext()); if (dataSource==null) { throw new ElementException("Could not find dataSouce in context as: "+EL_DATASOURCE_NAME); } return dataSource; } - - /** - * Returns the List of designs for adding the design. - * @param context The ElementLanguage to get the list from. - * @return The list of designs. - */ - @SuppressWarnings("unchecked") - static public List getELDesignList(ElementLanguage context) throws ElementException { - ValueExpression ee = context.getExpressionFactory().createValueExpression(context.getELContext(),"${"+EL_DESIGN_LIST_NAME+"}",List.class); - List designList = (List)ee.getValue(context.getELContext()); - if (designList==null) { - throw new ElementException("Could not find designList in context as: "+EL_DESIGN_LIST_NAME); - } - return designList; - } } \ No newline at end of file diff --git a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementBindingHandler.java b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementBindingHandler.java index 2c78be3..4fbf067 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementBindingHandler.java +++ b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementBindingHandler.java @@ -36,7 +36,7 @@ import net.sf.jasperreports.engine.design.JRDesignElement; * @author Willem Cazander * @version 1.0 Aug 31, 2007 */ -public class JR4OElementBindingHandler extends AbstractElementBindingHandler { +public class JR4OElementBindingHandler extends AbstractElementBindingHandler { private final static Class[] CLASSES_CHILD = new Class[] { JRElementGroup.class, @@ -57,21 +57,24 @@ public class JR4OElementBindingHandler extends AbstractElementBindingHandler { public Class[] getBindChildClasses() { return CLASSES_CHILD; } - - /** - * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element) - */ - public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException { - if (parentObject instanceof JRDesignElement) { - if (childObject instanceof JRElementGroup) { - ((JRDesignElement)parentObject).setElementGroup((JRElementGroup)childObject); - } - if (childObject instanceof JRGroup) { - ((JRDesignElement)parentObject).setPrintWhenGroupChanges((JRGroup)childObject); - } - if (childObject instanceof JRStyle) { - ((JRDesignElement)parentObject).setStyle((JRStyle)childObject); - } + + @Override + public void bindChild(Element childElement, JRDesignElement parentObject,Object childObject) throws ElementBindingHandlerException { + if (childObject instanceof JRElementGroup) { + parentObject.setElementGroup((JRElementGroup)childObject); + } + if (childObject instanceof JRGroup) { + parentObject.setPrintWhenGroupChanges((JRGroup)childObject); + } + if (childObject instanceof JRStyle) { + parentObject.setStyle((JRStyle)childObject); } } + + @Override + public void createChilderen(Element parentElement, JRDesignElement parentObject) throws ElementBindingHandlerException { + createChild(parentElement, parentObject.getElementGroup()); + createChild(parentElement, parentObject.getPrintWhenGroupChanges()); + createChild(parentElement, parentObject.getStyle()); + } } diff --git a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementGroupBindingHandler.java b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementGroupBindingHandler.java index 5875dda..af37ecb 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementGroupBindingHandler.java +++ b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OElementGroupBindingHandler.java @@ -26,6 +26,7 @@ import org.x4o.xml.element.AbstractElementBindingHandler; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementBindingHandlerException; +import net.sf.jasperreports.engine.JRChild; import net.sf.jasperreports.engine.design.JRDesignElement; import net.sf.jasperreports.engine.design.JRDesignElementGroup; @@ -35,7 +36,7 @@ import net.sf.jasperreports.engine.design.JRDesignElementGroup; * @author Willem Cazander * @version 1.0 Aug 31, 2007 */ -public class JR4OElementGroupBindingHandler extends AbstractElementBindingHandler { +public class JR4OElementGroupBindingHandler extends AbstractElementBindingHandler { private final static Class[] CLASSES_CHILD = new Class[] { JRDesignElement.class, @@ -56,18 +57,25 @@ public class JR4OElementGroupBindingHandler extends AbstractElementBindingHandle return CLASSES_CHILD; } - /** - * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element) - */ - public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException { - if (parentObject instanceof JRDesignElementGroup) { - if (childObject instanceof JRDesignElementGroup) { - ((JRDesignElementGroup)parentObject).addElementGroup((JRDesignElementGroup)childObject); + @Override + public void bindChild(Element childElement, JRDesignElementGroup parentObject,Object childObject) throws ElementBindingHandlerException { + if (childObject instanceof JRDesignElementGroup) { + parentObject.addElementGroup((JRDesignElementGroup)childObject); + } + if (childObject instanceof JRDesignElement) { + parentObject.addElement((JRDesignElement)childObject); + } + } + + @Override + public void createChilderen(Element parentElement, JRDesignElementGroup parentObject) throws ElementBindingHandlerException { + for (JRChild child:parentObject.getChildren()) { + if (child instanceof JRDesignElement) { + createChild(parentElement, child); } - if (childObject instanceof JRDesignElement) { - ((JRDesignElementGroup)parentObject).addElement((JRDesignElement)childObject); + if (child instanceof JRDesignElementGroup) { + createChild(parentElement, child); } - return; } } } diff --git a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OJasperDesignBindingHandler.java b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OJasperDesignBindingHandler.java index e869f73..db37cc2 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OJasperDesignBindingHandler.java +++ b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JR4OJasperDesignBindingHandler.java @@ -37,7 +37,7 @@ import net.sf.jasperreports.engine.design.JasperDesign; * @author Willem Cazander * @version 1.0 Aug 31, 2007 */ -public class JR4OJasperDesignBindingHandler extends AbstractElementBindingHandler { +public class JR4OJasperDesignBindingHandler extends AbstractElementBindingHandler { private final static Class[] CLASSES_CHILD = new Class[] { JRField.class, @@ -59,24 +59,33 @@ public class JR4OJasperDesignBindingHandler extends AbstractElementBindingHandle return CLASSES_CHILD; } - /** - * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element) - */ - public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException { - if (parentObject instanceof JasperDesign) { - try { - if (childObject instanceof JRField) { - ((JasperDesign)parentObject).addField((JRField)childObject); - } - if (childObject instanceof JRParameter) { - ((JasperDesign)parentObject).addParameter((JRParameter)childObject); - } - if (childObject instanceof JRStyle) { - ((JasperDesign)parentObject).addStyle((JRStyle)childObject); - } - } catch (Exception e) { - throw new ElementBindingHandlerException(e.getMessage(),e); + @Override + public void bindChild(Element childElement, JasperDesign parentObject,Object childObject) throws ElementBindingHandlerException { + try { + if (childObject instanceof JRField) { + parentObject.addField((JRField)childObject); } + if (childObject instanceof JRParameter) { + parentObject.addParameter((JRParameter)childObject); + } + if (childObject instanceof JRStyle) { + parentObject.addStyle((JRStyle)childObject); + } + } catch (Exception e) { + throw new ElementBindingHandlerException(e.getMessage(),e); + } + } + + @Override + public void createChilderen(Element parentElement, JasperDesign parentObject) throws ElementBindingHandlerException { + for (JRField field:parentObject.getFieldsList()) { + createChild(parentElement, field); + } + for (JRParameter parameter:parentObject.getParametersList()) { + createChild(parentElement, parameter); + } + for (JRStyle style:parentObject.getStylesList()) { + createChild(parentElement, style); } } } diff --git a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JRDynamicCardsElement.java b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JRDynamicCardsElement.java index fdb1938..de4b1cd 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JRDynamicCardsElement.java +++ b/vasc-lib/vasc-lib-jr4o/src/main/java/net/forwardfire/vasc/lib/jr4o/x4o/JRDynamicCardsElement.java @@ -27,7 +27,7 @@ import javax.el.ValueExpression; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; -import net.forwardfire.vasc.lib.jr4o.JR4OParser; +import net.forwardfire.vasc.lib.jr4o.JR4ODriver; import net.forwardfire.vasc.lib.jr4o.data.JRDynamicDataSource; import net.sf.jasperreports.engine.JRStyle; import net.sf.jasperreports.engine.design.JRDesignElementGroup; @@ -48,60 +48,46 @@ public class JRDynamicCardsElement extends AbstractElement { */ @Override public void doElementStart() throws ElementException { - JRDynamicDataSource dataSource = JR4OParser.getELDataSource(getElementLanguage()); + JRDynamicDataSource dataSource = JR4ODriver.getELDataSource(getLanguageSession()); - ValueExpression ee = getElementLanguage().getExpressionFactory().createValueExpression(getElementLanguage().getELContext(),"${Arial_Bold}",JRStyle.class); - JRStyle style = (JRStyle)ee.getValue(getElementLanguage().getELContext()); + ValueExpression ee = getLanguageSession().getExpressionLanguageFactory().createValueExpression(getLanguageSession().getExpressionLanguageContext(),"${Arial_Bold}",JRStyle.class); + JRStyle style = (JRStyle)ee.getValue(getLanguageSession().getExpressionLanguageContext()); if (style==null) { throw new ElementException("Could not get the font."); } style.setBlankWhenNull(true); style.setMode(ModeEnum.OPAQUE); - // //DEBUG STYLE - //style.setForecolor(Color.BLACK); - //style.setBackcolor(Color.BLUE); Object parent = getParent().getElementObject(); if (parent instanceof JRDesignElementGroup == false) { throw new ElementException("parent is not an JRDesignElementGroup."); - } - JRDesignElementGroup group = (JRDesignElementGroup)parent; - + } + JRDesignElementGroup group = (JRDesignElementGroup)parent; int offsetInitial = 95; int defaultHeight = 12; int max = dataSource.getDynamicColumnCount(); for (int i=0;i designs = JR4OParser.getELDesignList(getElementLanguage()); - designs.add(design); - } -} \ No newline at end of file diff --git a/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-lang.eld b/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-lang.eld index ea40bba..18e27f3 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-lang.eld +++ b/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-lang.eld @@ -5,9 +5,8 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - moduleName="Xpql query loading" - moduleVersion="1.0" - moduleProviderName="vasc.forwardfire.net" + providerHost="vasc.forwardfire.net" + providerName="Xpql query loading" id="jr4o" > @@ -16,185 +15,193 @@ + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-modules.xml b/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-modules.xml index ade5735..616b2e5 100644 --- a/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-modules.xml +++ b/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/jr4o/jr4o-modules.xml @@ -6,6 +6,6 @@ > jr4o-lang.eld - org.x4o.xml.meta.MetaLanguageSiblingLoader + org.x4o.xml.lang.meta.MetaLanguageSiblingLoader diff --git a/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/x4o-drivers.xml b/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/x4o-drivers.xml new file mode 100644 index 0000000..6024647 --- /dev/null +++ b/vasc-lib/vasc-lib-jr4o/src/main/resources/META-INF/x4o-drivers.xml @@ -0,0 +1,32 @@ + + + + + diff --git a/vasc-lib/vasc-lib-jr4o/src/test/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignManagerTest.java b/vasc-lib/vasc-lib-jr4o/src/test/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignManagerTest.java new file mode 100644 index 0000000..834dc1e --- /dev/null +++ b/vasc-lib/vasc-lib-jr4o/src/test/java/net/forwardfire/vasc/lib/jr4o/JR4ODesignManagerTest.java @@ -0,0 +1,58 @@ +package net.forwardfire.vasc.lib.jr4o; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import javax.swing.table.AbstractTableModel; + +import net.forwardfire.vasc.lib.jr4o.JR4ODesignManager.JRExportType; +import net.forwardfire.vasc.lib.jr4o.data.JRDynamicDataSourceTableModel; + +import junit.framework.TestCase; + +public class JR4ODesignManagerTest extends TestCase { + + public void testExport() throws Exception { + String testResourceBundle = TestResourceBundle.class.getName(); + TestTableModel testData = new TestTableModel(); + JRDynamicDataSourceTableModel dataModel = new JRDynamicDataSourceTableModel(testData,new int[]{50,100,150}); + Map parameters = new HashMap(5); + parameters.put("title", "TEST-TITLE"); + parameters.put("description", "TEST-DESCRITION"); + parameters.put("titleSubject", "TEST-SUBJECT"); + + JR4ODesignManager manager = new JR4ODesignManager(dataModel,testResourceBundle,parameters); + manager.parseResource("net/forwardfire/vasc/lib/jr4o/reports/dynamic-reports.xml"); + manager.saveReportFile("generic-landscape", JRExportType.PDF, "target/junit-test.pdf"); + + File output = new File("target/junit-test.pdf"); + assertTrue(output.exists()); + output.delete(); + } + + class TestTableModel extends AbstractTableModel { + private static final long serialVersionUID = 1L; + String[][] data = new String[][] { + {"1","test","data"}, + {"2","foo","bar"}, + {"3","bar","foo"}, + {"4","data","test"}, + }; + + @Override + public int getColumnCount() { + return 3; + } + + @Override + public int getRowCount() { + return data.length; + } + + @Override + public Object getValueAt(int row, int col) { + return data[row][col]; + } + } +} diff --git a/vasc-lib/vasc-lib-jr4o/src/test/java/net/forwardfire/vasc/lib/jr4o/TestResourceBundle.java b/vasc-lib/vasc-lib-jr4o/src/test/java/net/forwardfire/vasc/lib/jr4o/TestResourceBundle.java new file mode 100644 index 0000000..98c0032 --- /dev/null +++ b/vasc-lib/vasc-lib-jr4o/src/test/java/net/forwardfire/vasc/lib/jr4o/TestResourceBundle.java @@ -0,0 +1,17 @@ +package net.forwardfire.vasc.lib.jr4o; + +import java.util.Enumeration; +import java.util.ResourceBundle; + +public class TestResourceBundle extends ResourceBundle { + @Override + public Enumeration getKeys() { + return null; + } + + @Override + protected Object handleGetObject(String key) { + return "I18N:"+key; + } + +} diff --git a/vasc-xpql/.project b/vasc-lib/vasc-lib-xpql/.project similarity index 100% rename from vasc-xpql/.project rename to vasc-lib/vasc-lib-xpql/.project diff --git a/vasc-xpql-ejb3-server/pom.xml b/vasc-lib/vasc-lib-xpql/pom.xml similarity index 55% rename from vasc-xpql-ejb3-server/pom.xml rename to vasc-lib/vasc-lib-xpql/pom.xml index 580f326..8abcd1b 100644 --- a/vasc-xpql-ejb3-server/pom.xml +++ b/vasc-lib/vasc-lib-xpql/pom.xml @@ -1,19 +1,30 @@ 4.0.0 - vasc - net.forwardfire.vasc - 0.4.1-SNAPSHOT + vasc-lib + net.forwardfire.vasc.lib + 0.4.2-SNAPSHOT - vasc-xpql-ejb3-server - vasc-xpql-ejb3-server - xpql parsing server impl for ejb3 + vasc-lib-xpql + vasc-lib-xpql + vasc xpql parser for queries. - net.forwardfire.vasc - vasc-xpql-ejb3-client - ${project.version} - + org.x4o + x4o-driver + ${x4o.version} + + + org.x4o + x4o-meta + ${x4o.version} + + + javax.servlet.jsp + jsp-api + ${jsp-api.version} + provided + javax.ejb ejb-api diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java similarity index 85% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java index bd54ea1..561cade 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java @@ -22,6 +22,7 @@ package net.forwardfire.vasc.xpql; +import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -49,9 +50,17 @@ public class QueryStore { if (query.getName().isEmpty()) { throw new IllegalArgumentException("Can't add query with empty name."); } + if (query.getQueryStore()!=null) { + throw new IllegalArgumentException("Query has already an store."); + } + query.setQueryStore(this); queryMap.put(query.getName(),query); } + public Collection getQueries() { + return queryMap.values(); + } + public Query getQuery(String name) { return queryMap.get(name); } @@ -59,4 +68,11 @@ public class QueryStore { public Set getQueryNames() { return queryMap.keySet(); } + + public void addAll(QueryStore store) { + for (String key:store.getQueryNames()) { + Query q = store.getQuery(key); + addQuery(q); + } + } } \ No newline at end of file diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParserSupport.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLDriver.java similarity index 67% rename from vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParserSupport.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLDriver.java index 9e43d90..70e8e7f 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParserSupport.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLDriver.java @@ -20,27 +20,33 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.impl.x4o; +package net.forwardfire.vasc.xpql; -import org.x4o.xml.core.X4OParserSupport; -import org.x4o.xml.core.X4OParserSupportException; -import org.x4o.xml.element.ElementLanguage; +import org.x4o.xml.X4ODriver; +import org.x4o.xml.X4ODriverManager; /** - * VascParserSupport the vasc xml config language. + * Parse an xpql file/resource * * @author Willem Cazander - * @version 1.0 Aug 25, 2012 + * @version 1.0 Aug 29, 2010 */ -public class VascParserSupport implements X4OParserSupport { +public class XPQLDriver extends X4ODriver { + + static public String LANGUAGE_NAME = "xpql"; + static public String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION}; - /** - * Loads the ElementLanguage of this language parser for support. - * @return The loaded ElementLanguage. - * @see org.x4o.xml.core.X4OParserSupport#loadElementLanguageSupport() - */ - public ElementLanguage loadElementLanguageSupport() throws X4OParserSupportException { - VascParser parser = new VascParser(); - return parser.loadElementLanguageSupport(); + @Override + public String getLanguageName() { + return LANGUAGE_NAME; + } + + @Override + public String[] getLanguageVersions() { + return LANGUAGE_VERSIONS; + } + + static public XPQLDriver getInstance() { + return (XPQLDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME); } } diff --git a/vasc-xpql-ejb3-client/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManager.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManager.java similarity index 74% rename from vasc-xpql-ejb3-client/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManager.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManager.java index 0ef60ad..c849fde 100644 --- a/vasc-xpql-ejb3-client/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManager.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManager.java @@ -20,13 +20,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.xpql.ejb3; +package net.forwardfire.vasc.xpql.execute.jpa; import java.util.List; import java.util.Map; import javax.ejb.Local; import javax.ejb.Remote; +import javax.persistence.EntityManager; import net.forwardfire.vasc.xpql.query.Query; @@ -39,17 +40,17 @@ public interface XpqlQueryManager { public Query getQuery(String name); - public List execute(Query query); + public List execute(EntityManager entityManager,Query query); - public Object executeObject(Query query); + public Object executeObject(EntityManager entityManager,Query query); - public Integer executeUpdate(Query query); + public Integer executeUpdate(EntityManager entityManager,Query query); - public List execute(String query,Map parameters); + public List execute(EntityManager entityManager,String query,Map parameters); - public Object executeObject(String query,Map parameters); + public Object executeObject(EntityManager entityManager,String query,Map parameters); - public Integer executeUpdate(String query,Map parameters); + public Integer executeUpdate(EntityManager entityManager,String query,Map parameters); @Local public interface ILocal extends XpqlQueryManager { diff --git a/vasc-xpql-ejb3-server/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManagerImpl.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManagerImpl.java similarity index 88% rename from vasc-xpql-ejb3-server/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManagerImpl.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManagerImpl.java index 3f1638c..6ebb8a6 100644 --- a/vasc-xpql-ejb3-server/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManagerImpl.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManagerImpl.java @@ -20,7 +20,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.forwardfire.vasc.xpql.ejb3; +package net.forwardfire.vasc.xpql.execute.jpa; import java.io.IOException; import java.io.InputStream; @@ -34,15 +34,17 @@ import java.util.logging.Logger; import javax.annotation.PostConstruct; import javax.annotation.Resource; +import javax.ejb.SessionContext; import javax.ejb.Stateless; import javax.ejb.TransactionManagement; import javax.ejb.TransactionManagementType; -import javax.naming.InitialContext; import javax.persistence.EntityManager; import javax.transaction.UserTransaction; +import org.x4o.xml.io.X4OReader; + import net.forwardfire.vasc.xpql.QueryStore; -import net.forwardfire.vasc.xpql.XPQLParser; +import net.forwardfire.vasc.xpql.XPQLDriver; import net.forwardfire.vasc.xpql.query.Query; import net.forwardfire.vasc.xpql.query.QueryParameterValue; @@ -59,11 +61,14 @@ import net.forwardfire.vasc.xpql.query.QueryParameterValue; public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryManager.IRemote { private static final Logger logger = Logger.getLogger(XpqlQueryManagerImpl.class.getName()); - private EntityManager entityManager; + //private EntityManager entityManager; @Resource private UserTransaction utx; + @Resource + private SessionContext context; + private Map queries = new HashMap(100); @PostConstruct @@ -79,8 +84,9 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa loadResource(value); } if ("persistenceUnit".equals(key)) { - logger.fine("getting EntityManager: "+value); - entityManager = (EntityManager)new InitialContext().lookup(value); + logger.fine("getting EntityManager: RMED."+value); + //entityManager = EntityManager.class.cast(context.lookup(value)); + //entityManager = (EntityManager)new InitialContext().lookup(value); } } long t = System.currentTimeMillis()-s; @@ -138,14 +144,15 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa } private void loadResource(String resource) { - XPQLParser parser = new XPQLParser(); + XPQLDriver driver = XPQLDriver.getInstance(); + X4OReader reader = driver.createReader(); + QueryStore store = null; logger.fine("Try loading: "+resource); try { - parser.parseResource(resource); + store = reader.readResource(resource); } catch (Exception e) { throw new RuntimeException("Could not load xpql resource: "+resource+" error: "+e.getMessage(),e); } - QueryStore store = parser.getQueryStore(); for (String key:store.getQueryNames()) { Query q = store.getQuery(key); @@ -170,7 +177,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa } @SuppressWarnings("unchecked") - public List execute(Query query) { + public List execute(EntityManager entityManager,Query query) { String sql = query.toPreparedSQL(query); logger.finer("Executing: "+query.getName()+" sql: "+sql); javax.persistence.Query q2 = null; @@ -205,8 +212,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa return q2.getResultList(); } - @SuppressWarnings("unchecked") - public Object executeObject(Query query) { + public Object executeObject(EntityManager entityManager,Query query) { String sql = query.toPreparedSQL(query); logger.finer("Executing: "+query.getName()+" sql: "+sql); javax.persistence.Query q2 = null; @@ -255,7 +261,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa } } - public List execute(String name,Map parameters) { + public List execute(EntityManager entityManager,String name,Map parameters) { Query query = getQuery(name); if (parameters!=null) { for (String key:parameters.keySet()) { @@ -263,10 +269,10 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa query.setQueryParameter(key, value); } } - return execute(query); + return execute(entityManager,query); } - public Object executeObject(String name,Map parameters) { + public Object executeObject(EntityManager entityManager,String name,Map parameters) { Query query = getQuery(name); if (parameters!=null) { for (String key:parameters.keySet()) { @@ -274,10 +280,10 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa query.setQueryParameter(key, value); } } - return executeObject(query); + return executeObject(entityManager,query); } - public Integer executeUpdate(Query query) { + public Integer executeUpdate(EntityManager entityManager,Query query) { String sql = query.toPreparedSQL(query); logger.fine("Executing: "+query.getName()+" sql: "+sql); try { @@ -325,12 +331,12 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa throw new IllegalStateException("unknow query type"); } - public Integer executeUpdate(String name,Map parameters) { + public Integer executeUpdate(EntityManager entityManager,String name,Map parameters) { Query query = getQuery(name); for (String key:parameters.keySet()) { Object value = parameters.get(key); query.setQueryParameter(key, value); } - return executeUpdate(query); + return executeUpdate(entityManager,query); } } diff --git a/vasc-xpql-ejb3-client/src/main/java/net/forwardfire/vasc/xpql/ejb3/x4o/XpqlEjb3QueriesElement.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlVascJndiQueriesElement.java similarity index 93% rename from vasc-xpql-ejb3-client/src/main/java/net/forwardfire/vasc/xpql/ejb3/x4o/XpqlEjb3QueriesElement.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlVascJndiQueriesElement.java index a7e3f6c..57fc443 100644 --- a/vasc-xpql-ejb3-client/src/main/java/net/forwardfire/vasc/xpql/ejb3/x4o/XpqlEjb3QueriesElement.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlVascJndiQueriesElement.java @@ -1,4 +1,4 @@ -package net.forwardfire.vasc.xpql.ejb3.x4o; +package net.forwardfire.vasc.xpql.execute.jpa; import java.util.Collection; import java.util.HashMap; @@ -8,14 +8,12 @@ import java.util.Set; import javax.naming.Context; import javax.naming.InitialContext; - -import net.forwardfire.vasc.xpql.ejb3.XpqlQueryManager; import net.forwardfire.vasc.xpql.query.Query; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; -public class XpqlEjb3QueriesElement extends AbstractElement { +public class XpqlVascJndiQueriesElement extends AbstractElement { @Override diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/package-info.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/package-info.java new file mode 100644 index 0000000..b300429 --- /dev/null +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author willemc + * + */ +package net.forwardfire.vasc.xpql.execute.jpa; \ No newline at end of file diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/package-info.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/package-info.java new file mode 100644 index 0000000..ba82fc3 --- /dev/null +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author willemc + * + */ +package net.forwardfire.vasc.xpql.execute; \ No newline at end of file diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java similarity index 92% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java index 8168559..54448fd 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java @@ -50,7 +50,7 @@ public class DefaultQuery extends AbstractQuery { public String toEdit(Query query) { StringBuffer queryBuffer = new StringBuffer(); for ( QueryPart queryPart:getQueryParts() ) { - queryBuffer.append( queryPart.toEdit(query) ); + queryBuffer.append( queryPart.toEdit(query) ); } return queryBuffer.toString(); } @@ -63,7 +63,7 @@ public class DefaultQuery extends AbstractQuery { this.getOrderQueryParameterValues().clear(); StringBuffer queryBuffer = new StringBuffer(); for ( QueryPart queryPart:getQueryParts() ) { - queryBuffer.append( queryPart.toPreparedSQL(query) ); + queryBuffer.append( queryPart.toPreparedSQL(query) ); } return queryBuffer.toString(); } @@ -75,7 +75,7 @@ public class DefaultQuery extends AbstractQuery { public String toSQL(Query query) { StringBuffer queryBuffer = new StringBuffer(); for ( QueryPart queryPart:getQueryParts() ) { - queryBuffer.append( queryPart.toSQL(query) ); + queryBuffer.append( queryPart.toSQL(query) ); } return queryBuffer.toString(); } @@ -95,7 +95,7 @@ public class DefaultQuery extends AbstractQuery { queryBuffer.append("\t\t"); for ( QueryPart queryPart:getQueryParts() ) { - queryBuffer.append( queryPart.toXML(query) ); + queryBuffer.append( queryPart.toXML(query) ); } queryBuffer.append("\n"); @@ -104,12 +104,12 @@ public class DefaultQuery extends AbstractQuery { queryBuffer.append(comment); queryBuffer.append("\n"); } - + for ( QueryParameterValue qpv:getLocalQueryParameterValues()) { queryBuffer.append("\t\t reader = driver.createReader(); + QueryStore store = reader.readResource(resource); + query.getQueryStore().addAll(store); } catch (Exception e) { e.printStackTrace(); } } } - return query.getQueryStore().getQuery(getName()).toSQL(query); + return query.getQueryStore().getQuery(getName()).toSQL(query); } public String toPreparedSQL(Query query) { if (query.getQueryStore().getQuery(getName())==null) { if (resource!=null) { try { - XPQLParser parser = new XPQLParser(query.getQueryStore()); - parser.parseResource(resource); + XPQLDriver driver = XPQLDriver.getInstance(); + X4OReader reader = driver.createReader(); + QueryStore store = reader.readResource(resource); + query.getQueryStore().addAll(store); } catch (Exception e) { e.printStackTrace(); } diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java similarity index 93% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java index 6974013..8c2a171 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java @@ -28,11 +28,13 @@ import java.util.List; import net.forwardfire.vasc.xpql.query.AbstractQueryPart; import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.Query.QueryType; import net.forwardfire.vasc.xpql.query.QueryParameterValue; import net.forwardfire.vasc.xpql.query.QueryPart; /** + * QueryParameter. * * @author Willem Cazander * @version 1.0 Mar 4, 2007 @@ -119,7 +121,11 @@ public class QueryParameter extends AbstractQueryPart { case parameter: //if (query.getOrderQueryParameterValues().contains(value)==false) { query.addOrderQueryParameterValue(value); - result = "?"; + if (QueryType.hql.equals(query.getType())) { + result = "?"+query.getOrderQueryParameterValues().size(); + } else { + result = "?"; + } break; case parameterList: @@ -154,7 +160,6 @@ public class QueryParameter extends AbstractQueryPart { Iterator i = valueList.iterator(); while (i.hasNext()) { Object v = i.next(); - builder.append('?'); //if (doAdd) { QueryParameterValue vv = new DefaultQueryParameterValue(); vv.setName(value.getName()); @@ -162,11 +167,16 @@ public class QueryParameter extends AbstractQueryPart { vv.setType(QueryParameterValue.QueryParameterType.parameter); query.addOrderQueryParameterValue(vv); //} + if (QueryType.hql.equals(query.getType())) { + builder.append("?"+query.getOrderQueryParameterValues().size()); + } else { + builder.append('?'); + } if (i.hasNext()) { builder.append(','); } } - result = builder.toString(); + result = builder.toString(); break; case raw: // The structural type of a "value" indicates that we're dealing with a SQL construct diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java similarity index 69% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java index 6767d3b..adb2deb 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java @@ -39,7 +39,7 @@ import org.x4o.xml.element.ElementBindingHandlerException; * @author Willem Cazander * @version 1.0 Jan 21, 2007 */ -public class QueryBindingHandler extends AbstractElementBindingHandler { +public class QueryBindingHandler extends AbstractElementBindingHandler { private final static Class[] CLASSES_CHILD = new Class[] { QueryPart.class, @@ -60,28 +60,34 @@ public class QueryBindingHandler extends AbstractElementBindingHandler { return CLASSES_CHILD; } - /** - * @see org.x4o.xml.element.ElementBindingHandler#doBind(java.lang.Object, java.lang.Object, org.x4o.xml.element.Element) - */ - public void doBind(Object parentObject, Object childObject,Element childElement) throws ElementBindingHandlerException { - if(parentObject instanceof Query) { - Query query = (Query)parentObject; - - // skip those with different life cycle because of sql characters adding elements in sax phase. - if (childObject instanceof QueryParameter) { - return; - } - if (childObject instanceof QueryInclude) { - return; - } - - if (childObject instanceof QueryPart) { - query.addQueryPart((QueryPart)childObject); - } - if (childObject instanceof QueryParameterValue) { - query.addLocalQueryParameterValue((QueryParameterValue)childObject); - query.addQueryParameterValue((QueryParameterValue)childObject); - } + @Override + public void bindChild(Element childElement, Query parentObject,Object childObject) throws ElementBindingHandlerException { + // skip those with different life cycle because of sql characters adding elements in sax phase. + if (childObject instanceof QueryParameter) { + return; + } + if (childObject instanceof QueryInclude) { + return; + } + if (childObject == parentObject) { + return; // skip sql element + } + if (childObject instanceof QueryPart) { + parentObject.addQueryPart((QueryPart)childObject); + } + if (childObject instanceof QueryParameterValue) { + parentObject.addLocalQueryParameterValue((QueryParameterValue)childObject); + parentObject.addQueryParameterValue((QueryParameterValue)childObject); + } + } + + @Override + public void createChilderen(Element parentElement, Query parentObject) throws ElementBindingHandlerException { + for (QueryPart part:parentObject.getQueryParts()) { + createChild(parentElement, part); + } + for (QueryParameterValue value:parentObject.getQueryParameterValues()) { + createChild(parentElement, value); } } } diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java similarity index 99% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java index e6a6d53..f9fc522 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java @@ -33,8 +33,8 @@ import net.forwardfire.vasc.xpql.QueryStore; import net.forwardfire.vasc.xpql.impl.DefaultQueryParameterValue; - /** + * AbstractQuery * * @author Willem Cazander * @version 1.0 Mar 4, 2007 diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java similarity index 98% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java index ab1930e..f50b583 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java @@ -30,7 +30,7 @@ import net.forwardfire.vasc.xpql.QueryStore; /** - * TODO: add clonale support + * Query which is build out of QueryParts. * * @author Willem Cazander * @version 1.0 Mar 4, 2007 diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java similarity index 100% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java similarity index 99% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java index dff029f..97eefe8 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java @@ -23,6 +23,7 @@ package net.forwardfire.vasc.xpql.query; /** + * QueryPart * * @author Willem Cazander * @version 1.0 Mar 4, 2007 diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/x4o/XpqlLoadQueriesElement.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/x4o/XpqlLoadQueriesElement.java similarity index 67% rename from vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/x4o/XpqlLoadQueriesElement.java rename to vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/x4o/XpqlLoadQueriesElement.java index eb9cd4b..d3ad05d 100644 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/x4o/XpqlLoadQueriesElement.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/x4o/XpqlLoadQueriesElement.java @@ -5,11 +5,12 @@ import java.util.Map; import java.util.logging.Logger; import net.forwardfire.vasc.xpql.QueryStore; -import net.forwardfire.vasc.xpql.XPQLParser; +import net.forwardfire.vasc.xpql.XPQLDriver; import net.forwardfire.vasc.xpql.query.Query; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; +import org.x4o.xml.io.X4OReader; public class XpqlLoadQueriesElement extends AbstractElement { @@ -31,19 +32,18 @@ public class XpqlLoadQueriesElement extends AbstractElement { } // load queries from attributes - XPQLParser parser = new XPQLParser(); - logger.fine("Try loading: "+resource); - try { - parser.parseResource(resource); + XPQLDriver driver = new XPQLDriver(); + X4OReader reader = driver.createReader(); + QueryStore store = null; + try { + store = reader.readResource(resource); } catch (Exception e) { - throw new RuntimeException("Could not load xpql resource: "+resource+" error: "+e.getMessage(),e); + throw new ElementException(e); } - QueryStore store = parser.getQueryStore(); - - for (String key:store.getQueryNames()) { - Query q = store.getQuery(key); + for (String key:store.getQueryNames()) { + Query q = store.getQuery(key); queries.put(q.getName(),q); - } - logger.info("Loaded xpql queries: "+store.getQueryNames().size()); + } + logger.info("Loaded xpql queries: "+store.getQueryNames().size()); } } diff --git a/vasc-xpql/src/main/resources/META-INF/vasc/vasc-modules.xml b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/vasc/vasc-modules.xml similarity index 100% rename from vasc-xpql/src/main/resources/META-INF/vasc/vasc-modules.xml rename to vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/vasc/vasc-modules.xml diff --git a/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/vasc/vasc-xpql.eld b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/vasc/vasc-xpql.eld new file mode 100644 index 0000000..c2e7154 --- /dev/null +++ b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/vasc/vasc-xpql.eld @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/x4o-drivers.xml b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/x4o-drivers.xml new file mode 100644 index 0000000..f468032 --- /dev/null +++ b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/x4o-drivers.xml @@ -0,0 +1,32 @@ + + + + + diff --git a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld similarity index 77% rename from vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld rename to vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld index 7cd890f..7f36085 100644 --- a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld +++ b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld @@ -5,11 +5,17 @@ xmlns:root="http://eld.x4o.org/xml/ns/eld-root" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd" - providerName="xpql.vasc.forwardfire.net" - name="XML Parmeterized Query Language" + providerHost="xpql.vasc.forwardfire.net" + providerName="XML Parmeterized Query Language" id="mod-xpql-lang" > + + + - - The module root element. + + The module query store root element. - - - - + + + diff --git a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-modules.xml b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/xpql/xpql-modules.xml similarity index 81% rename from vasc-xpql/src/main/resources/META-INF/xpql/xpql-modules.xml rename to vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/xpql/xpql-modules.xml index 7ce6498..70bdc23 100644 --- a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-modules.xml +++ b/vasc-lib/vasc-lib-xpql/src/main/resources/META-INF/xpql/xpql-modules.xml @@ -6,5 +6,6 @@ > xpql-lang.eld + org.x4o.xml.lang.meta.MetaLanguageSiblingLoader diff --git a/vasc-xpql-ejb3-server/src/main/resources/.empty b/vasc-lib/vasc-lib-xpql/src/test/java/.empty similarity index 100% rename from vasc-xpql-ejb3-server/src/main/resources/.empty rename to vasc-lib/vasc-lib-xpql/src/test/java/.empty diff --git a/vasc-lib/vasc-lib-xpql/src/test/java/net/forwardfire/vasc/xpql/XPQLDriverTest.java b/vasc-lib/vasc-lib-xpql/src/test/java/net/forwardfire/vasc/xpql/XPQLDriverTest.java new file mode 100644 index 0000000..dc11dce --- /dev/null +++ b/vasc-lib/vasc-lib-xpql/src/test/java/net/forwardfire/vasc/xpql/XPQLDriverTest.java @@ -0,0 +1,22 @@ +package net.forwardfire.vasc.xpql; + +import net.forwardfire.vasc.xpql.query.Query; + +import org.x4o.xml.io.X4OReader; + +import junit.framework.TestCase; + +public class XPQLDriverTest extends TestCase { + + public void testReader() throws Exception { + XPQLDriver driver = XPQLDriver.getInstance(); + X4OReader reader = driver.createReader(); + QueryStore store = reader.readResource("xpql/tests.xml"); + assertNotNull(store); + assertFalse(store.getQueryNames().isEmpty()); + for (Query q:store.getQueries()) { + System.out.println("Name: "+q.getName()); + System.out.println(q.toSQL(q)); + } + } +} diff --git a/vasc-xpql/src/test/resources/META-INF/logging.properties b/vasc-lib/vasc-lib-xpql/src/test/resources/META-INF/logging.properties similarity index 100% rename from vasc-xpql/src/test/resources/META-INF/logging.properties rename to vasc-lib/vasc-lib-xpql/src/test/resources/META-INF/logging.properties diff --git a/vasc-xpql/src/test/resources/xpql/test-meta.xml b/vasc-lib/vasc-lib-xpql/src/test/resources/xpql/test-meta.xml similarity index 100% rename from vasc-xpql/src/test/resources/xpql/test-meta.xml rename to vasc-lib/vasc-lib-xpql/src/test/resources/xpql/test-meta.xml diff --git a/vasc-xpql/src/test/resources/xpql/tests.xml b/vasc-lib/vasc-lib-xpql/src/test/resources/xpql/tests.xml similarity index 86% rename from vasc-xpql/src/test/resources/xpql/tests.xml rename to vasc-lib/vasc-lib-xpql/src/test/resources/xpql/tests.xml index f9454f2..266655c 100644 --- a/vasc-xpql/src/test/resources/xpql/tests.xml +++ b/vasc-lib/vasc-lib-xpql/src/test/resources/xpql/tests.xml @@ -1,6 +1,7 @@ - @@ -44,4 +45,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/vasc-test/pom.xml b/vasc-test/pom.xml index 98ab499..7a178c5 100644 --- a/vasc-test/pom.xml +++ b/vasc-test/pom.xml @@ -3,7 +3,7 @@ vasc net.forwardfire.vasc - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-test @@ -12,7 +12,8 @@ vasc-test vasc-test - vasc-test-frontend-data + vasc-test-frontend vasc-test-i18n + vasc-test-backend diff --git a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/.project b/vasc-test/vasc-test-backend/.project similarity index 93% rename from vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/.project rename to vasc-test/vasc-test-backend/.project index 7e8109c..de367ac 100644 --- a/vasc-demo/vasc-demo-tech/vasc-demo-tech-ejb3/.project +++ b/vasc-test/vasc-test-backend/.project @@ -1,6 +1,6 @@ - vasc-demo-tech-ejb3 + vasc-test-backend diff --git a/vasc-test/vasc-test-backend/pom.xml b/vasc-test/vasc-test-backend/pom.xml new file mode 100644 index 0000000..32ebadd --- /dev/null +++ b/vasc-test/vasc-test-backend/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + + net.forwardfire.vasc.test + vasc-test + 0.4.2-SNAPSHOT + + vasc-test-backend + vasc-test-backend + vasc-test-backend + + + \ No newline at end of file diff --git a/vasc-test/vasc-test-frontend-data/.project b/vasc-test/vasc-test-frontend/.project similarity index 100% rename from vasc-test/vasc-test-frontend-data/.project rename to vasc-test/vasc-test-frontend/.project diff --git a/vasc-test/vasc-test-frontend-data/pom.xml b/vasc-test/vasc-test-frontend/pom.xml similarity index 77% rename from vasc-test/vasc-test-frontend-data/pom.xml rename to vasc-test/vasc-test-frontend/pom.xml index 4227a8c..365ecea 100644 --- a/vasc-test/vasc-test-frontend-data/pom.xml +++ b/vasc-test/vasc-test-frontend/pom.xml @@ -3,13 +3,13 @@ vasc-test net.forwardfire.vasc.test - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. - vasc-test-frontend-data + vasc-test-frontend jar - vasc-test-frontend-data - vasc-test-frontend-data + vasc-test-frontend + vasc-test-frontend net.forwardfire.vasc diff --git a/vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java similarity index 100% rename from vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java rename to vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelData.java diff --git a/vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrder.java b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrder.java similarity index 100% rename from vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrder.java rename to vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrder.java diff --git a/vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrderLine.java b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrderLine.java similarity index 100% rename from vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrderLine.java rename to vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelOrderLine.java diff --git a/vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java similarity index 99% rename from vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java rename to vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java index 18f8d7d..02f97c4 100644 --- a/vasc-test/vasc-test-frontend-data/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java +++ b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.x4o.xml.element.DefaultElementObjectPropertyValue; import org.x4o.xml.element.ElementObjectPropertyValueException; -import org.x4o.xml.impl.DefaultElementObjectPropertyValue; import net.forwardfire.vasc.backend.AbstractVascBackend; import net.forwardfire.vasc.backend.VascBackendState; diff --git a/vasc-test/vasc-test-i18n/pom.xml b/vasc-test/vasc-test-i18n/pom.xml index c3123f4..9f4b09b 100644 --- a/vasc-test/vasc-test-i18n/pom.xml +++ b/vasc-test/vasc-test-i18n/pom.xml @@ -3,7 +3,7 @@ vasc-test net.forwardfire.vasc.test - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT .. vasc-test-i18n diff --git a/vasc-xpql-ejb3-client/pom.xml b/vasc-xpql-ejb3-client/pom.xml deleted file mode 100644 index dca8e7a..0000000 --- a/vasc-xpql-ejb3-client/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - 4.0.0 - - vasc - net.forwardfire.vasc - 0.4.1-SNAPSHOT - .. - - vasc-xpql-ejb3-client - vasc-xpql-ejb3-client - xpql parsing client interface for ejb3 - - - net.forwardfire.vasc - vasc-xpql - ${project.version} - - - javax.ejb - ejb-api - ${ejb-api.version} - provided - - - \ No newline at end of file diff --git a/vasc-xpql-ejb3-client/src/main/resources/META-INF/vasc/vasc-modules.xml b/vasc-xpql-ejb3-client/src/main/resources/META-INF/vasc/vasc-modules.xml deleted file mode 100644 index ad8eac7..0000000 --- a/vasc-xpql-ejb3-client/src/main/resources/META-INF/vasc/vasc-modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - vasc-xpql-ejb3.eld - - diff --git a/vasc-xpql-ejb3-client/src/main/resources/META-INF/vasc/vasc-xpql-ejb3.eld b/vasc-xpql-ejb3-client/src/main/resources/META-INF/vasc/vasc-xpql-ejb3.eld deleted file mode 100644 index 725a6cb..0000000 --- a/vasc-xpql-ejb3-client/src/main/resources/META-INF/vasc/vasc-xpql-ejb3.eld +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/vasc-xpql-ejb3-server/.project b/vasc-xpql-ejb3-server/.project deleted file mode 100644 index 30c4131..0000000 --- a/vasc-xpql-ejb3-server/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - vasc-xpql-ejb3 - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/vasc-xpql-ejb3-server/src/test/java/.empty b/vasc-xpql-ejb3-server/src/test/java/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/vasc-xpql-ejb3-server/src/test/resources/.empty b/vasc-xpql-ejb3-server/src/test/resources/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/vasc-xpql/pom.xml b/vasc-xpql/pom.xml deleted file mode 100644 index 66415f9..0000000 --- a/vasc-xpql/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - - vasc - net.forwardfire.vasc - 0.4.1-SNAPSHOT - - vasc-xpql - vasc-xpql - vasc xpql parser for queries. - - - org.x4o - x4o-core - ${x4o.version} - - - javax.servlet.jsp - jsp-api - ${jsp-api.version} - provided - - - diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLParser.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLParser.java deleted file mode 100644 index 30de69f..0000000 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLParser.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2007-2012 forwardfire.net 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. - */ - -package net.forwardfire.vasc.xpql; - -import java.util.HashMap; -import java.util.Map; - -import javax.el.ValueExpression; - -import org.x4o.xml.core.X4OParser; -import org.x4o.xml.core.config.X4OLanguageProperty; -import org.x4o.xml.element.ElementLanguage; - -/** - * Parse an xpql file/resource - * - * @author Willem Cazander - * @version 1.0 Aug 29, 2010 - */ -public class XPQLParser extends X4OParser { - - static public String XPQL_LANGUAGE = "xpql"; - - private QueryStore queryStore = null; - private Map beanMap = null; - - public XPQLParser() { - this(new QueryStore()); - } - - public XPQLParser(QueryStore queryStore) { - super(XPQL_LANGUAGE); - if (queryStore==null) { - throw new NullPointerException("Can work with null QueryStore."); - } - this.queryStore=queryStore; - beanMap = new HashMap(2); - beanMap.put("__queryStore__", queryStore); - setProperty(X4OLanguageProperty.EL_BEAN_INSTANCE_MAP.toUri(), beanMap); - } - - public QueryStore getQueryStore() { - return queryStore; - } - - static public QueryStore getQueryStore(ElementLanguage elementLanguage) { - if (elementLanguage==null) { - throw new NullPointerException("elementLanguage may not be null."); - } - ValueExpression ee = elementLanguage.getExpressionFactory().createValueExpression(elementLanguage.getELContext(),"${__queryStore__}",QueryStore.class); - QueryStore qs = (QueryStore)ee.getValue(elementLanguage.getELContext()); - return qs; - } -} \ No newline at end of file diff --git a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryElementConfigurator.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryElementConfigurator.java deleted file mode 100644 index d069c8d..0000000 --- a/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryElementConfigurator.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2007-2012 forwardfire.net 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. - */ - -package net.forwardfire.vasc.xpql.impl.x4o; - -import net.forwardfire.vasc.xpql.QueryStore; -import net.forwardfire.vasc.xpql.XPQLParser; -import net.forwardfire.vasc.xpql.query.Query; - -import org.x4o.xml.element.AbstractElementConfigurator; -import org.x4o.xml.element.Element; -import org.x4o.xml.element.ElementConfiguratorException; - - -/** - * - * @author Willem Cazander - * @version 1.0 Mar 21, 2007 - */ -public class QueryElementConfigurator extends AbstractElementConfigurator { - - /** - * @see org.x4o.xml.element.ElementConfigurator#doConfigElement(org.x4o.xml.element.Element) - */ - public void doConfigElement(Element element) throws ElementConfiguratorException { - if ((element.getElementObject() instanceof Query)==false) { - throw new ElementConfiguratorException(this,"No query element object"); - } - QueryStore store = XPQLParser.getQueryStore(element.getElementLanguage()); - Query query = (Query)element.getElementObject(); - query.setQueryStore(store); - store.addQuery(query); - } -} \ No newline at end of file diff --git a/vasc-xpql/src/main/resources/META-INF/vasc/vasc-xpql.eld b/vasc-xpql/src/main/resources/META-INF/vasc/vasc-xpql.eld deleted file mode 100644 index 43752f3..0000000 --- a/vasc-xpql/src/main/resources/META-INF/vasc/vasc-xpql.eld +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/vasc-xpql/src/test/java/.empty b/vasc-xpql/src/test/java/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/vasc-xpql/src/test/resources/xpql/test-all.xml b/vasc-xpql/src/test/resources/xpql/test-all.xml deleted file mode 100644 index 46cbf83..0000000 --- a/vasc-xpql/src/test/resources/xpql/test-all.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - LIMIT - - - - - - OFFSET - - - - - - - - - - SELECT - USERS.USERNAME AS USERNAME - USERS.PASSWD AS PASSWORD - FROM - USERS - - Bla bla - Also see this site http://www.google.com - - - - - - - - - - - - - - - - - - - - - - - - Beste ,
-
- Hier is uw factuur;
- datum:
- total:
- clickje -
-
- - - - -
-
- Groeten,
-
- - - - - - - - - - AND role is in - - - - - - - - \ No newline at end of file