diff --git a/demo-petstore/demo-petstore-ear/pom.xml b/demo-petstore/demo-petstore-ear/pom.xml index 37413da..9d49bce 100644 --- a/demo-petstore/demo-petstore-ear/pom.xml +++ b/demo-petstore/demo-petstore-ear/pom.xml @@ -2,10 +2,10 @@ 4.0.0 demo-petstore - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc demo-petstore-ear 0.3.5-SNAPSHOT \ No newline at end of file diff --git a/demo-petstore/demo-petstore-ejb/pom.xml b/demo-petstore/demo-petstore-ejb/pom.xml index 0a83ccd..c3c48f6 100644 --- a/demo-petstore/demo-petstore-ejb/pom.xml +++ b/demo-petstore/demo-petstore-ejb/pom.xml @@ -2,10 +2,10 @@ 4.0.0 demo-petstore - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc demo-petstore-ejb 0.3.5-SNAPSHOT ejb @@ -25,7 +25,7 @@ - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} @@ -59,29 +59,29 @@ provided - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} provided - org.x4o.vasc + net.forwardfire.vasc vasc-backend-jpa ${project.version} provided - org.x4o.vasc + net.forwardfire.vasc vasc-xpql ${project.version} - org.x4o.vasc + net.forwardfire.vasc vasc-xpql-ejb3 ${project.version} - org.x4o.vasc + net.forwardfire.vasc vasc-ejb3 ${project.version} diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java index 6a6c1e3..0034436 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/AbstractPetStoreFieldTemplates.java @@ -2,17 +2,18 @@ package demo.petstore.models; import java.util.Date; -import org.x4o.vasc.annotations.VascDefaultValue; -import org.x4o.vasc.annotations.VascDisplayName; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldOrder; -import org.x4o.vasc.annotations.VascFieldType; -import org.x4o.vasc.annotations.VascI18n; -import org.x4o.vasc.annotations.VascPrimaryKey; -import org.x4o.vasc.annotations.VascRoles; -import org.x4o.vasc.annotations.VascStyle; -import org.x4o.vasc.validators.VascObjectNotNull; -import org.x4o.vasc.validators.VascStringLength; +import net.forwardfire.vasc.annotations.VascDefaultValue; +import net.forwardfire.vasc.annotations.VascDisplayName; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldOrder; +import net.forwardfire.vasc.annotations.VascFieldType; +import net.forwardfire.vasc.annotations.VascI18n; +import net.forwardfire.vasc.annotations.VascPrimaryKey; +import net.forwardfire.vasc.annotations.VascRoles; +import net.forwardfire.vasc.annotations.VascStyle; +import net.forwardfire.vasc.validators.VascObjectNotNull; +import net.forwardfire.vasc.validators.VascStringLength; + abstract public class AbstractPetStoreFieldTemplates { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Category.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Category.java index a4e0d4e..9c58b9c 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Category.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Category.java @@ -4,8 +4,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; @Entity public class Category extends AbstractPetStoreEntity{ diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/CategoryProduct.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/CategoryProduct.java index 9ddfcf6..af3d887 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/CategoryProduct.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/CategoryProduct.java @@ -7,9 +7,9 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; -import org.x4o.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascModelReference; @Entity public class CategoryProduct extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Item.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Item.java index fde6535..57c30ec 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Item.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Item.java @@ -7,8 +7,8 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.x4o.vasc.annotations.VascFieldTemplate; -import org.x4o.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascModelReference; @Entity public class Item extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemInventory.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemInventory.java index 3091043..b7cccc1 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemInventory.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemInventory.java @@ -7,8 +7,8 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.x4o.vasc.annotations.VascFieldTemplate; -import org.x4o.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascModelReference; @Entity public class ItemInventory extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemSupplier.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemSupplier.java index 59e527b..ecf7ce0 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemSupplier.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/ItemSupplier.java @@ -4,8 +4,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; @Entity public class ItemSupplier extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Order.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Order.java index 773a1d8..bbcae95 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Order.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/Order.java @@ -9,9 +9,9 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; -import org.x4o.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascModelReference; @Entity public class Order extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderLine.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderLine.java index d5234b3..66cbf79 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderLine.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderLine.java @@ -7,9 +7,9 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; -import org.x4o.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascModelReference; @Entity public class OrderLine extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderStatus.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderStatus.java index 8b8d161..7669a4f 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderStatus.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/OrderStatus.java @@ -4,8 +4,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; @Entity public class OrderStatus extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserAccount.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserAccount.java index 027081c..6b00c38 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserAccount.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserAccount.java @@ -4,8 +4,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; @Entity public class UserAccount extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserCredential.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserCredential.java index fd64bfb..6b3497f 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserCredential.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserCredential.java @@ -7,9 +7,9 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; -import org.x4o.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascModelReference; @Entity public class UserCredential extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserProfile.java b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserProfile.java index 697b828..8b3676f 100644 --- a/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserProfile.java +++ b/demo-petstore/demo-petstore-ejb/src/main/java/demo/petstore/models/UserProfile.java @@ -7,10 +7,10 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import org.x4o.vasc.annotations.VascDefaultValue; -import org.x4o.vasc.annotations.VascField; -import org.x4o.vasc.annotations.VascFieldTemplate; -import org.x4o.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascDefaultValue; +import net.forwardfire.vasc.annotations.VascField; +import net.forwardfire.vasc.annotations.VascFieldTemplate; +import net.forwardfire.vasc.annotations.VascModelReference; @Entity public class UserProfile extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-war/pom.xml b/demo-petstore/demo-petstore-war/pom.xml index 69bb6f4..65a76ed 100644 --- a/demo-petstore/demo-petstore-war/pom.xml +++ b/demo-petstore/demo-petstore-war/pom.xml @@ -2,10 +2,10 @@ 4.0.0 demo-petstore - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc demo-petstore-war 0.3.5-SNAPSHOT \ No newline at end of file diff --git a/demo-petstore/pom.xml b/demo-petstore/pom.xml index e5da7c8..ac6a7c6 100644 --- a/demo-petstore/pom.xml +++ b/demo-petstore/pom.xml @@ -2,10 +2,10 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc demo-petstore 0.3.5-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 1f9f886..c0b8ade 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,17 @@ 4.0.0 -org.x4o.vasc +net.forwardfire.vasc vasc 0.3.5-SNAPSHOT pom vasc Very Amazing/Advanced/Amplified Simple CRUD'ing for all. -http://www.x4o.org/vasc +http://www.forwardfire.net/vasc 2007 - X4O.oth - http://www.x4o.org + ForwardFire.net + http://www.forwardfire.net @@ -35,6 +35,7 @@ vasc-xpql vasc-xpql-ejb3 demo-petstore + vasc-backend-mongodb https://...vasc/ diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt index c165bf5..5bf1d10 100644 --- a/src/site/apt/download.apt +++ b/src/site/apt/download.apt @@ -4,7 +4,7 @@ Downloading +-- - org.x4o.vasc + net.forwardfire.vasc vasc-core 0.5-SNAPSHOT diff --git a/vasc-backend-jpa/pom.xml b/vasc-backend-jpa/pom.xml index 2204e31..da4a134 100644 --- a/vasc-backend-jpa/pom.xml +++ b/vasc-backend-jpa/pom.xml @@ -2,17 +2,17 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-backend-jpa 0.3.5-SNAPSHOT vasc-backend-jpa vasc-backend-jpa - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} diff --git a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractHibernateVascBackend.java b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java similarity index 95% rename from vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractHibernateVascBackend.java rename to vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java index b71ab3b..0b1ac78 100644 --- a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractHibernateVascBackend.java +++ b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jpa; +package net.forwardfire.vasc.backends.jpa; + +import net.forwardfire.vasc.core.AbstractVascBackend; +import net.forwardfire.vasc.core.VascException; import org.hibernate.Session; -import org.x4o.vasc.core.AbstractVascBackend; -import org.x4o.vasc.core.VascException; /** diff --git a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractPersistenceVascBackend.java b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java similarity index 95% rename from vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractPersistenceVascBackend.java rename to vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java index 4f63818..95ba5c7 100644 --- a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractPersistenceVascBackend.java +++ b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java @@ -24,14 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jpa; +package net.forwardfire.vasc.backends.jpa; import java.lang.reflect.Method; import javax.persistence.EntityManager; -import org.x4o.vasc.core.AbstractVascBackend; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.AbstractVascBackend; +import net.forwardfire.vasc.core.VascException; /** diff --git a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/EntityManagerProvider.java b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/EntityManagerProvider.java similarity index 97% rename from vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/EntityManagerProvider.java rename to vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/EntityManagerProvider.java index 3088284..92e00f2 100644 --- a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/EntityManagerProvider.java +++ b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/EntityManagerProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jpa; +package net.forwardfire.vasc.backends.jpa; import javax.persistence.EntityManager; diff --git a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/HibernateSessionProvider.java b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/HibernateSessionProvider.java similarity index 97% rename from vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/HibernateSessionProvider.java rename to vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/HibernateSessionProvider.java index 70254c0..d82d6ca 100644 --- a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/HibernateSessionProvider.java +++ b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/HibernateSessionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jpa; +package net.forwardfire.vasc.backends.jpa; import org.hibernate.Session; diff --git a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlHibernateVascBackend.java b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java similarity index 79% rename from vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlHibernateVascBackend.java rename to vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java index d5a201e..e8f2860 100644 --- a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlHibernateVascBackend.java +++ b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java @@ -24,22 +24,23 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jpa; +package net.forwardfire.vasc.backends.jpa; import java.util.List; +import net.forwardfire.vasc.backends.BeanVascEntryFieldValue; +import net.forwardfire.vasc.backends.BeanVascEntryRecordCreator; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; + import org.hibernate.Hibernate; import org.hibernate.Query; import org.hibernate.Session; -import org.x4o.vasc.backends.BeanVascEntryFieldValue; -import org.x4o.vasc.backends.BeanVascEntryRecordCreator; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; -import org.x4o.vasc.xpql.query.QueryParameterValue; /** @@ -52,17 +53,17 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { private HibernateSessionProvider hibernateSessionProvider = null; - private org.x4o.vasc.xpql.query.Query query = null; + private net.forwardfire.vasc.xpql.query.Query query = null; - private org.x4o.vasc.xpql.query.Query queryTotal = null; + private net.forwardfire.vasc.xpql.query.Query queryTotal = null; - private org.x4o.vasc.xpql.query.Query queryMoveUp = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveUp = null; - private org.x4o.vasc.xpql.query.Query queryMoveUpDown = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveUpDown = null; - private org.x4o.vasc.xpql.query.Query queryMoveDown = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveDown = null; - private org.x4o.vasc.xpql.query.Query queryMoveDownUp = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveDownUp = null; private Class resultClass = null; @@ -70,7 +71,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() + * @see net.forwardfire.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() */ @Override Session getHibernateSession() { @@ -119,7 +120,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryFieldValue(net.forwardfire.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { BeanVascEntryFieldValue result = new BeanVascEntryFieldValue(); @@ -127,7 +128,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new BeanVascEntryRecordCreator(resultClass); @@ -136,28 +137,28 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { /** * @return the query */ - public org.x4o.vasc.xpql.query.Query getQuery() { + public net.forwardfire.vasc.xpql.query.Query getQuery() { return query; } /** * @param query the query to set */ - public void setQuery(org.x4o.vasc.xpql.query.Query query) { + public void setQuery(net.forwardfire.vasc.xpql.query.Query query) { this.query = query; } /** * @return the queryTotal */ - public org.x4o.vasc.xpql.query.Query getQueryTotal() { + public net.forwardfire.vasc.xpql.query.Query getQueryTotal() { return queryTotal; } /** * @param queryTotal the queryTotal to set */ - public void setQueryTotal(org.x4o.vasc.xpql.query.Query queryTotal) { + public void setQueryTotal(net.forwardfire.vasc.xpql.query.Query queryTotal) { this.queryTotal = queryTotal; } @@ -190,7 +191,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.core.AbstractVascBackend#isPageable() + * @see net.forwardfire.vasc.core.AbstractVascBackend#isPageable() */ @Override public boolean isPageable() { @@ -201,7 +202,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { Session s = getHibernateSession(); @@ -230,7 +231,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveDownById(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackend#doRecordMoveDownById(java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { @@ -299,7 +300,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveUpById(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackend#doRecordMoveUpById(java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { @@ -368,7 +369,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see org.x4o.vasc.core.AbstractVascBackend#isRecordMoveable() + * @see net.forwardfire.vasc.core.AbstractVascBackend#isRecordMoveable() */ @Override public boolean isRecordMoveable() { @@ -378,56 +379,56 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { /** * @return the queryMoveUp */ - public org.x4o.vasc.xpql.query.Query getQueryMoveUp() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveUp() { return queryMoveUp; } /** * @param queryMoveUp the queryMoveUp to set */ - public void setQueryMoveUp(org.x4o.vasc.xpql.query.Query queryMoveUp) { + public void setQueryMoveUp(net.forwardfire.vasc.xpql.query.Query queryMoveUp) { this.queryMoveUp = queryMoveUp; } /** * @return the queryMoveDown */ - public org.x4o.vasc.xpql.query.Query getQueryMoveDown() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveDown() { return queryMoveDown; } /** * @param queryMoveDown the queryMoveDown to set */ - public void setQueryMoveDown(org.x4o.vasc.xpql.query.Query queryMoveDown) { + public void setQueryMoveDown(net.forwardfire.vasc.xpql.query.Query queryMoveDown) { this.queryMoveDown = queryMoveDown; } /** * @return the queryMoveUpDown */ - public org.x4o.vasc.xpql.query.Query getQueryMoveUpDown() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveUpDown() { return queryMoveUpDown; } /** * @param queryMoveUpDown the queryMoveUpDown to set */ - public void setQueryMoveUpDown(org.x4o.vasc.xpql.query.Query queryMoveUpDown) { + public void setQueryMoveUpDown(net.forwardfire.vasc.xpql.query.Query queryMoveUpDown) { this.queryMoveUpDown = queryMoveUpDown; } /** * @return the queryMoveDownUp */ - public org.x4o.vasc.xpql.query.Query getQueryMoveDownUp() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveDownUp() { return queryMoveDownUp; } /** * @param queryMoveDownUp the queryMoveDownUp to set */ - public void setQueryMoveDownUp(org.x4o.vasc.xpql.query.Query queryMoveDownUp) { + public void setQueryMoveDownUp(net.forwardfire.vasc.xpql.query.Query queryMoveDownUp) { this.queryMoveDownUp = queryMoveDownUp; } } \ No newline at end of file diff --git a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlPersistanceVascBackend.java b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java similarity index 78% rename from vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlPersistanceVascBackend.java rename to vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java index 6016def..dbc8d74 100644 --- a/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlPersistanceVascBackend.java +++ b/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java @@ -24,22 +24,23 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jpa; +package net.forwardfire.vasc.backends.jpa; import java.util.List; import javax.persistence.EntityManager; import javax.persistence.Query; -import org.x4o.vasc.backends.BeanVascEntryFieldValue; -import org.x4o.vasc.backends.BeanVascEntryRecordCreator; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; -import org.x4o.vasc.xpql.query.QueryParameterValue; +import net.forwardfire.vasc.backends.BeanVascEntryFieldValue; +import net.forwardfire.vasc.backends.BeanVascEntryRecordCreator; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; + /** @@ -52,17 +53,17 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend private EntityManagerProvider entityManagerProvider = null; - private org.x4o.vasc.xpql.query.Query query = null; + private net.forwardfire.vasc.xpql.query.Query query = null; - private org.x4o.vasc.xpql.query.Query queryTotal = null; + private net.forwardfire.vasc.xpql.query.Query queryTotal = null; - private org.x4o.vasc.xpql.query.Query queryMoveUp = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveUp = null; - private org.x4o.vasc.xpql.query.Query queryMoveUpDown = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveUpDown = null; - private org.x4o.vasc.xpql.query.Query queryMoveDown = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveDown = null; - private org.x4o.vasc.xpql.query.Query queryMoveDownUp = null; + private net.forwardfire.vasc.xpql.query.Query queryMoveDownUp = null; private Class resultClass = null; @@ -70,7 +71,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see org.x4o.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() + * @see net.forwardfire.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() */ @Override EntityManager getEntityManager() { @@ -124,7 +125,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryFieldValue(net.forwardfire.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { VascEntryFieldValue result = new BeanVascEntryFieldValue(); @@ -132,7 +133,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { VascEntryRecordCreator result = new BeanVascEntryRecordCreator(resultClass); @@ -142,28 +143,28 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend /** * @return the query */ - public org.x4o.vasc.xpql.query.Query getQuery() { + public net.forwardfire.vasc.xpql.query.Query getQuery() { return query; } /** * @param query the query to set */ - public void setQuery(org.x4o.vasc.xpql.query.Query query) { + public void setQuery(net.forwardfire.vasc.xpql.query.Query query) { this.query = query; } /** * @return the queryTotal */ - public org.x4o.vasc.xpql.query.Query getQueryTotal() { + public net.forwardfire.vasc.xpql.query.Query getQueryTotal() { return queryTotal; } /** * @param queryTotal the queryTotal to set */ - public void setQueryTotal(org.x4o.vasc.xpql.query.Query queryTotal) { + public void setQueryTotal(net.forwardfire.vasc.xpql.query.Query queryTotal) { this.queryTotal = queryTotal; } @@ -196,7 +197,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see org.x4o.vasc.core.AbstractVascBackend#isPageable() + * @see net.forwardfire.vasc.core.AbstractVascBackend#isPageable() */ @Override public boolean isPageable() { @@ -207,7 +208,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { EntityManager em = getEntityManager(); @@ -236,7 +237,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend /** - * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { @@ -299,7 +300,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { @@ -362,7 +363,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see org.x4o.vasc.core.AbstractVascBackend#isRecordMoveable() + * @see net.forwardfire.vasc.core.AbstractVascBackend#isRecordMoveable() */ @Override public boolean isRecordMoveable() { @@ -372,61 +373,61 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend /** * @return the queryMoveUp */ - public org.x4o.vasc.xpql.query.Query getQueryMoveUp() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveUp() { return queryMoveUp; } /** * @param queryMoveUp the queryMoveUp to set */ - public void setQueryMoveUp(org.x4o.vasc.xpql.query.Query queryMoveUp) { + public void setQueryMoveUp(net.forwardfire.vasc.xpql.query.Query queryMoveUp) { this.queryMoveUp = queryMoveUp; } /** * @return the queryMoveDown */ - public org.x4o.vasc.xpql.query.Query getQueryMoveDown() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveDown() { return queryMoveDown; } /** * @param queryMoveDown the queryMoveDown to set */ - public void setQueryMoveDown(org.x4o.vasc.xpql.query.Query queryMoveDown) { + public void setQueryMoveDown(net.forwardfire.vasc.xpql.query.Query queryMoveDown) { this.queryMoveDown = queryMoveDown; } /** * @return the queryMoveUpDown */ - public org.x4o.vasc.xpql.query.Query getQueryMoveUpDown() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveUpDown() { return queryMoveUpDown; } /** * @param queryMoveUpDown the queryMoveUpDown to set */ - public void setQueryMoveUpDown(org.x4o.vasc.xpql.query.Query queryMoveUpDown) { + public void setQueryMoveUpDown(net.forwardfire.vasc.xpql.query.Query queryMoveUpDown) { this.queryMoveUpDown = queryMoveUpDown; } /** * @return the queryMoveDownUp */ - public org.x4o.vasc.xpql.query.Query getQueryMoveDownUp() { + public net.forwardfire.vasc.xpql.query.Query getQueryMoveDownUp() { return queryMoveDownUp; } /** * @param queryMoveDownUp the queryMoveDownUp to set */ - public void setQueryMoveDownUp(org.x4o.vasc.xpql.query.Query queryMoveDownUp) { + public void setQueryMoveDownUp(net.forwardfire.vasc.xpql.query.Query queryMoveDownUp) { this.queryMoveDownUp = queryMoveDownUp; } /** - * @see org.x4o.vasc.core.VascBackend#isSearchable() + * @see net.forwardfire.vasc.core.VascBackend#isSearchable() */ public boolean isSearchable() { if (query.getQueryParameterValue("text_search")==null) { diff --git a/vasc-backend-ldap/pom.xml b/vasc-backend-ldap/pom.xml index 5b95ef3..e0c3bdd 100644 --- a/vasc-backend-ldap/pom.xml +++ b/vasc-backend-ldap/pom.xml @@ -2,17 +2,17 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-backend-ldap 0.3.5-SNAPSHOT vasc-backend-ldap vasc-backend-ldap - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} diff --git a/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapConnectionProvider.java b/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapConnectionProvider.java similarity index 97% rename from vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapConnectionProvider.java rename to vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapConnectionProvider.java index 84cd8f0..6179a9e 100644 --- a/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapConnectionProvider.java +++ b/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.ldap; +package net.forwardfire.vasc.backends.ldap; import com.novell.ldap.LDAPConnection; diff --git a/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapVascBackend.java b/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapVascBackend.java similarity index 90% rename from vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapVascBackend.java rename to vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapVascBackend.java index 8f9aea5..e506830 100644 --- a/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapVascBackend.java +++ b/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/LdapVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.ldap; +package net.forwardfire.vasc.backends.ldap; import java.util.ArrayList; import java.util.HashMap; @@ -32,15 +32,16 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.x4o.vasc.backends.MapVascEntryFieldValue; -import org.x4o.vasc.backends.MapVascEntryRecordCreator; -import org.x4o.vasc.core.AbstractVascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.backends.MapVascEntryFieldValue; +import net.forwardfire.vasc.backends.MapVascEntryRecordCreator; +import net.forwardfire.vasc.core.AbstractVascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; + import com.novell.ldap.LDAPAttribute; import com.novell.ldap.LDAPAttributeSet; @@ -51,6 +52,7 @@ import com.novell.ldap.LDAPSearchConstraints; import com.novell.ldap.LDAPSearchResults; /** + * Provides backend for ldap. * * @author Willem Cazander * @version 1.0 Sep 4, 2008 @@ -82,7 +84,7 @@ public class LdapVascBackend extends AbstractVascBackend { /** - * @see org.x4o.vasc.core.VascBackend#execute() + * @see net.forwardfire.vasc.core.VascBackend#execute() */ public List execute(VascBackendState state) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -141,7 +143,7 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -221,7 +223,7 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -241,7 +243,7 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -275,14 +277,14 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new MapVascEntryRecordCreator(); } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryFieldValue(net.forwardfire.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return new MapVascEntryFieldValue(); diff --git a/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/SimpleLdapConnectionProvider.java b/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/SimpleLdapConnectionProvider.java similarity index 96% rename from vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/SimpleLdapConnectionProvider.java rename to vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/SimpleLdapConnectionProvider.java index 9e4ef8e..3b1ad8c 100644 --- a/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/SimpleLdapConnectionProvider.java +++ b/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backends/ldap/SimpleLdapConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.ldap; +package net.forwardfire.vasc.backends.ldap; import com.novell.ldap.LDAPConnection; @@ -42,7 +42,7 @@ public class SimpleLdapConnectionProvider implements LdapConnectionProvider { private String bindPass = null; /** - * @see org.x4o.vasc.backends.ldap.LdapConnectionProvider#getLdapConnection() + * @see net.forwardfire.vasc.backends.ldap.LdapConnectionProvider#getLdapConnection() */ public LDAPConnection getLdapConnection() { try { diff --git a/vasc-backend-mongodb/.classpath b/vasc-backend-mongodb/.classpath new file mode 100644 index 0000000..3c96d64 --- /dev/null +++ b/vasc-backend-mongodb/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/vasc-backend-mongodb/.project b/vasc-backend-mongodb/.project new file mode 100644 index 0000000..b45df28 --- /dev/null +++ b/vasc-backend-mongodb/.project @@ -0,0 +1,23 @@ + + + vasc-backend-mongodb + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs b/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..549f612 --- /dev/null +++ b/vasc-backend-mongodb/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Fri Dec 30 00:10:52 CET 2011 +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs b/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..2489959 --- /dev/null +++ b/vasc-backend-mongodb/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,6 @@ +#Fri Dec 30 00:10:52 CET 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs b/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..6dd737b --- /dev/null +++ b/vasc-backend-mongodb/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Fri Dec 30 00:10:52 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-backend-mongodb/pom.xml b/vasc-backend-mongodb/pom.xml new file mode 100644 index 0000000..b9673df --- /dev/null +++ b/vasc-backend-mongodb/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + + vasc + net.forwardfire.vasc + 0.3.5-SNAPSHOT + .. + + vasc-backend-mongodb + vasc-backend-mongodb + vasc-backend-mongodb + + + net.forwardfire.vasc + vasc-core + ${project.version} + + + org.mongodb + mongo-java-driver + 2.7.2 + + + \ No newline at end of file diff --git a/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnection.java b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnection.java new file mode 100644 index 0000000..ea2b337 --- /dev/null +++ b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnection.java @@ -0,0 +1,146 @@ +/* + * Copyright 2004-2007 IDCA. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the + * following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and + * the following disclaimer. + * 2. 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 IDCA 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 IDCA 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. + * + * The views and conclusions contained in the software and documentation are those of the authors and + * should not be interpreted as representing official policies, either expressed or implied, of IDCA. + */ + +package net.forwardfire.vasc.backends.mongodb; + +import java.net.UnknownHostException; + +import com.mongodb.DB; +import com.mongodb.Mongo; +import com.mongodb.MongoOptions; +import com.mongodb.ServerAddress; + +/** + * Provides an mongodb DB connection to the backend. + * + * @author Willem Cazander + * @version 1.0 Dec 30, 2011 + */ +public class MongodbConnection implements MongodbConnectionProvider { + + private String hostname = "localhost"; + private int port = 27017; + private String database = null; + private String username = null; + private String password = null; + + protected Mongo mongo = null; + protected DB db = null; + + public DB getMongodbConnection() { + if (db!=null) { + return db; + } + synchronized (this) { + ServerAddress server; + try { + server = new ServerAddress(hostname,port); + } catch (UnknownHostException e) { + throw new RuntimeException(e); + } + MongoOptions options = new MongoOptions(); + mongo = new Mongo(server,options); + db = mongo.getDB(database); + if (username!=null && password!=null) { + boolean auth = db.authenticate(username, password.toCharArray()); + if (auth==false) { + throw new RuntimeException("Could not auth to db: "+database+" with username: "+username); + } + } + } + return db; + } + + /** + * @return the hostname + */ + public String getHostname() { + return hostname; + } + + /** + * @param hostname the hostname to set + */ + public void setHostname(String hostname) { + this.hostname = hostname; + } + + /** + * @return the port + */ + public int getPort() { + return port; + } + + /** + * @param port the port to set + */ + public void setPort(int port) { + this.port = port; + } + + /** + * @return the database + */ + public String getDatabase() { + return database; + } + + /** + * @param database the database to set + */ + public void setDatabase(String database) { + this.database = database; + } + + /** + * @return the username + */ + public String getUsername() { + return username; + } + + /** + * @param username the username to set + */ + public void setUsername(String username) { + this.username = username; + } + + /** + * @return the password + */ + public String getPassword() { + return password; + } + + /** + * @param password the password to set + */ + public void setPassword(String password) { + this.password = password; + } +} diff --git a/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnectionProvider.java b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnectionProvider.java new file mode 100644 index 0000000..1502732 --- /dev/null +++ b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbConnectionProvider.java @@ -0,0 +1,44 @@ +/* + * Copyright 2004-2007 IDCA. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the + * following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and + * the following disclaimer. + * 2. 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 IDCA 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 IDCA 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. + * + * The views and conclusions contained in the software and documentation are those of the authors and + * should not be interpreted as representing official policies, either expressed or implied, of IDCA. + */ + +package net.forwardfire.vasc.backends.mongodb; + +import com.mongodb.DB; + +/** + * Provides an mongodb DB connection to the backend. + * + * @author Willem Cazander + * @version 1.0 Dec 30, 2011 + */ +public interface MongodbConnectionProvider { + + /** + * Returns a DB connection. + * @return An DB connection to mongodb + */ + public DB getMongodbConnection(); +} diff --git a/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascBackend.java b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascBackend.java new file mode 100644 index 0000000..3169afd --- /dev/null +++ b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascBackend.java @@ -0,0 +1,124 @@ +/* + * Copyright 2004-2007 IDCA. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the + * following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and + * the following disclaimer. + * 2. 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 IDCA 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 IDCA 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. + * + * The views and conclusions contained in the software and documentation are those of the authors and + * should not be interpreted as representing official policies, either expressed or implied, of IDCA. + */ + +package net.forwardfire.vasc.backends.mongodb; + +import java.util.ArrayList; +import java.util.List; + +import net.forwardfire.vasc.core.AbstractVascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; + + +import com.mongodb.DB; +import com.mongodb.DBCollection; +import com.mongodb.DBCursor; +import com.mongodb.DBObject; + +/** + * Provides backend for mongodb. + * + * @author Willem Cazander + * @version 1.0 Dec 30, 2011 + */ +public class MongodbVascBackend extends AbstractVascBackend { + + private MongodbConnectionProvider connectionProvider = null; + private String collection = null; + + public List execute(VascBackendState state) throws VascException { + DBCollection coll = getDBCollection(); + DBCursor cur = coll.find(); + //cur.count(); + List result = new ArrayList(cur.count()); + while (cur.hasNext()) { + DBObject row = cur.next(); + result.add(row); + } + return result; + } + + public void persist(Object object) throws VascException { + DBCollection coll = getDBCollection(); + coll.insert((DBObject)object); + } + + public Object merge(Object object) throws VascException { + DBCollection coll = getDBCollection(); + return coll.save((DBObject)object); + } + + public void delete(Object object) throws VascException { + DBCollection coll = getDBCollection(); + coll.remove((DBObject)object); + } + + public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { + return new MongodbVascEntryFieldValue(); + } + + public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { + return new MongodbVascEntryRecordCreator(); + } + + private DBCollection getDBCollection() { + DB db = connectionProvider.getMongodbConnection(); + return db.getCollection(collection); + } + + /** + * @return the connectionProvider + */ + public MongodbConnectionProvider getConnectionProvider() { + return connectionProvider; + } + + /** + * @param connectionProvider the connectionProvider to set + */ + public void setConnectionProvider(MongodbConnectionProvider connectionProvider) { + this.connectionProvider = connectionProvider; + } + + /** + * @return the collection + */ + public String getCollection() { + return collection; + } + + /** + * @param collection the collection to set + */ + public void setCollection(String collection) { + this.collection = collection; + } +} diff --git a/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryFieldValue.java b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryFieldValue.java new file mode 100644 index 0000000..0c15a58 --- /dev/null +++ b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryFieldValue.java @@ -0,0 +1,63 @@ +/* + * Copyright 2004-2007 IDCA. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the + * following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and + * the following disclaimer. + * 2. 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 IDCA 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 IDCA 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. + * + * The views and conclusions contained in the software and documentation are those of the authors and + * should not be interpreted as representing official policies, either expressed or implied, of IDCA. + */ + +package net.forwardfire.vasc.backends.mongodb; + +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; + + +import com.mongodb.BasicDBObject; + +/** + * Provides a mongodb field entry knowlege. + * + * @author Willem Cazander + * @version 1.0 Dec 30, 2011 + */ +public class MongodbVascEntryFieldValue implements VascEntryFieldValue { + + private static final long serialVersionUID = -7371273796529818557L; + + public Object getValue(VascEntryField field, Object record) throws VascException { + BasicDBObject row = (BasicDBObject)record; + Object r = row.get(field.getBackendName()); + if (r==null) { + return ""; // create new value, TODO + } + return r; + } + + public String getDisplayValue(VascEntryField field, Object record) throws VascException { + return ""+getValue(field,record); // not supported TODO + } + + public void setValue(VascEntryField field, Object record, Object value) throws VascException { + BasicDBObject row = (BasicDBObject)record; + row.put(field.getBackendName(), value); + } +} diff --git a/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryRecordCreator.java b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryRecordCreator.java new file mode 100644 index 0000000..3723e71 --- /dev/null +++ b/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backends/mongodb/MongodbVascEntryRecordCreator.java @@ -0,0 +1,53 @@ +/* + * Copyright 2004-2007 IDCA. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the + * following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and + * the following disclaimer. + * 2. 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 IDCA 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 IDCA 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. + * + * The views and conclusions contained in the software and documentation are those of the authors and + * should not be interpreted as representing official policies, either expressed or implied, of IDCA. + */ + + +package net.forwardfire.vasc.backends.mongodb; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; + + +import com.mongodb.BasicDBObject; + +/** + * Provides a mongodb object to create a new row. + * + * @author Willem Cazander + * @version 1.0 Dec 30, 2011 + */ +public class MongodbVascEntryRecordCreator implements VascEntryRecordCreator { + + private static final long serialVersionUID = -9213830731796787384L; + + public Object newRecord(VascEntry entry) throws Exception { + return new BasicDBObject(); + } + + public Class getObjectClass() { + return BasicDBObject.class; + } +} diff --git a/vasc-core/pom.xml b/vasc-core/pom.xml index 94ad85b..27888b7 100644 --- a/vasc-core/pom.xml +++ b/vasc-core/pom.xml @@ -2,10 +2,10 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-core 0.3.5-SNAPSHOT vasc-core @@ -17,7 +17,7 @@ ${x4o-core.version} - org.x4o.vasc + net.forwardfire.vasc vasc-xpql ${project.version} diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascAnnotationParser.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascAnnotationParser.java similarity index 99% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascAnnotationParser.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascAnnotationParser.java index 7514edb..6f194ba 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascAnnotationParser.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascAnnotationParser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascBundleKeyGenerator.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascBundleKeyGenerator.java similarity index 99% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascBundleKeyGenerator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascBundleKeyGenerator.java index 7bc148b..70f07d8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascBundleKeyGenerator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascBundleKeyGenerator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoices.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoices.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoices.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoices.java index d96e8c6..7787980 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoices.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoices.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoicesSelectItemModel.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoicesSelectItemModel.java similarity index 85% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoicesSelectItemModel.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoicesSelectItemModel.java index fd7a611..dc3480a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoicesSelectItemModel.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoicesSelectItemModel.java @@ -1,15 +1,16 @@ /** * */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascSelectItem; -import org.x4o.vasc.core.ui.VascSelectItemModel; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascSelectItem; +import net.forwardfire.vasc.core.ui.VascSelectItemModel; + /** @@ -31,9 +32,9 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa } /** - * @see org.x4o.vasc.core.ui.VascSelectItemModel#getVascSelectItems(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.ui.VascSelectItemModel#getVascSelectItems(net.forwardfire.vasc.core.VascEntry) */ - public List getVascSelectItems(org.x4o.vasc.core.VascEntry entry) throws VascException { + public List getVascSelectItems(net.forwardfire.vasc.core.VascEntry entry) throws VascException { List result = new ArrayList(10); if ("null".equals(vascChoices.nullLabel())==false) { nullLabel = vascChoices.nullLabel(); diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDefaultValue.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascDefaultValue.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascDefaultValue.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascDefaultValue.java index f8a1060..9aa07d0 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDefaultValue.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascDefaultValue.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDisplayName.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascDisplayName.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascDisplayName.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascDisplayName.java index 100dd76..6ef29d1 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDisplayName.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascDisplayName.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEntry.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEntry.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascEntry.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEntry.java index 75d5b89..deba830 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEntry.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEntry.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventChannel.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEventChannel.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventChannel.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEventChannel.java index 1d09bc0..131dc7d 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventChannel.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEventChannel.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEventListener.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEventListener.java index 1f57f57..72074c8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascEventListener.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascField.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascField.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascField.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascField.java index c58c0e9..74f3684 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascField.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascField.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldOrder.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldOrder.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldOrder.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldOrder.java index ee48e11..00e9668 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldOrder.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldOrder.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldTemplate.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldTemplate.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldTemplate.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldTemplate.java index 54dafbf..0995c37 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldTemplate.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldTemplate.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldType.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldType.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldType.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldType.java index 589cfd0..6c335cd 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldType.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascFieldType.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascI18n.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascI18n.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascI18n.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascI18n.java index 5725846..4863102 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascI18n.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascI18n.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascModelReference.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascModelReference.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascModelReference.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascModelReference.java index 2726ba3..3b39ed7 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascModelReference.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascModelReference.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascPrimaryKey.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascPrimaryKey.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascPrimaryKey.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascPrimaryKey.java index 3803b0f..d3286f0 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascPrimaryKey.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascPrimaryKey.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascRoles.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascRoles.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascRoles.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascRoles.java index cb651c1..38423a0 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascRoles.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascRoles.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascStyle.java b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascStyle.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/annotations/VascStyle.java rename to vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascStyle.java index 80c9498..82f36c9 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/annotations/VascStyle.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascStyle.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.annotations; +package net.forwardfire.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryFieldValue.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/BeanVascEntryFieldValue.java similarity index 85% rename from vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryFieldValue.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/BeanVascEntryFieldValue.java index b5e6b2a..35e0d47 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryFieldValue.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/BeanVascEntryFieldValue.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends; +package net.forwardfire.vasc.backends; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; + import org.x4o.xml.impl.DefaultElementObjectPropertyValue; /** @@ -43,7 +44,7 @@ public class BeanVascEntryFieldValue implements VascEntryFieldValue { private DefaultElementObjectPropertyValue bean = new DefaultElementObjectPropertyValue(); /** - * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object) */ public Object getValue(VascEntryField field, Object record) throws VascException { if (field==null) { @@ -64,7 +65,7 @@ public class BeanVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getDisplayValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getDisplayValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object) */ public String getDisplayValue(VascEntryField field, Object record) throws VascException { Object value = getValue(field,record); @@ -89,7 +90,7 @@ public class BeanVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see org.x4o.vasc.core.entry.VascEntryFieldValue#setValue(org.x4o.vasc.core.VascEntryField, java.lang.Object, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#setValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object, java.lang.Object) */ public void setValue(VascEntryField field, Object record,Object value) throws VascException { if (field==null) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryRecordCreator.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/BeanVascEntryRecordCreator.java similarity index 80% rename from vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryRecordCreator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/BeanVascEntryRecordCreator.java index f840fb5..f43e6bb 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryRecordCreator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/BeanVascEntryRecordCreator.java @@ -1,10 +1,11 @@ /** * */ -package org.x4o.vasc.backends; +package net.forwardfire.vasc.backends; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryFieldValue.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/MapVascEntryFieldValue.java similarity index 62% rename from vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryFieldValue.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/MapVascEntryFieldValue.java index aa94251..faa14e6 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryFieldValue.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/MapVascEntryFieldValue.java @@ -1,13 +1,14 @@ /** * */ -package org.x4o.vasc.backends; +package net.forwardfire.vasc.backends; import java.util.Map; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; + /** @@ -19,7 +20,7 @@ public class MapVascEntryFieldValue implements VascEntryFieldValue { private static final long serialVersionUID = 1L; /** - * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object) */ @SuppressWarnings("unchecked") public Object getValue(VascEntryField field, Object record) throws VascException { @@ -32,14 +33,14 @@ public class MapVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getDisplayValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getDisplayValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object) */ public String getDisplayValue(VascEntryField field, Object record) throws VascException { return ""+getValue(field,record); // not supported (this)ldap is already fully string based. } /** - * @see org.x4o.vasc.core.entry.VascEntryFieldValue#setValue(org.x4o.vasc.core.VascEntryField, java.lang.Object, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#setValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object, java.lang.Object) */ @SuppressWarnings("unchecked") public void setValue(VascEntryField field, Object record,Object value) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryRecordCreator.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/MapVascEntryRecordCreator.java similarity index 72% rename from vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryRecordCreator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/MapVascEntryRecordCreator.java index 82a4a99..45e741a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryRecordCreator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/MapVascEntryRecordCreator.java @@ -1,13 +1,14 @@ /** * */ -package org.x4o.vasc.backends; +package net.forwardfire.vasc.backends; import java.util.HashMap; import java.util.Map; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcConnectionProvider.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcConnectionProvider.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcConnectionProvider.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcConnectionProvider.java index 1f77975..766f6e8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcConnectionProvider.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jdbc; +package net.forwardfire.vasc.backends.jdbc; import java.sql.Connection; import java.sql.SQLException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcVascBackend.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcVascBackend.java similarity index 79% rename from vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcVascBackend.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcVascBackend.java index b970153..cae9328 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcVascBackend.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jdbc; +package net.forwardfire.vasc.backends.jdbc; import java.sql.Connection; import java.sql.ResultSet; @@ -34,15 +34,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.backends.MapVascEntryFieldValue; -import org.x4o.vasc.backends.MapVascEntryRecordCreator; -import org.x4o.vasc.core.AbstractVascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.backends.MapVascEntryFieldValue; +import net.forwardfire.vasc.backends.MapVascEntryRecordCreator; +import net.forwardfire.vasc.core.AbstractVascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; + /** @@ -74,7 +75,7 @@ public class JdbcVascBackend extends AbstractVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ public List execute(VascBackendState state) throws VascException { JdbcConnectionProvider prov = getJdbcConnectionProvider(); @@ -109,33 +110,33 @@ public class JdbcVascBackend extends AbstractVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { return object; } /** - * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { } /** - * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryFieldValue(net.forwardfire.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return new MapVascEntryFieldValue(); } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new MapVascEntryRecordCreator(); diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcXpqlVascBackend.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcXpqlVascBackend.java similarity index 76% rename from vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcXpqlVascBackend.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcXpqlVascBackend.java index 92d96de..21d5111 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcXpqlVascBackend.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdbcXpqlVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jdbc; +package net.forwardfire.vasc.backends.jdbc; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,16 +34,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.backends.MapVascEntryFieldValue; -import org.x4o.vasc.backends.MapVascEntryRecordCreator; -import org.x4o.vasc.core.AbstractVascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; -import org.x4o.vasc.xpql.query.QueryParameterValue; +import net.forwardfire.vasc.backends.MapVascEntryFieldValue; +import net.forwardfire.vasc.backends.MapVascEntryRecordCreator; +import net.forwardfire.vasc.core.AbstractVascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; + /** @@ -55,7 +56,7 @@ public class JdbcXpqlVascBackend extends AbstractVascBackend { private JdbcConnectionProvider jdbcConnectionProvider = null; - private org.x4o.vasc.xpql.query.Query query = null; + private net.forwardfire.vasc.xpql.query.Query query = null; /** * @return the JdbcConnectionProvider @@ -74,19 +75,19 @@ public class JdbcXpqlVascBackend extends AbstractVascBackend { /** * @return the query */ - public org.x4o.vasc.xpql.query.Query getQuery() { + public net.forwardfire.vasc.xpql.query.Query getQuery() { return query; } /** * @param query the query to set */ - public void setQuery(org.x4o.vasc.xpql.query.Query query) { + public void setQuery(net.forwardfire.vasc.xpql.query.Query query) { this.query = query; } /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ public List execute(VascBackendState state) throws VascException { // Copy parameters @@ -132,33 +133,33 @@ public class JdbcXpqlVascBackend extends AbstractVascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { return object; } /** - * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { } /** - * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryFieldValue(net.forwardfire.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return new MapVascEntryFieldValue(); } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new MapVascEntryRecordCreator(); diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java index a443048..0e0504f 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jdbc; +package net.forwardfire.vasc.backends.jdbc; import java.sql.Connection; import java.sql.SQLException; @@ -47,7 +47,7 @@ public class JdniDataSourceJdbcConnectionProvider implements JdbcConnectionProvi private String dataSourceName = null; /** - * @see org.x4o.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() + * @see net.forwardfire.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() */ public Connection getJdbcConnection() throws SQLException { Connection connection = getDataSource(dataSourceName).getConnection(); diff --git a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java rename to vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java index 1ada6d1..247a793 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.backends.jdbc; +package net.forwardfire.vasc.backends.jdbc; import java.sql.Connection; import java.sql.DriverManager; @@ -45,7 +45,7 @@ public class SimpleJdbcConnectionProvider implements JdbcConnectionProvider { private boolean loadedDriver = false; /** - * @see org.x4o.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() + * @see net.forwardfire.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() */ public Connection getJdbcConnection() throws SQLException { if (loadedDriver==false) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackend.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackend.java similarity index 75% rename from vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackend.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackend.java index af174a6..5d211e4 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackend.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.Map; @@ -39,14 +39,14 @@ abstract public class AbstractVascBackend implements VascBackend { private String id = null; /** - * @see org.x4o.vasc.core.VascBackend#getId() + * @see net.forwardfire.vasc.core.VascBackend#getId() */ public String getId() { return id; } /** - * @see org.x4o.vasc.core.VascBackend#setId(java.lang.String) + * @see net.forwardfire.vasc.core.VascBackend#setId(java.lang.String) */ public void setId(String id) { if (id==null) { @@ -56,77 +56,77 @@ abstract public class AbstractVascBackend implements VascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#isPageable() + * @see net.forwardfire.vasc.core.VascBackend#isPageable() */ public boolean isPageable() { return false; } /** - * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { return 0; } /** - * @see org.x4o.vasc.core.VascBackend#isSearchable() + * @see net.forwardfire.vasc.core.VascBackend#isSearchable() */ public boolean isSearchable() { return false; } /** - * @see org.x4o.vasc.core.VascBackend#isSortable() + * @see net.forwardfire.vasc.core.VascBackend#isSortable() */ public boolean isSortable() { return false; } /** - * @see org.x4o.vasc.core.VascBackend#isRecordMoveable() + * @see net.forwardfire.vasc.core.VascBackend#isRecordMoveable() */ public boolean isRecordMoveable() { return false; } /** - * @see org.x4o.vasc.core.VascBackend#doRecordMoveDownById(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#doRecordMoveDownById(java.lang.Object) */ public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { return 0l; } /** - * @see org.x4o.vasc.core.VascBackend#doRecordMoveUpById(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#doRecordMoveUpById(java.lang.Object) */ public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { return 0l; } /** - * @see org.x4o.vasc.core.VascBackend#executePageSummary() + * @see net.forwardfire.vasc.core.VascBackend#executePageSummary() */ public Map executePageSummary() { return null; } /** - * @see org.x4o.vasc.core.VascBackend#executeTotalSummary() + * @see net.forwardfire.vasc.core.VascBackend#executeTotalSummary() */ public Map executeTotalSummary() { return null; } /** - * @see org.x4o.vasc.core.VascBackend#isPageSummary() + * @see net.forwardfire.vasc.core.VascBackend#isPageSummary() */ public boolean isPageSummary() { return false; } /** - * @see org.x4o.vasc.core.VascBackend#isTotalSummary() + * @see net.forwardfire.vasc.core.VascBackend#isTotalSummary() */ public boolean isTotalSummary() { return false; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendProxy.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackendProxy.java similarity index 71% rename from vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendProxy.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackendProxy.java index 29dbb12..a1923e9 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendProxy.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackendProxy.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; /** @@ -50,14 +50,14 @@ abstract public class AbstractVascBackendProxy implements VascBackend { } /** - * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { return backend.fetchTotalExecuteSize(state); } /** - * @see org.x4o.vasc.core.VascBackend#isSortable() + * @see net.forwardfire.vasc.core.VascBackend#isSortable() */ public boolean isSortable() { return backend.isSortable(); @@ -65,119 +65,119 @@ abstract public class AbstractVascBackendProxy implements VascBackend { /** * @throws Exception - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ public List execute(VascBackendState state) throws VascException { return backend.execute(state); } /** - * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { backend.delete(object); } /** - * @see org.x4o.vasc.core.VascBackend#isPageable() + * @see net.forwardfire.vasc.core.VascBackend#isPageable() */ public boolean isPageable() { return backend.isPageable(); } /** - * @see org.x4o.vasc.core.VascBackend#isSearchable() + * @see net.forwardfire.vasc.core.VascBackend#isSearchable() */ public boolean isSearchable() { return backend.isSearchable(); } /** - * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { return backend.merge(object); } /** - * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { backend.persist(object); } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryFieldValue(net.forwardfire.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return backend.provideVascEntryFieldValue(field); } /** - * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return backend.provideVascEntryRecordCreator(vascEntry); } /** - * @see org.x4o.vasc.core.VascBackend#getId() + * @see net.forwardfire.vasc.core.VascBackend#getId() */ public String getId() { return backend.getId(); } /** - * @see org.x4o.vasc.core.VascBackend#setId(java.lang.String) + * @see net.forwardfire.vasc.core.VascBackend#setId(java.lang.String) */ public void setId(String id) { backend.setId(id); } /** - * @see org.x4o.vasc.core.VascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) */ public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { return backend.doRecordMoveDownById(state,primaryId); } /** - * @see org.x4o.vasc.core.VascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) + * @see net.forwardfire.vasc.core.VascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) */ public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { return backend.doRecordMoveUpById(state,primaryId); } /** - * @see org.x4o.vasc.core.VascBackend#isRecordMoveable() + * @see net.forwardfire.vasc.core.VascBackend#isRecordMoveable() */ public boolean isRecordMoveable() { return backend.isRecordMoveable(); } /** - * @see org.x4o.vasc.core.VascBackend#executePageSummary() + * @see net.forwardfire.vasc.core.VascBackend#executePageSummary() */ public Map executePageSummary() { return backend.executePageSummary(); } /** - * @see org.x4o.vasc.core.VascBackend#executeTotalSummary() + * @see net.forwardfire.vasc.core.VascBackend#executeTotalSummary() */ public Map executeTotalSummary() { return backend.executeTotalSummary(); } /** - * @see org.x4o.vasc.core.VascBackend#isPageSummary() + * @see net.forwardfire.vasc.core.VascBackend#isPageSummary() */ public boolean isPageSummary() { return backend.isPageSummary(); } /** - * @see org.x4o.vasc.core.VascBackend#isTotalSummary() + * @see net.forwardfire.vasc.core.VascBackend#isTotalSummary() */ public boolean isTotalSummary() { return backend.isTotalSummary(); diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendState.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackendState.java similarity index 82% rename from vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendState.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackendState.java index 1496176..f833737 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendState.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascBackendState.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.HashMap; import java.util.Map; @@ -64,70 +64,70 @@ abstract public class AbstractVascBackendState implements VascBackendState { } /** - * @see org.x4o.vasc.core.VascBackend#getPageIndex() + * @see net.forwardfire.vasc.core.VascBackend#getPageIndex() */ public int getPageIndex() { return pageIndex; } /** - * @see org.x4o.vasc.core.VascBackend#setPageIndex(int) + * @see net.forwardfire.vasc.core.VascBackend#setPageIndex(int) */ public void setPageIndex(int pageIndex) { this.pageIndex=pageIndex; } /** - * @see org.x4o.vasc.core.VascBackend#getPageSize() + * @see net.forwardfire.vasc.core.VascBackend#getPageSize() */ public int getPageSize() { return pageSize; } /** - * @see org.x4o.vasc.core.VascBackend#setPageSize(int) + * @see net.forwardfire.vasc.core.VascBackend#setPageSize(int) */ public void setPageSize(int pageSize) { this.pageSize=pageSize; } /** - * @see org.x4o.vasc.core.VascBackend#getSearchString() + * @see net.forwardfire.vasc.core.VascBackend#getSearchString() */ public String getSearchString() { return searchString; } /** - * @see org.x4o.vasc.core.VascBackend#setSearchString(java.lang.String) + * @see net.forwardfire.vasc.core.VascBackend#setSearchString(java.lang.String) */ public void setSearchString(String searchString) { this.searchString=searchString; } /** - * @see org.x4o.vasc.core.VascBackend#isSortAscending() + * @see net.forwardfire.vasc.core.VascBackend#isSortAscending() */ public boolean isSortAscending() { return ascending; } /** - * @see org.x4o.vasc.core.VascBackend#setSortAscending(boolean) + * @see net.forwardfire.vasc.core.VascBackend#setSortAscending(boolean) */ public void setSortAscending(boolean ascending) { this.ascending=ascending; } /** - * @see org.x4o.vasc.core.VascBackend#getSortField() + * @see net.forwardfire.vasc.core.VascBackend#getSortField() */ public String getSortField() { return sortField; } /** - * @see org.x4o.vasc.core.VascBackend#setSortField(java.lang.String) + * @see net.forwardfire.vasc.core.VascBackend#setSortField(java.lang.String) */ public void setSortField(String sortField) { this.sortField=sortField; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryFieldType.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldType.java similarity index 74% rename from vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryFieldType.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldType.java index f5789cd..df5b6ec 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryFieldType.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldType.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; -import org.x4o.vasc.validators.VascValidator; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.validators.VascValidator; + /** @@ -65,35 +66,35 @@ abstract public class AbstractVascEntryFieldType implements VascEntryFieldType { abstract public VascEntryFieldType clone() throws CloneNotSupportedException; /** - * @see org.x4o.vasc.core.VascEntryFieldType#getId() + * @see net.forwardfire.vasc.core.VascEntryFieldType#getId() */ public String getId() { return id; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#setId(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntryFieldType#setId(java.lang.String) */ public void setId(String id) { this.id=id; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#getProperty(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntryFieldType#getProperty(java.lang.String) */ public String getProperty(String name) { return properties.get(name); } /** - * @see org.x4o.vasc.core.VascEntryFieldType#setProperty(java.lang.String, java.lang.String) + * @see net.forwardfire.vasc.core.VascEntryFieldType#setProperty(java.lang.String, java.lang.String) */ public void setProperty(String name, String value) { properties.put(name, value); } /** - * @see org.x4o.vasc.core.VascEntryFieldType#getPropertyNames() + * @see net.forwardfire.vasc.core.VascEntryFieldType#getPropertyNames() */ public List getPropertyNames() { return new ArrayList(properties.keySet()); @@ -114,77 +115,77 @@ abstract public class AbstractVascEntryFieldType implements VascEntryFieldType { } /** - * @see org.x4o.vasc.core.VascEntryFieldType#getVascValidators() + * @see net.forwardfire.vasc.core.VascEntryFieldType#getVascValidators() */ public List getVascValidators() { return vascValidators; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#addVascValidator(org.x4o.vasc.validators.VascValidator) + * @see net.forwardfire.vasc.core.VascEntryFieldType#addVascValidator(net.forwardfire.vasc.validators.VascValidator) */ public void addVascValidator(VascValidator vascValidator) { vascValidators.add(vascValidator); } /** - * @see org.x4o.vasc.core.VascEntryFieldType#removeVascValidator(org.x4o.vasc.validators.VascValidator) + * @see net.forwardfire.vasc.core.VascEntryFieldType#removeVascValidator(net.forwardfire.vasc.validators.VascValidator) */ public void removeVascValidator(VascValidator vascValidator) { vascValidators.remove(vascValidator); } /** - * @see org.x4o.vasc.core.VascEntryFieldType#getAutoDetectClass() + * @see net.forwardfire.vasc.core.VascEntryFieldType#getAutoDetectClass() */ public Class getAutoDetectClass() { return autoDetectClass; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#setAutoDetectClass(java.lang.Class) + * @see net.forwardfire.vasc.core.VascEntryFieldType#setAutoDetectClass(java.lang.Class) */ public void setAutoDetectClass(Class autoDetectClass) { this.autoDetectClass=autoDetectClass; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#getInputMask() + * @see net.forwardfire.vasc.core.VascEntryFieldType#getInputMask() */ public String getInputMask() { return inputMask; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#setInputMask(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntryFieldType#setInputMask(java.lang.String) */ public void setInputMask(String inputMask) { this.inputMask=inputMask; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#getUIComponentId() + * @see net.forwardfire.vasc.core.VascEntryFieldType#getUIComponentId() */ public String getUIComponentId() { return uiComponentId; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#setUIComponentId(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntryFieldType#setUIComponentId(java.lang.String) */ public void setUIComponentId(String uiComponentId) { this.uiComponentId=uiComponentId; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#getUIComponentCount() + * @see net.forwardfire.vasc.core.VascEntryFieldType#getUIComponentCount() */ public int getUIComponentCount(VascEntryField entryField) throws VascException { return 1; } /** - * @see org.x4o.vasc.core.VascEntryFieldType#provideEditorUIComponent(int) + * @see net.forwardfire.vasc.core.VascEntryFieldType#provideEditorUIComponent(int) */ public VascUIComponent provideEditorUIComponent(int index,VascEntryField entryField) throws VascException { ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -199,14 +200,14 @@ abstract public class AbstractVascEntryFieldType implements VascEntryFieldType { } /** - * @see org.x4o.vasc.core.VascEntryFieldType#provideLabelUIComponent(int) + * @see net.forwardfire.vasc.core.VascEntryFieldType#provideLabelUIComponent(int) */ public VascUIComponent provideLabelUIComponent(int index,VascEntryField entryField) throws VascException { return entryField.getVascEntry().getVascFrontendData().getVascUIComponent(VascUIComponent.VASC_LABEL); } /** - * @see org.x4o.vasc.core.VascEntryFieldType#provideEditorVascValueModel() + * @see net.forwardfire.vasc.core.VascEntryFieldType#provideEditorVascValueModel() */ public VascValueModel provideEditorVascValueModel(int index,VascEntryField entryField) throws VascException { if (index>0) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryState.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryState.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryState.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryState.java index 2f4b6c2..dc8b654 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryState.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryState.java @@ -1,7 +1,7 @@ /** * */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.ArrayList; import java.util.HashMap; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascFrontend.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascFrontend.java similarity index 91% rename from vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascFrontend.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascFrontend.java index 4d0993b..2b34159 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascFrontend.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascFrontend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.logging.Logger; @@ -55,7 +55,7 @@ abstract public class AbstractVascFrontend implements VascFrontend { abstract protected void addUiComponents(); /** - * @see org.x4o.vasc.core.VascFrontend#initEntry(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascFrontend#initEntry(net.forwardfire.vasc.core.VascEntry) */ public void initEntry(VascEntry entry) throws Exception { if (entry.getVascFrontendData().getVascFrontend()==null) { @@ -71,14 +71,14 @@ abstract public class AbstractVascFrontend implements VascFrontend { } /** - * @see org.x4o.vasc.core.VascFrontend#getId() + * @see net.forwardfire.vasc.core.VascFrontend#getId() */ public String getId() { return id; } /** - * @see org.x4o.vasc.core.VascFrontend#setId(java.lang.String) + * @see net.forwardfire.vasc.core.VascFrontend#setId(java.lang.String) */ public void setId(String id) { this.id=id; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackend.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackend.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascBackend.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackend.java index 2aba85f..1b07455 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackend.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackend.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendController.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendController.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascBackendController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendController.java index 32c8bd1..9e12207 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendControllerLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendControllerLocal.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascBackendControllerLocal.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendControllerLocal.java index ae4a761..2fab246 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendControllerLocal.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendFilter.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendFilter.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascBackendFilter.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendFilter.java index 4ea5ba9..6ecf574 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendFilter.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendFilter.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendPageNumber.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendPageNumber.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascBackendPageNumber.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendPageNumber.java index aea2875..c369d7e 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendPageNumber.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendPageNumber.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendState.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendState.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascBackendState.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendState.java index c8b815e..680fda6 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendState.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascBackendState.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; import java.util.Set; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascController.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascController.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascController.java index 0ccebb5..ecff0d8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntry.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntry.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntry.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntry.java index 5973167..9c10670 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntry.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntry.java @@ -24,15 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; import java.util.List; -import org.x4o.vasc.core.actions.ColumnVascAction; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryFieldEventChannel; +import net.forwardfire.vasc.core.actions.ColumnVascAction; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryFieldEventChannel; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryController.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryController.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryController.java index 6004e6a..126f4c1 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryControllerLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryControllerLocal.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryControllerLocal.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryControllerLocal.java index 8ba252d..6a5dd4a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryControllerLocal.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryField.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryField.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryField.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryField.java index 348130d..530f485 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryField.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryField.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; import java.util.List; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.validators.VascValidator; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.validators.VascValidator; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldSet.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldSet.java similarity index 99% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldSet.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldSet.java index f7023df..f7743ff 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldSet.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldSet.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldType.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldType.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldType.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldType.java index 4ecc334..7fd6e4f 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldType.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldType.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; import java.util.List; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; -import org.x4o.vasc.validators.VascValidator; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.validators.VascValidator; + diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeController.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeController.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeController.java index 2f99530..a3fac6b 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeControllerLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeControllerLocal.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeControllerLocal.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeControllerLocal.java index 7f5f2f1..00ad82f 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeControllerLocal.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFinalizer.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFinalizer.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFinalizer.java index 0d56c6e..a46f424 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFinalizer.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFinalizer.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryState.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryState.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEntryState.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryState.java index c1e72f0..6d3d00d 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryState.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryState.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; import java.util.List; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelController.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEventChannelController.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEventChannelController.java index c5dd6e2..097fa75 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEventChannelController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelControllerLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEventChannelControllerLocal.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelControllerLocal.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascEventChannelControllerLocal.java index 4f7d482..dde3088 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelControllerLocal.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEventChannelControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascException.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascException.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascException.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascException.java index b9fd1ac..248bea8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascException.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascException.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontend.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontend.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascFrontend.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontend.java index 43c7321..ffb5d32 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontend.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontend.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; -import org.x4o.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.core.entry.VascEntryExporter; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendData.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendData.java similarity index 91% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendData.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendData.java index 2352454..f88ae5c 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendData.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendData.java @@ -24,15 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; -import org.x4o.vasc.core.entry.VascEntryFieldValidatorService; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.entry.VascEntryResourceImageResolver; -import org.x4o.vasc.core.entry.VascEntryResourceResolver; -import org.x4o.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryResourceImageResolver; +import net.forwardfire.vasc.core.entry.VascEntryResourceResolver; +import net.forwardfire.vasc.core.ui.VascUIComponent; + diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendExceptionHandler.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendExceptionHandler.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendExceptionHandler.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendExceptionHandler.java index 9dba6dd..d1df86c 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendExceptionHandler.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendExceptionHandler.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.EventListener; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendHelper.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendHelper.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendHelper.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendHelper.java index b704895..aa294a0 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendHelper.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascFrontendHelper.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; + diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntry.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascLinkEntry.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntry.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascLinkEntry.java index 46f6fb4..8ed7e78 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntry.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascLinkEntry.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; import java.util.List; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntryType.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascLinkEntryType.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntryType.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascLinkEntryType.java index 8e7b09a..af7dbe7 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntryType.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascLinkEntryType.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.io.Serializable; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/VascUserRoleController.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascUserRoleController.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/VascUserRoleController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/VascUserRoleController.java index 38168cd..8aac948 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/VascUserRoleController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascUserRoleController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core; +package net.forwardfire.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/actions/AbstractVascAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/AbstractVascAction.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/core/actions/AbstractVascAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/actions/AbstractVascAction.java index 39a5737..7146291 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/actions/AbstractVascAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/AbstractVascAction.java @@ -25,7 +25,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.actions; +package net.forwardfire.vasc.core.actions; /** @@ -64,14 +64,14 @@ abstract public class AbstractVascAction implements VascAction { } /** - * @see org.x4o.vasc.core.actions.VascAction#getId() + * @see net.forwardfire.vasc.core.actions.VascAction#getId() */ public String getId() { return id; } /** - * @see org.x4o.vasc.core.actions.VascAction#setId(java.lang.String) + * @see net.forwardfire.vasc.core.actions.VascAction#setId(java.lang.String) */ public void setId(String id) { this.id=id; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/actions/ColumnVascAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/ColumnVascAction.java similarity index 92% rename from vasc-core/src/main/java/org/x4o/vasc/core/actions/ColumnVascAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/actions/ColumnVascAction.java index c92adef..fa05b7a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/actions/ColumnVascAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/ColumnVascAction.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.actions; +package net.forwardfire.vasc.core.actions; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/actions/GlobalVascAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/GlobalVascAction.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/actions/GlobalVascAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/actions/GlobalVascAction.java index af9e578..bc3245c 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/actions/GlobalVascAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/GlobalVascAction.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.actions; +package net.forwardfire.vasc.core.actions; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/actions/RowVascAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/RowVascAction.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/actions/RowVascAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/actions/RowVascAction.java index 1bc74bb..5a20695 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/actions/RowVascAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/RowVascAction.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.actions; +package net.forwardfire.vasc.core.actions; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/actions/VascAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/VascAction.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/actions/VascAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/actions/VascAction.java index f07a2f6..4dac797 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/actions/VascAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/actions/VascAction.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.actions; +package net.forwardfire.vasc.core.actions; import java.io.Serializable; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryBackendEventListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryBackendEventListener.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryBackendEventListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryBackendEventListener.java index 8c23873..c450884 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryBackendEventListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryBackendEventListener.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; import java.io.Serializable; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryExporter.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryExporter.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryExporter.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryExporter.java index d13f46e..2970415 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryExporter.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryExporter.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; import java.io.OutputStream; import java.io.Serializable; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldEventChannel.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldEventChannel.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldEventChannel.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldEventChannel.java index 82d5ca0..eeda7df 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldEventChannel.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldEventChannel.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; import java.io.Serializable; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValidatorService.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldValidatorService.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValidatorService.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldValidatorService.java index e62c3eb..659b3b8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValidatorService.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldValidatorService.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; import java.util.List; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValue.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldValue.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValue.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldValue.java index ce94545..7bcfab3 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValue.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFieldValue.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; import java.io.Serializable; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFrontendEventListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFrontendEventListener.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFrontendEventListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFrontendEventListener.java index ec7509c..d171690 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFrontendEventListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryFrontendEventListener.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; import java.io.Serializable; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryRecordCreator.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryRecordCreator.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryRecordCreator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryRecordCreator.java index d2d2f21..e06eb3b 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryRecordCreator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryRecordCreator.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; import java.io.Serializable; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceImageResolver.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryResourceImageResolver.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceImageResolver.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryResourceImageResolver.java index 41ee396..2678dcf 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceImageResolver.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryResourceImageResolver.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceResolver.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryResourceResolver.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceResolver.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryResourceResolver.java index e0c0962..2e00246 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceResolver.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/entry/VascEntryResourceResolver.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.entry; +package net.forwardfire.vasc.core.entry; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascColumnValueModelListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascColumnValueModelListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java index c3136be..79859d9 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascColumnValueModelListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascOptionValueModelListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascOptionValueModelListener.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascOptionValueModelListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascOptionValueModelListener.java index 3545990..d1516e6 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascOptionValueModelListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascOptionValueModelListener.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItem.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascSelectItem.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItem.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascSelectItem.java index 4dee337..42bbf64 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItem.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascSelectItem.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItemModel.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascSelectItemModel.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItemModel.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascSelectItemModel.java index 22ec98c..6df792f 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItemModel.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascSelectItemModel.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; import java.io.Serializable; import java.util.List; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponent.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIActionComponent.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponent.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIActionComponent.java index 97c210c..e02f354 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponent.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIActionComponent.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponentListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIActionComponentListener.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponentListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIActionComponentListener.java index 3476889..daeddae 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponentListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIActionComponentListener.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIComponent.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIComponent.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIComponent.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIComponent.java index 969aba1..1773c7d 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIComponent.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascUIComponent.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModel.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascValueModel.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModel.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascValueModel.java index 9cd77e7..2350fad 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModel.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascValueModel.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModelListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascValueModelListener.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModelListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascValueModelListener.java index 3195582..fa67e18 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModelListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascValueModelListener.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.core.ui; +package net.forwardfire.vasc.core.ui; import java.util.EventListener; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackedEntryFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackedEntryFinalizer.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackedEntryFinalizer.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackedEntryFinalizer.java index 6a2ee49..c5696f1 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackedEntryFinalizer.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackedEntryFinalizer.java @@ -24,22 +24,23 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.Collections; import java.util.Comparator; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFieldSet; -import org.x4o.vasc.core.VascEntryFieldType; -import org.x4o.vasc.core.VascEntryFinalizer; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.VascLinkEntryType; -import org.x4o.vasc.core.actions.VascAction; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFieldSet; +import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.core.VascEntryFinalizer; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.VascLinkEntryType; +import net.forwardfire.vasc.core.actions.VascAction; + /** @@ -53,7 +54,7 @@ import org.x4o.vasc.core.actions.VascAction; public class DefaultVascBackedEntryFinalizer implements VascEntryFinalizer { /** - * @see org.x4o.vasc.core.VascEntryFinalizer#finalizeVascEntry(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascEntryFinalizer#finalizeVascEntry(net.forwardfire.vasc.core.VascEntry) */ public VascEntry finalizeVascEntry(VascEntry entry,VascController vascController) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackendController.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackendController.java index 8d0d9aa..c0718e4 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackendController.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.HashMap; import java.util.Map; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendControllerLocal; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendControllerLocal; /** @@ -48,7 +48,7 @@ public class DefaultVascBackendController implements VascBackendControllerLocal } /** - * @see org.x4o.vasc.core.VascBackendController#getVascBackendById(java.lang.String) + * @see net.forwardfire.vasc.core.VascBackendController#getVascBackendById(java.lang.String) */ public VascBackend getVascBackendById(String id) { return backends.get(id); diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendState.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackendState.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendState.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackendState.java index 4e241d4..4f86a9a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendState.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascBackendState.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; -import org.x4o.vasc.core.AbstractVascBackendState; +import net.forwardfire.vasc.core.AbstractVascBackendState; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascController.java similarity index 91% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascController.java index 0037e64..0c6bfe4 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascController.java @@ -24,14 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; -import org.x4o.vasc.core.VascBackendController; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntryController; -import org.x4o.vasc.core.VascEntryFieldTypeController; -import org.x4o.vasc.core.VascEventChannelController; -import org.x4o.vasc.core.VascUserRoleController; +import net.forwardfire.vasc.core.VascBackendController; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntryController; +import net.forwardfire.vasc.core.VascEntryFieldTypeController; +import net.forwardfire.vasc.core.VascEventChannelController; +import net.forwardfire.vasc.core.VascUserRoleController; /** * diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntry.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntry.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntry.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntry.java index 63659f3..be43467 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntry.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntry.java @@ -24,24 +24,25 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.VascBackendFilter; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFieldSet; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.actions.ColumnVascAction; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.actions.VascAction; -import org.x4o.vasc.core.entry.VascEntryFieldEventChannel; +import net.forwardfire.vasc.core.VascBackendFilter; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFieldSet; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.actions.ColumnVascAction; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.actions.VascAction; +import net.forwardfire.vasc.core.entry.VascEntryFieldEventChannel; + /** @@ -465,7 +466,7 @@ public class DefaultVascEntry implements VascEntry { } /** - * @see org.x4o.vasc.core.VascEntry#getVascEntryFieldById(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntry#getVascEntryFieldById(java.lang.String) */ public VascEntryField getVascEntryFieldById(String id) { for (VascEntryField v:vascFields) { @@ -642,21 +643,21 @@ public class DefaultVascEntry implements VascEntry { } /** - * @see org.x4o.vasc.core.VascEntry#getEntryParameter(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntry#getEntryParameter(java.lang.String) */ public Object getEntryParameter(String key) { return entryParameters.get(key); } /** - * @see org.x4o.vasc.core.VascEntry#getEntryParameterKeys() + * @see net.forwardfire.vasc.core.VascEntry#getEntryParameterKeys() */ public List getEntryParameterKeys() { return new ArrayList(entryParameters.keySet()); } /** - * @see org.x4o.vasc.core.VascEntry#setEntryParameter(java.lang.String, java.lang.Object) + * @see net.forwardfire.vasc.core.VascEntry#setEntryParameter(java.lang.String, java.lang.Object) */ public void setEntryParameter(String key, Object value) { entryParameters.put(key, value); diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryController.java similarity index 89% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryController.java index 93022a3..bf663a0 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.Collections; @@ -32,10 +32,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryControllerLocal; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryControllerLocal; +import net.forwardfire.vasc.core.VascException; /** @@ -59,7 +59,7 @@ public class DefaultVascEntryController implements VascEntryControllerLocal { } /** - * @see org.x4o.vasc.core.VascEntryController#getVascEntryById(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntryController#getVascEntryById(java.lang.String) */ public VascEntry getVascEntryById(String id) { VascEntry entry = entries.get(id); @@ -80,7 +80,7 @@ public class DefaultVascEntryController implements VascEntryControllerLocal { } /** - * @see org.x4o.vasc.core.VascEntryController#getVascEntryIds() + * @see net.forwardfire.vasc.core.VascEntryController#getVascEntryIds() */ public List getVascEntryIds() { List result = new ArrayList(entries.keySet()); diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryField.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryField.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryField.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryField.java index 3e7f061..f879305 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryField.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryField.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFieldType; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.validators.VascValidator; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.validators.VascValidator; + diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryFieldSet.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryFieldSet.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryFieldSet.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryFieldSet.java index 5b0ea73..648e1e5 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryFieldSet.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryFieldSet.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.VascEntryFieldSet; +import net.forwardfire.vasc.core.VascEntryFieldSet; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryState.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryState.java similarity index 71% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryState.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryState.java index bfb8dcf..7704066 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryState.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryState.java @@ -1,9 +1,9 @@ /** * */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; -import org.x4o.vasc.core.AbstractVascEntryState; +import net.forwardfire.vasc.core.AbstractVascEntryState; /** * Holds all state values diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFactory.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFactory.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFactory.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFactory.java index 8a62a5d..2419783 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFactory.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFactory.java @@ -24,20 +24,21 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.Locale; import java.util.ResourceBundle; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendFilter; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.impl.entry.DefaultVascEntryResourceResolver; -import org.x4o.vasc.impl.entry.VascValidatorsValidatorService; -import org.x4o.vasc.impl.type.DefaultVascEntryFieldTypeController; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendFilter; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.impl.entry.DefaultVascEntryResourceResolver; +import net.forwardfire.vasc.impl.entry.VascValidatorsValidatorService; +import net.forwardfire.vasc.impl.type.DefaultVascEntryFieldTypeController; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendData.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendData.java similarity index 82% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendData.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendData.java index 22f3c90..555f325 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendData.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendData.java @@ -24,31 +24,32 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFinalizer; -import org.x4o.vasc.core.VascEntryState; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontend; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.VascFrontendHelper; -import org.x4o.vasc.core.actions.ColumnVascAction; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.actions.VascAction; -import org.x4o.vasc.core.entry.VascEntryFieldValidatorService; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.entry.VascEntryResourceImageResolver; -import org.x4o.vasc.core.entry.VascEntryResourceResolver; -import org.x4o.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFinalizer; +import net.forwardfire.vasc.core.VascEntryState; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontend; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.VascFrontendHelper; +import net.forwardfire.vasc.core.actions.ColumnVascAction; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.actions.VascAction; +import net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryResourceImageResolver; +import net.forwardfire.vasc.core.entry.VascEntryResourceResolver; +import net.forwardfire.vasc.core.ui.VascUIComponent; + /** @@ -96,14 +97,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see org.x4o.vasc.core.VascBackendData#getVascEntryFinalizer() + * @see net.forwardfire.vasc.core.VascBackendData#getVascEntryFinalizer() */ public VascEntryFinalizer getVascEntryFinalizer() { return vascEntryFinalizer; } /** - * @see org.x4o.vasc.core.VascBackendData#setVascEntryFinalizer(org.x4o.vasc.core.VascEntryFinalizer) + * @see net.forwardfire.vasc.core.VascBackendData#setVascEntryFinalizer(net.forwardfire.vasc.core.VascEntryFinalizer) */ public void setVascEntryFinalizer(VascEntryFinalizer vascEntryFinalizer) { this.vascEntryFinalizer=vascEntryFinalizer; @@ -161,14 +162,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see org.x4o.vasc.core.VascFrontendData#getVascUIComponent(java.lang.String) + * @see net.forwardfire.vasc.core.VascFrontendData#getVascUIComponent(java.lang.String) */ public String getVascUIComponentClass(String rendererId) { return uiComponents.get(rendererId); } /** - * @see org.x4o.vasc.core.VascFrontendData#putVascUIComponent(java.lang.String, java.lang.String) + * @see net.forwardfire.vasc.core.VascFrontendData#putVascUIComponent(java.lang.String, java.lang.String) */ public void putVascUIComponent(String rendererId, String uiComponentClass) { uiComponents.put(rendererId, uiComponentClass); @@ -189,7 +190,7 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see org.x4o.vasc.core.VascFrontendData#addFieldVascUIComponents(org.x4o.vasc.core.VascEntryField, org.x4o.vasc.core.ui.VascUIComponent, java.lang.Object) + * @see net.forwardfire.vasc.core.VascFrontendData#addFieldVascUIComponents(net.forwardfire.vasc.core.VascEntryField, net.forwardfire.vasc.core.ui.VascUIComponent, java.lang.Object) */ public void addFieldVascUIComponents(VascEntryField field,VascUIComponent uiComponent, Object editor) { fieldComps.put(field, uiComponent); @@ -202,14 +203,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see org.x4o.vasc.core.VascFrontendData#getFieldRealRenderer(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascFrontendData#getFieldRealRenderer(net.forwardfire.vasc.core.VascEntryField) */ public Object getFieldRealRenderer(VascEntryField field) { return fieldEditors.get(field); } /** - * @see org.x4o.vasc.core.VascFrontendData#getFieldVascUIComponent(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascFrontendData#getFieldVascUIComponent(net.forwardfire.vasc.core.VascEntryField) */ public VascUIComponent getFieldVascUIComponent(VascEntryField field) { return fieldComps.get(field); @@ -230,14 +231,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see org.x4o.vasc.core.VascFrontendData#addVascValidatorService(org.x4o.vasc.core.entry.VascEntryFieldValidatorService) + * @see net.forwardfire.vasc.core.VascFrontendData#addVascValidatorService(net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService) */ public void addVascValidatorService(VascEntryFieldValidatorService validatorService) { validatorServices.add(validatorService); } /** - * @see org.x4o.vasc.core.VascFrontendData#getVascValidatorServices() + * @see net.forwardfire.vasc.core.VascFrontendData#getVascValidatorServices() */ public List getVascValidatorServices() { return validatorServices; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendEntryFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendEntryFinalizer.java similarity index 84% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendEntryFinalizer.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendEntryFinalizer.java index 8141af2..1a1a59e 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendEntryFinalizer.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendEntryFinalizer.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryFinalizer; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryFinalizer; +import net.forwardfire.vasc.core.VascException; /** @@ -40,7 +40,7 @@ import org.x4o.vasc.core.VascException; public class DefaultVascFrontendEntryFinalizer implements VascEntryFinalizer { /** - * @see org.x4o.vasc.core.VascEntryFinalizer#finalizeVascEntry(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascEntryFinalizer#finalizeVascEntry(net.forwardfire.vasc.core.VascEntry) */ public VascEntry finalizeVascEntry(VascEntry entry,VascController vascController) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendHelper.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendHelper.java similarity index 87% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendHelper.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendHelper.java index 5060145..e647609 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendHelper.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascFrontendHelper.java @@ -24,29 +24,30 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.logging.Logger; -import org.x4o.vasc.core.VascBackendFilter; -import org.x4o.vasc.core.VascBackendPageNumber; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontendHelper; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.VascLinkEntryType; -import org.x4o.vasc.core.VascUserRoleController; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryFieldValidatorService; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import org.x4o.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.VascBackendFilter; +import net.forwardfire.vasc.core.VascBackendPageNumber; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontendHelper; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.VascLinkEntryType; +import net.forwardfire.vasc.core.VascUserRoleController; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; +import net.forwardfire.vasc.core.ui.VascUIComponent; + /** @@ -59,7 +60,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { private Logger logger = Logger.getLogger(DefaultVascFrontendHelper.class.getName()); /** - * @see org.x4o.vasc.core.VascFrontendHelper#renderView(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascFrontendHelper#renderView(net.forwardfire.vasc.core.VascEntryField) */ public boolean renderView(VascEntryField field) { if (field.getView()==false) { @@ -69,7 +70,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#renderCreate(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascFrontendHelper#renderCreate(net.forwardfire.vasc.core.VascEntryField) */ public boolean renderCreate(VascEntryField field) { if (renderView(field)==false) { @@ -86,7 +87,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#renderEdit(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascFrontendHelper#renderEdit(net.forwardfire.vasc.core.VascEntryField) */ public boolean renderEdit(VascEntryField field) { if (renderView(field)==false) { @@ -108,7 +109,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#renderEditReadOnly(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascFrontendHelper#renderEditReadOnly(net.forwardfire.vasc.core.VascEntryField) */ public boolean renderEditReadOnly(VascEntryField field) { if (renderView(field)==false) { @@ -125,7 +126,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#renderList(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.VascFrontendHelper#renderList(net.forwardfire.vasc.core.VascEntryField) */ public boolean renderList(VascEntryField field) { if (renderView(field)==false) { @@ -142,21 +143,21 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#renderGlobalVascAction(org.x4o.vasc.core.actions.GlobalVascAction) + * @see net.forwardfire.vasc.core.VascFrontendHelper#renderGlobalVascAction(net.forwardfire.vasc.core.actions.GlobalVascAction) */ public boolean renderGlobalVascAction(GlobalVascAction action) { return true; } /** - * @see org.x4o.vasc.core.VascFrontendHelper#renderRowVascAction(org.x4o.vasc.core.actions.RowVascAction) + * @see net.forwardfire.vasc.core.VascFrontendHelper#renderRowVascAction(net.forwardfire.vasc.core.actions.RowVascAction) */ public boolean renderRowVascAction(RowVascAction action) { return true; } /** - * @see org.x4o.vasc.core.VascFrontendHelper#fireVascEvent(org.x4o.vasc.core.entry.VascEntryEventListener.VascEventType, java.lang.Object) + * @see net.forwardfire.vasc.core.VascFrontendHelper#fireVascEvent(net.forwardfire.vasc.core.entry.VascEntryEventListener.VascEventType, java.lang.Object) */ public void fireVascEvent(VascEntry entry,VascFrontendEventType type, Object data) { List list = entry.getVascFrontendData().getVascEntryFrontendEventListener(type); @@ -166,7 +167,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#getTotalColumnsWidth(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascFrontendHelper#getTotalColumnsWidth(net.forwardfire.vasc.core.VascEntry) */ public Integer getTotalColumnsWidth(VascEntry entry) { int result = 0; @@ -220,14 +221,14 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#handleException(org.x4o.vasc.core.VascEntry,java.lang.Exception) + * @see net.forwardfire.vasc.core.VascFrontendHelper#handleException(net.forwardfire.vasc.core.VascEntry,java.lang.Exception) */ public void handleException(VascEntry entry,Exception exception) { fireVascEvent(entry,VascFrontendEventType.EXCEPTION , exception); } /** - * @see org.x4o.vasc.core.VascFrontendHelper#initEditObject(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascFrontendHelper#initEditObject(net.forwardfire.vasc.core.VascEntry) */ public Object createObject(VascEntry entry) { try { @@ -297,7 +298,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#mergeObject(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascFrontendHelper#mergeObject(net.forwardfire.vasc.core.VascEntry) */ public Object mergeObject(VascEntry entry) { Object object = entry.getVascFrontendData().getVascEntryState().getEntryDataObject(); @@ -343,7 +344,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#refreshData(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascFrontendHelper#refreshData(net.forwardfire.vasc.core.VascEntry) */ public void refreshData(VascEntry entry) { fireVascEvent(entry,VascEntryFrontendEventListener.VascFrontendEventType.PRE_READ, null); @@ -374,7 +375,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see org.x4o.vasc.core.VascFrontendHelper#validateObjectField(org.x4o.vasc.core.VascEntryField, java.lang.Object) + * @see net.forwardfire.vasc.core.VascFrontendHelper#validateObjectField(net.forwardfire.vasc.core.VascEntryField, java.lang.Object) */ public List validateObjectField(VascEntryField field) { if (field==null) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascLinkEntry.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascLinkEntry.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascLinkEntry.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascLinkEntry.java index b4d1981..14a44a7 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascLinkEntry.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascLinkEntry.java @@ -24,15 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.VascLinkEntryType; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.VascLinkEntryType; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascSelectItemModel.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascSelectItemModel.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascSelectItemModel.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascSelectItemModel.java index 0b7b677..0fd853d 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascSelectItemModel.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascSelectItemModel.java @@ -24,21 +24,22 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.ui.VascSelectItem; -import org.x4o.vasc.core.ui.VascSelectItemModel; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.ui.VascSelectItem; +import net.forwardfire.vasc.core.ui.VascSelectItemModel; + @@ -61,7 +62,7 @@ public class DefaultVascSelectItemModel implements VascSelectItemModel { private Boolean useParentFields = null; /** - * @see org.x4o.vasc.core.ui.VascSelectItemModel#getVascSelectItems(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.ui.VascSelectItemModel#getVascSelectItems(net.forwardfire.vasc.core.VascEntry) */ public List getVascSelectItems(VascEntry currentEntry) throws VascException { List result = new ArrayList(100); diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascUserRoleController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascUserRoleController.java similarity index 88% rename from vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascUserRoleController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascUserRoleController.java index b8108f4..5ed1714 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascUserRoleController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascUserRoleController.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.VascUserRoleController; +import net.forwardfire.vasc.core.VascUserRoleController; /** @@ -67,28 +67,28 @@ public class DefaultVascUserRoleController implements VascUserRoleController { /** - * @see org.x4o.vasc.core.VascUserRoleController#getUserId() + * @see net.forwardfire.vasc.core.VascUserRoleController#getUserId() */ public Long getUserId() { return userId; } /** - * @see org.x4o.vasc.core.VascUserRoleController#getUserName() + * @see net.forwardfire.vasc.core.VascUserRoleController#getUserName() */ public String getUserName() { return userName; } /** - * @see org.x4o.vasc.core.VascUserRoleController#getUserRoles() + * @see net.forwardfire.vasc.core.VascUserRoleController#getUserRoles() */ public List getUserRoles() { return userRoles; } /** - * @see org.x4o.vasc.core.VascUserRoleController#hasRole(java.lang.String) + * @see net.forwardfire.vasc.core.VascUserRoleController#hasRole(java.lang.String) */ public boolean hasRole(String roles) { if (roles==null) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyCache.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyCache.java similarity index 89% rename from vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyCache.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyCache.java index 28c5bad..8c17c81 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyCache.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyCache.java @@ -24,17 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.AbstractVascBackendProxy; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.AbstractVascBackendProxy; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; /** @@ -82,7 +82,7 @@ public class VascBackendProxyCache extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyEventExecutor.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyEventExecutor.java similarity index 80% rename from vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyEventExecutor.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyEventExecutor.java index b660cdd..b08e630 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyEventExecutor.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyEventExecutor.java @@ -24,18 +24,19 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.AbstractVascBackendProxy; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryBackendEventListener; -import org.x4o.vasc.core.entry.VascEntryBackendEventListener.VascBackendEventType; +import net.forwardfire.vasc.core.AbstractVascBackendProxy; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryBackendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryBackendEventListener.VascBackendEventType; + @@ -95,7 +96,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) */ @Override public void delete(Object object) throws VascException { @@ -105,7 +106,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(org.x4o.vasc.core.VascBackendState, java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(net.forwardfire.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state, Object primaryId) throws VascException { @@ -116,7 +117,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(org.x4o.vasc.core.VascBackendState, java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(net.forwardfire.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state, Object primaryId) throws VascException { @@ -127,7 +128,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#execute(org.x4o.vasc.core.VascBackendState) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#execute(net.forwardfire.vasc.core.VascBackendState) */ @Override public List execute(VascBackendState state) throws VascException { @@ -138,7 +139,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#fetchTotalExecuteSize(org.x4o.vasc.core.VascBackendState) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#fetchTotalExecuteSize(net.forwardfire.vasc.core.VascBackendState) */ @Override public long fetchTotalExecuteSize(VascBackendState state) { @@ -149,7 +150,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) */ @Override public Object merge(Object object) throws VascException { @@ -160,7 +161,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) */ @Override public void persist(Object object) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyFilter.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyFilter.java similarity index 85% rename from vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyFilter.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyFilter.java index ef7f8fd..bc33f13 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyFilter.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyFilter.java @@ -24,17 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.AbstractVascBackendProxy; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendFilter; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.AbstractVascBackendProxy; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendFilter; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; @@ -55,7 +55,7 @@ public class VascBackendProxyFilter extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyPaged.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyPaged.java similarity index 86% rename from vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyPaged.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyPaged.java index 0df7dde..fc2cb51 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyPaged.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyPaged.java @@ -24,16 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.ArrayList; import java.util.List; -import org.x4o.vasc.core.AbstractVascBackendProxy; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.AbstractVascBackendProxy; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; @@ -52,7 +52,7 @@ public class VascBackendProxyPaged extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.VascBackend#isPageable() + * @see net.forwardfire.vasc.core.VascBackend#isPageable() */ @Override public boolean isPageable() { @@ -60,7 +60,7 @@ public class VascBackendProxyPaged extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySearch.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxySearch.java similarity index 89% rename from vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySearch.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxySearch.java index e10499a..908119b 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySearch.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxySearch.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.lang.reflect.Method; import java.util.ArrayList; @@ -33,11 +33,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.x4o.vasc.core.AbstractVascBackendProxy; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.AbstractVascBackendProxy; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; @@ -56,7 +56,7 @@ public class VascBackendProxySearch extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.VascBackend#isSearchable() + * @see net.forwardfire.vasc.core.VascBackend#isSearchable() */ @Override public boolean isSearchable() { @@ -64,7 +64,7 @@ public class VascBackendProxySearch extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySort.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxySort.java similarity index 88% rename from vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySort.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxySort.java index 3d0f4c8..063ef34 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySort.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxySort.java @@ -24,19 +24,20 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.x4o.vasc.core.AbstractVascBackendProxy; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.AbstractVascBackendProxy; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; + @@ -58,7 +59,7 @@ public class VascBackendProxySort extends AbstractVascBackendProxy { // sort stuff /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ @SuppressWarnings("unchecked") @Override diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyTimerLogger.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyTimerLogger.java similarity index 83% rename from vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyTimerLogger.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyTimerLogger.java index 6680d8f..07dddf9 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyTimerLogger.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/VascBackendProxyTimerLogger.java @@ -24,17 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl; +package net.forwardfire.vasc.impl; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import org.x4o.vasc.core.AbstractVascBackendProxy; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.AbstractVascBackendProxy; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascException; /** @@ -54,7 +54,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) + * @see net.forwardfire.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { @@ -79,7 +79,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(org.x4o.vasc.core.VascBackendState, java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(net.forwardfire.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state, Object primaryId) throws VascException { @@ -93,7 +93,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(org.x4o.vasc.core.VascBackendState, java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(net.forwardfire.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state, Object primaryId) throws VascException { @@ -107,7 +107,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) */ @Override public void delete(Object object) throws VascException { @@ -121,7 +121,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) */ @Override public Object merge(Object object) throws VascException { @@ -135,7 +135,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see org.x4o.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) + * @see net.forwardfire.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) */ @Override public void persist(Object object) throws VascException { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/AddRowAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/AddRowAction.java similarity index 89% rename from vasc-core/src/main/java/org/x4o/vasc/impl/actions/AddRowAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/AddRowAction.java index a206e3f..71c0288 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/AddRowAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/AddRowAction.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.actions; +package net.forwardfire.vasc.impl.actions; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.actions.AbstractVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.actions.AbstractVascAction; -import org.x4o.vasc.core.actions.RowVascAction; /** @@ -54,7 +55,7 @@ public class AddRowAction extends AbstractVascAction implements RowVascAction { } /** - * @see org.x4o.vasc.core.actions.RowVascAction#isMultiRowAction() + * @see net.forwardfire.vasc.core.actions.RowVascAction#isMultiRowAction() */ public boolean isMultiRowAction() { return false; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/CSVExportGlobalAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/CSVExportGlobalAction.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/impl/actions/CSVExportGlobalAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/CSVExportGlobalAction.java index d76820e..ea6033c 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/CSVExportGlobalAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/CSVExportGlobalAction.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.actions; +package net.forwardfire.vasc.impl.actions; import java.io.OutputStream; import java.io.PrintWriter; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.actions.AbstractVascAction; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.actions.AbstractVascAction; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.entry.VascEntryExporter; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/DeleteRowAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/DeleteRowAction.java similarity index 88% rename from vasc-core/src/main/java/org/x4o/vasc/impl/actions/DeleteRowAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/DeleteRowAction.java index 001282b..32eab96 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/DeleteRowAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/DeleteRowAction.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.actions; +package net.forwardfire.vasc.impl.actions; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.actions.AbstractVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.actions.AbstractVascAction; -import org.x4o.vasc.core.actions.RowVascAction; /** @@ -54,7 +55,7 @@ public class DeleteRowAction extends AbstractVascAction implements RowVascAction } /** - * @see org.x4o.vasc.core.actions.RowVascAction#isMultiRowAction() + * @see net.forwardfire.vasc.core.actions.RowVascAction#isMultiRowAction() */ public boolean isMultiRowAction() { return true; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/EditRowAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/EditRowAction.java similarity index 86% rename from vasc-core/src/main/java/org/x4o/vasc/impl/actions/EditRowAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/EditRowAction.java index e726f41..e1ba7a4 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/EditRowAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/EditRowAction.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.actions; +package net.forwardfire.vasc.impl.actions; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.actions.AbstractVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.actions.AbstractVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; /** @@ -59,7 +60,7 @@ public class EditRowAction extends AbstractVascAction implements RowVascAction { /** - * @see org.x4o.vasc.core.actions.RowVascAction#isMultiRowAction() + * @see net.forwardfire.vasc.core.actions.RowVascAction#isMultiRowAction() */ public boolean isMultiRowAction() { return false; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/RefreshDataGlobalAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/RefreshDataGlobalAction.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/impl/actions/RefreshDataGlobalAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/RefreshDataGlobalAction.java index e76cc73..7c899f8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/RefreshDataGlobalAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/RefreshDataGlobalAction.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.actions; +package net.forwardfire.vasc.impl.actions; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.actions.AbstractVascAction; +import net.forwardfire.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.actions.AbstractVascAction; -import org.x4o.vasc.core.actions.GlobalVascAction; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/XMLExportGlobalAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/XMLExportGlobalAction.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/impl/actions/XMLExportGlobalAction.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/XMLExportGlobalAction.java index fc62338..2358088 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/actions/XMLExportGlobalAction.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/XMLExportGlobalAction.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.actions; +package net.forwardfire.vasc.impl.actions; import java.io.OutputStream; import java.io.PrintWriter; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.actions.AbstractVascAction; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.actions.AbstractVascAction; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.entry.VascEntryExporter; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java similarity index 83% rename from vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java index edec9a9..79ab23f 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.entry; +package net.forwardfire.vasc.impl.entry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; + import org.x4o.xml.impl.DefaultElementObjectPropertyValue; /** @@ -53,7 +54,7 @@ public class BeanPropertyVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see org.x4o.vasc.core.column.VascColumnValue#getValue(org.x4o.vasc.core.column.VascTableColumn, java.lang.Object) + * @see net.forwardfire.vasc.core.column.VascColumnValue#getValue(net.forwardfire.vasc.core.column.VascTableColumn, java.lang.Object) */ public Object getValue(VascEntryField column,Object record) throws VascException { if(getProperty()==null) { @@ -70,14 +71,14 @@ public class BeanPropertyVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getDisplayValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getDisplayValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object) */ public String getDisplayValue(VascEntryField field, Object record) throws VascException { return ""+getValue(field,record); // not supported } /** - * @see org.x4o.vasc.core.column.VascColumnValue#setValue(org.x4o.vasc.core.column.VascTableColumn, java.lang.Object, java.lang.Object) + * @see net.forwardfire.vasc.core.column.VascColumnValue#setValue(net.forwardfire.vasc.core.column.VascTableColumn, java.lang.Object, java.lang.Object) */ public void setValue(VascEntryField column, Object record,Object value) throws VascException { if(getProperty()==null) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanVascEntryRecordCreator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanVascEntryRecordCreator.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanVascEntryRecordCreator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanVascEntryRecordCreator.java index 2631ca8..fc08406 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanVascEntryRecordCreator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/BeanVascEntryRecordCreator.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.entry; +package net.forwardfire.vasc.impl.entry; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/DefaultVascEntryResourceResolver.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryResourceResolver.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/impl/entry/DefaultVascEntryResourceResolver.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryResourceResolver.java index e1a90dc..2e3201e 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/DefaultVascEntryResourceResolver.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryResourceResolver.java @@ -24,14 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.entry; +package net.forwardfire.vasc.impl.entry; import java.text.MessageFormat; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.x4o.vasc.core.entry.VascEntryResourceResolver; +import net.forwardfire.vasc.core.entry.VascEntryResourceResolver; /** @@ -48,7 +48,7 @@ public class DefaultVascEntryResourceResolver implements VascEntryResourceResolv } public DefaultVascEntryResourceResolver(ResourceBundle resourceBundle) { - setResourceBundle(resourceBundle); + this.resourceBundle = resourceBundle; } public DefaultVascEntryResourceResolver(String baseName,Locale locale) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/HibernateValidatorService.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/impl/entry/HibernateValidatorService.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java index 1d5af5b..7beb4bf 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/HibernateValidatorService.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.entry; +package net.forwardfire.vasc.impl.entry; import java.io.Serializable; import java.lang.annotation.Annotation; @@ -38,14 +38,15 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.logging.Logger; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService; + import org.hibernate.validator.ClassValidator; import org.hibernate.validator.InvalidValue; import org.hibernate.validator.MessageInterpolator; import org.hibernate.validator.Validator; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValidatorService; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/PersistanceValidatorService.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/PersistanceValidatorService.java similarity index 89% rename from vasc-core/src/main/java/org/x4o/vasc/impl/entry/PersistanceValidatorService.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/PersistanceValidatorService.java index b2c1bdb..b75d470 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/PersistanceValidatorService.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/PersistanceValidatorService.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.entry; +package net.forwardfire.vasc.impl.entry; import java.lang.reflect.Method; import java.util.ArrayList; @@ -35,13 +35,14 @@ import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValidatorService; -import org.x4o.vasc.validators.VascObjectNotNullValidator; -import org.x4o.vasc.validators.VascStringLengthValidator; -import org.x4o.vasc.validators.VascValidator; -import org.x4o.vasc.validators.VascValidatorMessages; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService; +import net.forwardfire.vasc.validators.VascObjectNotNullValidator; +import net.forwardfire.vasc.validators.VascStringLengthValidator; +import net.forwardfire.vasc.validators.VascValidator; +import net.forwardfire.vasc.validators.VascValidatorMessages; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/SetParameterBackendListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java similarity index 85% rename from vasc-core/src/main/java/org/x4o/vasc/impl/entry/SetParameterBackendListener.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java index 32ce67f..3805bef 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/SetParameterBackendListener.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java @@ -1,8 +1,9 @@ -package org.x4o.vasc.impl.entry; +package net.forwardfire.vasc.impl.entry; + +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.entry.VascEntryBackendEventListener; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.entry.VascEntryBackendEventListener; public class SetParameterBackendListener implements VascEntryBackendEventListener { @@ -27,7 +28,7 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene } /** - * @see org.x4o.vasc.core.entry.VascEntryBackendEventListener#getEventType() + * @see net.forwardfire.vasc.core.entry.VascEntryBackendEventListener#getEventType() */ public VascBackendEventType[] getEventTypes() { return new VascBackendEventType[] { @@ -42,7 +43,7 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene } /** - * @see org.x4o.vasc.core.entry.VascEntryBackendEventListener#vascEvent(org.x4o.vasc.core.VascEntry, java.lang.Object) + * @see net.forwardfire.vasc.core.entry.VascEntryBackendEventListener#vascEvent(net.forwardfire.vasc.core.VascEntry, java.lang.Object) */ public void vascEvent(VascEntry entry, Object data) { if (data instanceof VascBackendState) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/VascValidatorsValidatorService.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/VascValidatorsValidatorService.java similarity index 89% rename from vasc-core/src/main/java/org/x4o/vasc/impl/entry/VascValidatorsValidatorService.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/VascValidatorsValidatorService.java index 3638b85..469e196 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/entry/VascValidatorsValidatorService.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/VascValidatorsValidatorService.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.entry; +package net.forwardfire.vasc.impl.entry; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValidatorService; -import org.x4o.vasc.validators.VascValidator; -import org.x4o.vasc.validators.VascValidatorMessages; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService; +import net.forwardfire.vasc.validators.VascValidator; +import net.forwardfire.vasc.validators.VascValidatorMessages; + /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldType.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldType.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldType.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldType.java index 5cf597c..a2d1da0 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldType.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldType.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.type; +package net.forwardfire.vasc.impl.type; -import org.x4o.vasc.core.AbstractVascEntryFieldType; -import org.x4o.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.core.AbstractVascEntryFieldType; +import net.forwardfire.vasc.core.VascEntryFieldType; /** * Only knows how to clone its self. diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldTypeController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java similarity index 89% rename from vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldTypeController.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java index bb3b056..cbb9188 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldTypeController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.type; +package net.forwardfire.vasc.impl.type; import java.util.ArrayList; import java.util.Collections; @@ -32,9 +32,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.core.VascEntryFieldType; -import org.x4o.vasc.core.VascEntryFieldTypeControllerLocal; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.core.VascEntryFieldTypeControllerLocal; +import net.forwardfire.vasc.core.VascException; /** @@ -71,7 +71,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo } /** - * @see org.x4o.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeById(java.lang.String) + * @see net.forwardfire.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeById(java.lang.String) */ public VascEntryFieldType getVascEntryFieldTypeById(String id) { VascEntryFieldType result = vascEntryFieldTypes.get(id); @@ -96,7 +96,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo /** - * @see org.x4o.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeIds() + * @see net.forwardfire.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeIds() */ public List getVascEntryFieldTypeIds() { List result = new ArrayList(5); diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/type/FieldTypeParser.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeParser.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/impl/type/FieldTypeParser.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeParser.java index 3f53da3..d5f4773 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/type/FieldTypeParser.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/FieldTypeParser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.type; +package net.forwardfire.vasc.impl.type; import java.io.IOException; import java.util.ArrayList; @@ -33,9 +33,10 @@ import java.util.List; import javax.xml.parsers.ParserConfigurationException; +import net.forwardfire.vasc.core.VascEntryFieldType; + import org.xml.sax.SAXException; -import org.x4o.vasc.core.VascEntryFieldType; import org.x4o.xml.core.X4OParser; import org.x4o.xml.element.Element; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/type/MultiTextVascEntryFieldType.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java similarity index 92% rename from vasc-core/src/main/java/org/x4o/vasc/impl/type/MultiTextVascEntryFieldType.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java index 0ec2a0b..a22b47a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/type/MultiTextVascEntryFieldType.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.type; +package net.forwardfire.vasc.impl.type; import java.util.List; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFieldType; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascValueModel; + @@ -110,7 +111,7 @@ public class MultiTextVascEntryFieldType extends DefaultVascEntryFieldType { */ /** - * @see org.x4o.vasc.core.AbstractVascEntryFieldType#getUIComponentCount(org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.AbstractVascEntryFieldType#getUIComponentCount(net.forwardfire.vasc.core.VascEntryField) */ @Override public int getUIComponentCount(VascEntryField entryField) throws VascException { @@ -133,7 +134,7 @@ public class MultiTextVascEntryFieldType extends DefaultVascEntryFieldType { } /** - * @see org.x4o.vasc.core.AbstractVascEntryFieldType#provideEditorVascValueModel(int, org.x4o.vasc.core.VascEntryField) + * @see net.forwardfire.vasc.core.AbstractVascEntryFieldType#provideEditorVascValueModel(int, net.forwardfire.vasc.core.VascEntryField) */ @Override public VascValueModel provideEditorVascValueModel(final int index,final VascEntryField entryField) { diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/AnnotationParserElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/AnnotationParserElement.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java index edaa2f4..8449862 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/AnnotationParserElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/AnnotationParserElement.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; import java.io.IOException; import java.io.StringReader; @@ -38,17 +38,18 @@ import java.util.Properties; import java.util.Set; -import org.x4o.vasc.annotations.VascAnnotationParser; -import org.x4o.vasc.annotations.VascChoices; -import org.x4o.vasc.annotations.VascChoicesSelectItemModel; -import org.x4o.vasc.annotations.VascEventListener; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFieldType; -import org.x4o.vasc.impl.DefaultVascEntryField; -import org.x4o.vasc.validators.VascValidator; -import org.x4o.vasc.validators.VascValidatorClassParser; +import net.forwardfire.vasc.annotations.VascAnnotationParser; +import net.forwardfire.vasc.annotations.VascChoices; +import net.forwardfire.vasc.annotations.VascChoicesSelectItemModel; +import net.forwardfire.vasc.annotations.VascEventListener; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.impl.DefaultVascEntryField; +import net.forwardfire.vasc.validators.VascValidator; +import net.forwardfire.vasc.validators.VascValidatorClassParser; + import org.x4o.xml.core.X4OParser; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SelectItemModelBindingHandler.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SelectItemModelBindingHandler.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java index 3cfadcf..71ffb21 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SelectItemModelBindingHandler.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFieldType; -import org.x4o.vasc.core.ui.VascSelectItemModel; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.core.ui.VascSelectItemModel; + import org.x4o.xml.element.AbstractElementBindingHandler; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementBindingHandlerException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SetParameterElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SetParameterElement.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java index 898a435..65a8f97 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SetParameterElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SetParameterElement.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; import java.util.logging.Logger; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; + import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascBackendElementConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java similarity index 91% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascBackendElementConfigurator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java index b68f547..b32e912 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascBackendElementConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendController; -import org.x4o.vasc.core.VascBackendControllerLocal; -import org.x4o.vasc.core.VascController; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendController; +import net.forwardfire.vasc.core.VascBackendControllerLocal; +import net.forwardfire.vasc.core.VascController; + import org.x4o.xml.element.AbstractElementConfigurator; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementConfiguratorException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryActionElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java similarity index 92% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryActionElement.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java index 9e99add..6ccd88f 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryActionElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryActionElement.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.actions.ColumnVascAction; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.actions.ColumnVascAction; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; + import org.x4o.xml.core.X4OParser; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryElementConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryElementConfigurator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java index 6867ac1..6391eda 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryElementConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryController; -import org.x4o.vasc.core.VascEntryControllerLocal; -import org.x4o.vasc.core.VascException; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryController; +import net.forwardfire.vasc.core.VascEntryControllerLocal; +import net.forwardfire.vasc.core.VascException; + import org.x4o.xml.element.AbstractElementConfigurator; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementConfiguratorException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldBindingHandler.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java similarity index 95% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldBindingHandler.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java index 0a9580c..860ac44 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldBindingHandler.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; + import org.x4o.xml.element.AbstractElementBindingHandler; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementBindingHandlerException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldElement.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldElement.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldElement.java index aeb41ac..431a668 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldElement.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; import java.util.logging.Logger; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; + import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java index 9b922ca..9ddb9bb 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascEntryFieldSet; +import net.forwardfire.vasc.core.VascEntryFieldSet; + import org.x4o.xml.element.AbstractElementAttributeConverter; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementAttributeConverterException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java similarity index 96% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java index 03fe736..87b1252 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascController; +import net.forwardfire.vasc.core.VascController; + import org.x4o.xml.element.AbstractElementAttributeConverter; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementAttributeConverterException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeElement.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java index 429a494..ea5ee53 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldTypeElement.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; import java.util.logging.Logger; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryFieldType; +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; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEventListenerElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEventListenerElement.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEventListenerElement.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEventListenerElement.java index d064bc4..e9ed7e9 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEventListenerElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEventListenerElement.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; + import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascLinkEntryParameterElement.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascLinkEntryParameterElement.java similarity index 94% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascLinkEntryParameterElement.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascLinkEntryParameterElement.java index 5de90ee..2dd81d6 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascLinkEntryParameterElement.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascLinkEntryParameterElement.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.impl.DefaultVascSelectItemModel; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.impl.DefaultVascSelectItemModel; + import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascParser.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParser.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascParser.java rename to vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParser.java index 531af08..f182340 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascParser.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascParser.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.impl.x4o; +package net.forwardfire.vasc.impl.x4o; import javax.el.ValueExpression; -import org.x4o.vasc.core.VascController; +import net.forwardfire.vasc.core.VascController; + import org.x4o.xml.core.AbstractX4OPhaseHandler; import org.x4o.xml.core.X4OParser; import org.x4o.xml.core.X4OPhase; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFuture.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFuture.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFuture.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFuture.java index d4e9ad6..9a1b9ad 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFuture.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFuture.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFutureValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java similarity index 88% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFutureValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java index 3f373c2..2a4eb9d 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFutureValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; import java.util.Date; @@ -38,7 +38,7 @@ import java.util.Date; public class VascDateFutureValidator implements VascValidator { /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Date)==false) { @@ -50,14 +50,14 @@ public class VascDateFutureValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascDateFuture.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePast.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePast.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePast.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePast.java index 0877175..55311c2 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePast.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePast.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePastValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java similarity index 88% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePastValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java index 6128354..78ce6d1 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePastValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; import java.util.Date; @@ -38,7 +38,7 @@ import java.util.Date; public class VascDatePastValidator implements VascValidator { /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Date)==false) { @@ -50,14 +50,14 @@ public class VascDatePastValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascDatePast.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSize.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSize.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSize.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSize.java index 73fe2c1..431412a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSize.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSize.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSizeValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSizeValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java index 7f1206a..cdbc0d0 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSizeValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; @@ -40,7 +40,7 @@ public class VascIntSizeValidator implements VascValidator { private int min = Integer.MIN_VALUE; /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Integer)==false) { @@ -57,14 +57,14 @@ public class VascIntSizeValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascIntSizeValidator.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { VascIntSize a = VascIntSize.class.cast(annotation); diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSize.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSize.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSize.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSize.java index 987c771..a53b2ac 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSize.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSize.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSizeValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSizeValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java index 9fe0f8f..b3ac468 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSizeValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; @@ -40,7 +40,7 @@ public class VascLongSizeValidator implements VascValidator { private long min = Long.MIN_VALUE; /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Long)==false) { @@ -57,14 +57,14 @@ public class VascLongSizeValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascLongSize.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { VascLongSize a = VascLongSize.class.cast(annotation); diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNull.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNull.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNull.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNull.java index 7033d9f..e285a63 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNull.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNull.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNullValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java similarity index 87% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNullValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java index 4d1780a..6d43953 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNullValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; @@ -37,21 +37,21 @@ import java.lang.annotation.Annotation; public class VascObjectNotNullValidator implements VascValidator { /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { return object!=null; } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascObjectNotNull.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNull.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNull.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNull.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNull.java index 8605b20..e25f413 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNull.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNull.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNullValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java similarity index 87% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNullValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java index d4adc2c..0f0e5d7 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNullValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; @@ -37,21 +37,21 @@ import java.lang.annotation.Annotation; public class VascObjectNullValidator implements VascValidator { /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { return object==null; } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascObjectNull.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrl.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrl.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrl.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrl.java index 1a0e359..582733e 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrl.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrl.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrlValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java similarity index 92% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrlValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java index f7efa52..0172782 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrlValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; import java.net.MalformedURLException; @@ -64,7 +64,7 @@ public class VascObjectUrlValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { @@ -95,14 +95,14 @@ public class VascObjectUrlValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascObjectNull.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { VascObjectUrl a = VascObjectUrl.class.cast(annotation); diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmail.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmail.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmail.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmail.java index 40b57f5..c1b52df 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmail.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmail.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmailValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java similarity index 92% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmailValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java index 47ffd12..5e44d2b 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmailValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; /** * Validates emails addresses. @@ -49,14 +49,14 @@ public class VascStringEmailValidator extends VascStringRegexValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascStringEmail.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.Class) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.Class) */ public void initAnnotation(Class annotationType) { } diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLength.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLength.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLength.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLength.java index 2ce92ce..863407a 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLength.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLength.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLengthValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java similarity index 93% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLengthValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java index 91a38a3..66792fa 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLengthValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; @@ -41,7 +41,7 @@ public class VascStringLengthValidator implements VascValidator { private boolean nullable = false; /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { if (nullable && object==null) { @@ -108,7 +108,7 @@ public class VascStringLengthValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { VascStringLength a = VascStringLength.class.cast(annotation); diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegex.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegex.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegex.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegex.java index 177d30f..cad682f 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegex.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegex.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegexValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java similarity index 90% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegexValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java index e954397..e6f96ad 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegexValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; import java.util.regex.Matcher; @@ -62,7 +62,7 @@ public class VascStringRegexValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof String)==false) { @@ -74,14 +74,14 @@ public class VascStringRegexValidator implements VascValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascStringRegex.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { VascStringRegex a = VascStringRegex.class.cast(annotation); diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCode.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCode.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCode.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCode.java index 836a4d9..9162daa 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCode.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCode.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCodeValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java similarity index 92% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCodeValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java index 1c7e0e0..c22c817 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCodeValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; /** * Validates @@ -60,14 +60,14 @@ public class VascStringZipCodeValidator extends VascStringRegexValidator { } /** - * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() + * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascStringZipCode.class; } /** - * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.Class) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.Class) */ public void initAnnotation(Class annotationType) { VascStringRegex a = VascStringRegex.class.cast(annotationType); diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidator.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascValidator.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidator.java index 03900eb..bf170c8 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorClassParser.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorClassParser.java similarity index 98% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorClassParser.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorClassParser.java index e14cb93..d5569f6 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorClassParser.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorClassParser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorException.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorException.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorException.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorException.java index 96ccde7..bffbcca 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorException.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorException.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; /** diff --git a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorMessages.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorMessages.java similarity index 97% rename from vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorMessages.java rename to vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorMessages.java index b09b3b1..08a3f38 100644 --- a/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorMessages.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascValidatorMessages.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.validators; +package net.forwardfire.vasc.validators; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; /** * The VascValidator interface 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 b5550ce..807c93a 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 @@ -1,27 +1,27 @@ - + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/vasc-core/src/main/resources/META-INF/fieldtypes.xml b/vasc-core/src/main/resources/META-INF/fieldtypes.xml index 55152e8..d678ffb 100644 --- a/vasc-core/src/main/resources/META-INF/fieldtypes.xml +++ b/vasc-core/src/main/resources/META-INF/fieldtypes.xml @@ -1,7 +1,7 @@ @@ -100,7 +100,7 @@ - + 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 7c38b5a..1290922 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 @@ -1,92 +1,92 @@ - + - - - - - - + + + + + + - + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/vasc-core/src/test/java/org/x4o/vasc/FieldTypesTest.java b/vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java similarity index 94% rename from vasc-core/src/test/java/org/x4o/vasc/FieldTypesTest.java rename to vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java index 73a1478..de76fa7 100644 --- a/vasc-core/src/test/java/org/x4o/vasc/FieldTypesTest.java +++ b/vasc-core/src/test/java/net/forwardfire/vasc/FieldTypesTest.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc; +package net.forwardfire.vasc; import java.io.InputStream; import java.util.logging.LogManager; -import org.x4o.vasc.core.VascEntryFieldType; -import org.x4o.vasc.impl.type.FieldTypeParser; +import net.forwardfire.vasc.core.VascEntryFieldType; +import net.forwardfire.vasc.impl.type.FieldTypeParser; + import junit.framework.TestCase; diff --git a/vasc-ejb3/pom.xml b/vasc-ejb3/pom.xml index 069b4bb..a6dad52 100644 --- a/vasc-ejb3/pom.xml +++ b/vasc-ejb3/pom.xml @@ -2,22 +2,22 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-ejb3 0.3.5-SNAPSHOT vasc-ejb3 vasc-ejb3 - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} - org.x4o.vasc + net.forwardfire.vasc vasc-backend-jpa ${project.version} @@ -34,7 +34,7 @@ provided - org.x4o.vasc + net.forwardfire.vasc vasc-xpql-ejb3 ${project.version} provided diff --git a/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManager.java b/vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManager.java similarity index 96% rename from vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManager.java rename to vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManager.java index 73a90be..b795795 100644 --- a/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManager.java +++ b/vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManager.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.ejb3; +package net.forwardfire.vasc.ejb3; import java.util.List; import java.util.Map; @@ -32,7 +32,7 @@ import java.util.Map; import javax.ejb.Local; import javax.ejb.Remote; -import org.x4o.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntry; /** diff --git a/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManagerImpl.java b/vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java similarity index 91% rename from vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManagerImpl.java rename to vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java index 31c8b67..6a2296a 100644 --- a/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManagerImpl.java +++ b/vasc-ejb3/src/main/java/net/forwardfire/vasc/ejb3/VascServiceManagerImpl.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.ejb3; +package net.forwardfire.vasc.ejb3; import java.io.IOException; import java.io.InputStream; @@ -50,24 +50,25 @@ import javax.persistence.EntityManager; -import org.x4o.vasc.backends.jpa.EntityManagerProvider; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendControllerLocal; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.impl.DefaultVascBackedEntryFinalizer; -import org.x4o.vasc.impl.DefaultVascEntryController; -import org.x4o.vasc.impl.DefaultVascFactory; -import org.x4o.vasc.impl.VascBackendProxyEventExecutor; -import org.x4o.vasc.impl.actions.AddRowAction; -import org.x4o.vasc.impl.actions.CSVExportGlobalAction; -import org.x4o.vasc.impl.actions.DeleteRowAction; -import org.x4o.vasc.impl.actions.EditRowAction; -import org.x4o.vasc.impl.actions.XMLExportGlobalAction; -import org.x4o.vasc.impl.entry.DefaultVascEntryResourceResolver; -import org.x4o.vasc.impl.x4o.VascParser; -import org.x4o.vasc.xpql.ejb3.XpqlQueryManager; -import org.x4o.vasc.xpql.query.Query; +import net.forwardfire.vasc.backends.jpa.EntityManagerProvider; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendControllerLocal; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.impl.DefaultVascBackedEntryFinalizer; +import net.forwardfire.vasc.impl.DefaultVascEntryController; +import net.forwardfire.vasc.impl.DefaultVascFactory; +import net.forwardfire.vasc.impl.VascBackendProxyEventExecutor; +import net.forwardfire.vasc.impl.actions.AddRowAction; +import net.forwardfire.vasc.impl.actions.CSVExportGlobalAction; +import net.forwardfire.vasc.impl.actions.DeleteRowAction; +import net.forwardfire.vasc.impl.actions.EditRowAction; +import net.forwardfire.vasc.impl.actions.XMLExportGlobalAction; +import net.forwardfire.vasc.impl.entry.DefaultVascEntryResourceResolver; +import net.forwardfire.vasc.impl.x4o.VascParser; +import net.forwardfire.vasc.xpql.ejb3.XpqlQueryManager; +import net.forwardfire.vasc.xpql.query.Query; + import org.x4o.xml.core.AbstractX4OPhaseHandler; import org.x4o.xml.core.X4OPhase; import org.x4o.xml.core.X4OPhaseException; @@ -313,7 +314,7 @@ public class VascServiceManagerImpl implements VascServiceManager.IRemote,VascSe class DatafeedsEntityManagerProvider implements EntityManagerProvider { /** - * @see org.x4o.vasc.backends.jpa.EntityManagerProvider#getEntityManager() + * @see net.forwardfire.vasc.backends.jpa.EntityManagerProvider#getEntityManager() */ public EntityManager getEntityManager() { return entityManager; diff --git a/vasc-frontend-swing/pom.xml b/vasc-frontend-swing/pom.xml index 6274b4e..225d913 100644 --- a/vasc-frontend-swing/pom.xml +++ b/vasc-frontend-swing/pom.xml @@ -2,17 +2,17 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-frontend-swing 0.3.5-SNAPSHOT vasc-frontend-swing vasc-frontend-swing - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} @@ -30,5 +30,11 @@ microba 0.4.4.1 + + de.odysseus.juel + juel + ${juel.version} + test + \ No newline at end of file diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/SwingVascFrontend.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java similarity index 94% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/SwingVascFrontend.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java index acd6d19..a879fd6 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/SwingVascFrontend.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing; +package net.forwardfire.vasc.frontends.swing; import java.awt.BorderLayout; import java.awt.Color; @@ -64,24 +64,25 @@ import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import org.x4o.vasc.core.AbstractVascFrontend; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryExporter; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.ui.VascColumnValueModelListener; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; -import org.x4o.vasc.frontends.swing.ui.SwingBoolean; -import org.x4o.vasc.frontends.swing.ui.SwingButton; -import org.x4o.vasc.frontends.swing.ui.SwingColorChooser; -import org.x4o.vasc.frontends.swing.ui.SwingLabel; -import org.x4o.vasc.frontends.swing.ui.SwingList; -import org.x4o.vasc.frontends.swing.ui.SwingText; -import org.x4o.vasc.frontends.swing.ui.SwingTextArea; +import net.forwardfire.vasc.core.AbstractVascFrontend; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.ui.VascColumnValueModelListener; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.frontends.swing.ui.SwingBoolean; +import net.forwardfire.vasc.frontends.swing.ui.SwingButton; +import net.forwardfire.vasc.frontends.swing.ui.SwingColorChooser; +import net.forwardfire.vasc.frontends.swing.ui.SwingLabel; +import net.forwardfire.vasc.frontends.swing.ui.SwingList; +import net.forwardfire.vasc.frontends.swing.ui.SwingText; +import net.forwardfire.vasc.frontends.swing.ui.SwingTextArea; + /** @@ -100,7 +101,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { } /** - * @see org.x4o.vasc.core.VascFrontend#getFrontendType() + * @see net.forwardfire.vasc.core.VascFrontend#getFrontendType() */ public String getFrontendType() { return "swing"; @@ -145,7 +146,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { /** - * @see org.x4o.vasc.core.VascViewRenderer#renderEdit(org.x4o.vasc.core.VascEntry, java.lang.Object) + * @see net.forwardfire.vasc.core.VascViewRenderer#renderEdit(net.forwardfire.vasc.core.VascEntry, java.lang.Object) */ public void renderEdit() throws Exception { logger.fine("Rending Edit View"); @@ -327,7 +328,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { /** - * @see org.x4o.vasc.core.VascViewRenderer#renderExport(org.x4o.vasc.core.VascEntry, org.x4o.vasc.core.VascDataExporter) + * @see net.forwardfire.vasc.core.VascViewRenderer#renderExport(net.forwardfire.vasc.core.VascEntry, net.forwardfire.vasc.core.VascDataExporter) */ public void renderExport(VascEntryExporter exporter) throws Exception { @@ -361,7 +362,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { /** - * @see org.x4o.vasc.core.VascViewRenderer#renderView(org.x4o.vasc.core.VascEntry) + * @see net.forwardfire.vasc.core.VascViewRenderer#renderView(net.forwardfire.vasc.core.VascEntry) */ public void renderView() throws Exception { diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingBoolean.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingBoolean.java similarity index 83% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingBoolean.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingBoolean.java index 88bf252..a112376 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingBoolean.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingBoolean.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; import java.awt.event.ActionEvent; @@ -33,11 +33,12 @@ import java.awt.event.ActionListener; import javax.swing.JCheckBox; import javax.swing.JComponent; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + @@ -62,7 +63,7 @@ public class SwingBoolean implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (checkBox==null) { @@ -72,7 +73,7 @@ public class SwingBoolean implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (checkBox==null) { @@ -87,28 +88,28 @@ public class SwingBoolean implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !checkBox.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { checkBox.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return checkBox.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { checkBox.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingButton.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingButton.java similarity index 79% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingButton.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingButton.java index fd86045..56b31e5 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingButton.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingButton.java @@ -24,18 +24,19 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; import javax.swing.JButton; import javax.swing.JComponent; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + /** @@ -58,7 +59,7 @@ public class SwingButton implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (vascButton==null) { @@ -68,7 +69,7 @@ public class SwingButton implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (vascButton==null) { @@ -83,28 +84,28 @@ public class SwingButton implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !vascButton.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { vascButton.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return vascButton.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { vascButton.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingColorChooser.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingColorChooser.java similarity index 86% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingColorChooser.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingColorChooser.java index 7f9c489..fe9c1a3 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingColorChooser.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingColorChooser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; import java.awt.event.ActionEvent; @@ -34,11 +34,12 @@ import javax.swing.JButton; import javax.swing.JColorChooser; import javax.swing.JComponent; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + /** @@ -61,7 +62,7 @@ public class SwingColorChooser implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (colorButton==null) { @@ -71,7 +72,7 @@ public class SwingColorChooser implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (colorButton==null) { @@ -86,28 +87,28 @@ public class SwingColorChooser implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !colorButton.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { colorButton.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return colorButton.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { colorButton.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingDate.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java similarity index 83% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingDate.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java index 1c8918c..cf974b7 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingDate.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; import java.awt.event.ActionEvent; @@ -34,11 +34,12 @@ import java.util.Date; import javax.swing.JComponent; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + import com.michaelbaranov.microba.calendar.DatePicker; @@ -68,7 +69,7 @@ public class SwingDate implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (datePicker==null) { @@ -78,7 +79,7 @@ public class SwingDate implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (datePicker==null) { @@ -93,28 +94,28 @@ public class SwingDate implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !datePicker.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { datePicker.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return datePicker.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { datePicker.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingLabel.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingLabel.java similarity index 79% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingLabel.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingLabel.java index 2e02757..6f4b056 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingLabel.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingLabel.java @@ -24,18 +24,19 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; import javax.swing.JComponent; import javax.swing.JLabel; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + @@ -59,7 +60,7 @@ public class SwingLabel implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (label==null) { @@ -69,7 +70,7 @@ public class SwingLabel implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (label==null) { @@ -84,28 +85,28 @@ public class SwingLabel implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !label.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { label.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return label.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { label.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingList.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingList.java similarity index 84% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingList.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingList.java index 3e553d8..d9dc741 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingList.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingList.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; import java.awt.Component; @@ -37,13 +37,14 @@ import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascSelectItem; -import org.x4o.vasc.core.ui.VascSelectItemModel; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascSelectItem; +import net.forwardfire.vasc.core.ui.VascSelectItemModel; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + @@ -98,7 +99,7 @@ public class SwingList implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (comboBox==null) { @@ -108,7 +109,7 @@ public class SwingList implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (comboBox==null) { @@ -123,28 +124,28 @@ public class SwingList implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !comboBox.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { comboBox.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return comboBox.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { comboBox.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingText.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java similarity index 85% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingText.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java index d101c4c..aeea3ee 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingText.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; @@ -33,11 +33,12 @@ import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + @@ -61,7 +62,7 @@ public class SwingText implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (textField==null) { @@ -71,7 +72,7 @@ public class SwingText implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (textField==null) { @@ -86,28 +87,28 @@ public class SwingText implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !textField.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { textField.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return textField.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { textField.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingTextArea.java b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java similarity index 85% rename from vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingTextArea.java rename to vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java index 1c19ab7..41c96e6 100644 --- a/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingTextArea.java +++ b/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swing.ui; +package net.forwardfire.vasc.frontends.swing.ui; import java.awt.Color; @@ -34,11 +34,12 @@ import javax.swing.JTextArea; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; + @@ -70,7 +71,7 @@ public class SwingTextArea implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (textArea==null) { @@ -80,7 +81,7 @@ public class SwingTextArea implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (textArea==null) { @@ -95,28 +96,28 @@ public class SwingTextArea implements VascUIComponent { } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !textArea.isEnabled(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { textArea.setEnabled(!disabled); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() + * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return textArea.isVisible(); } /** - * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { textArea.setVisible(rendered); diff --git a/vasc-frontend-swing/src/test/java/org/x4o/vasc/SwingTest.java b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java similarity index 96% rename from vasc-frontend-swing/src/test/java/org/x4o/vasc/SwingTest.java rename to vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java index 2164543..87dda36 100644 --- a/vasc-frontend-swing/src/test/java/org/x4o/vasc/SwingTest.java +++ b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTest.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc; +package net.forwardfire.vasc; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -35,8 +35,9 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JPanel; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.frontends.swing.SwingVascFrontend; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.frontends.swing.SwingVascFrontend; + import junit.framework.TestCase; @@ -61,7 +62,7 @@ public class SwingTest extends TestCase { public void testNull() throws Exception { assertEquals(true, true); - main(new String[] {}); + //main(new String[] {}); } public static void main(String[] argu){ diff --git a/vasc-frontend-swt/src/test/java/org/x4o/vasc/TestModel.java b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModel.java similarity index 89% rename from vasc-frontend-swt/src/test/java/org/x4o/vasc/TestModel.java rename to vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModel.java index 9cc835c..180a034 100644 --- a/vasc-frontend-swt/src/test/java/org/x4o/vasc/TestModel.java +++ b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModel.java @@ -25,18 +25,20 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc; +package net.forwardfire.vasc; + import java.util.Date; -import org.x4o.vasc.annotations.VascDefaultValue; -import org.x4o.vasc.annotations.VascEntry; -import org.x4o.vasc.annotations.VascI18n; -import org.x4o.vasc.annotations.VascModelReference; -import org.x4o.vasc.annotations.VascStyle; -import org.x4o.vasc.validators.VascDateFuture; -import org.x4o.vasc.validators.VascObjectNotNull; -import org.x4o.vasc.validators.VascStringLength; +import net.forwardfire.vasc.annotations.VascDefaultValue; +import net.forwardfire.vasc.annotations.VascEntry; +import net.forwardfire.vasc.annotations.VascI18n; +import net.forwardfire.vasc.annotations.VascModelReference; +import net.forwardfire.vasc.annotations.VascStyle; +import net.forwardfire.vasc.validators.VascDateFuture; +import net.forwardfire.vasc.validators.VascObjectNotNull; +import net.forwardfire.vasc.validators.VascStringLength; + //import org.hibernate.validator.NotNull; //import org.hibernate.validator.Max; diff --git a/vasc-frontend-swt/src/test/java/org/x4o/vasc/TestModelVascDataSource.java b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java similarity index 86% rename from vasc-frontend-swt/src/test/java/org/x4o/vasc/TestModelVascDataSource.java rename to vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java index ee4c9cd..f523b42 100644 --- a/vasc-frontend-swt/src/test/java/org/x4o/vasc/TestModelVascDataSource.java +++ b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestModelVascDataSource.java @@ -24,23 +24,24 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc; +package net.forwardfire.vasc; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.x4o.vasc.core.AbstractVascBackend; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; -import org.x4o.vasc.core.ui.VascSelectItem; -import org.x4o.vasc.core.ui.VascSelectItemModel; -import org.x4o.vasc.impl.entry.BeanPropertyVascEntryFieldValue; -import org.x4o.vasc.impl.entry.BeanVascEntryRecordCreator; +import net.forwardfire.vasc.core.AbstractVascBackend; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.core.ui.VascSelectItem; +import net.forwardfire.vasc.core.ui.VascSelectItemModel; +import net.forwardfire.vasc.impl.entry.BeanPropertyVascEntryFieldValue; +import net.forwardfire.vasc.impl.entry.BeanVascEntryRecordCreator; + /** diff --git a/vasc-frontend-swt/src/test/java/org/x4o/vasc/TestTable.java b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestTable.java similarity index 77% rename from vasc-frontend-swt/src/test/java/org/x4o/vasc/TestTable.java rename to vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestTable.java index c4fbeab..50f6da8 100644 --- a/vasc-frontend-swt/src/test/java/org/x4o/vasc/TestTable.java +++ b/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/TestTable.java @@ -24,34 +24,35 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc; +package net.forwardfire.vasc; import java.io.File; import java.io.FileOutputStream; import java.lang.reflect.Method; import java.util.Locale; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendControllerLocal; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.impl.DefaultVascBackedEntryFinalizer; -import org.x4o.vasc.impl.DefaultVascFactory; -import org.x4o.vasc.impl.DefaultVascFrontendData; -import org.x4o.vasc.impl.DefaultVascFrontendHelper; -import org.x4o.vasc.impl.VascBackendProxyPaged; -import org.x4o.vasc.impl.VascBackendProxySearch; -import org.x4o.vasc.impl.VascBackendProxySort; -import org.x4o.vasc.impl.actions.AddRowAction; -import org.x4o.vasc.impl.actions.CSVExportGlobalAction; -import org.x4o.vasc.impl.actions.DeleteRowAction; -import org.x4o.vasc.impl.actions.EditRowAction; -import org.x4o.vasc.impl.actions.RefreshDataGlobalAction; -import org.x4o.vasc.impl.actions.XMLExportGlobalAction; -import org.x4o.vasc.impl.x4o.VascParser; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendControllerLocal; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.impl.DefaultVascBackedEntryFinalizer; +import net.forwardfire.vasc.impl.DefaultVascFactory; +import net.forwardfire.vasc.impl.DefaultVascFrontendData; +import net.forwardfire.vasc.impl.DefaultVascFrontendHelper; +import net.forwardfire.vasc.impl.VascBackendProxyPaged; +import net.forwardfire.vasc.impl.VascBackendProxySearch; +import net.forwardfire.vasc.impl.VascBackendProxySort; +import net.forwardfire.vasc.impl.actions.AddRowAction; +import net.forwardfire.vasc.impl.actions.CSVExportGlobalAction; +import net.forwardfire.vasc.impl.actions.DeleteRowAction; +import net.forwardfire.vasc.impl.actions.EditRowAction; +import net.forwardfire.vasc.impl.actions.RefreshDataGlobalAction; +import net.forwardfire.vasc.impl.actions.XMLExportGlobalAction; +import net.forwardfire.vasc.impl.x4o.VascParser; + @@ -76,7 +77,7 @@ public class TestTable { static public void fill(VascEntry entry,VascController vascController) { - VascFrontendData frontendData = DefaultVascFactory.getDefaultVascFrontendData("i18n.vasc", Locale.getDefault()); + VascFrontendData frontendData = DefaultVascFactory.getDefaultVascFrontendData(null); //DefaultVascFactory.getDefaultVascFrontendData("i18n.vasc", Locale.getDefault()); frontendData.setVascController(vascController); entry.setVascFrontendData(frontendData); VascBackend backend = DefaultVascFactory.getProxyVascBackend(entry); @@ -109,7 +110,7 @@ public class TestTable { VascParser parser = new VascParser(c); File f = File.createTempFile("test-vasc", ".xml"); parser.setDebugOutputStream(new FileOutputStream(f)); - parser.parseResource("vasc/tables.xml"); + parser.parseResource("net/forwardfire/vasc/tables.xml"); VascEntry entry = parser.getVascController().getVascEntryController().getVascEntryById("test1"); fill(entry,c); diff --git a/vasc-frontend-swing/src/test/resources/net/forwardfire/vasc/tables.xml b/vasc-frontend-swing/src/test/resources/net/forwardfire/vasc/tables.xml new file mode 100644 index 0000000..0e2b9ee --- /dev/null +++ b/vasc-frontend-swing/src/test/resources/net/forwardfire/vasc/tables.xml @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vasc-frontend-swt/pom.xml b/vasc-frontend-swt/pom.xml index bd17eef..8ed2bce 100644 --- a/vasc-frontend-swt/pom.xml +++ b/vasc-frontend-swt/pom.xml @@ -2,17 +2,17 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-frontend-swt 0.3.5-SNAPSHOT vasc-frontend-swt vasc-frontend-swt - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} diff --git a/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascEditDialog.java b/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascEditDialog.java similarity index 96% rename from vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascEditDialog.java rename to vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascEditDialog.java index e412363..a499d6f 100644 --- a/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascEditDialog.java +++ b/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascEditDialog.java @@ -24,7 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swt; +package net.forwardfire.vasc.frontends.swt; + +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.ui.VascColumnValueModelListener; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -41,12 +48,6 @@ import org.eclipse.swt.widgets.Dialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.ui.VascColumnValueModelListener; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; /** diff --git a/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascFrontend.java b/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascFrontend.java similarity index 93% rename from vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascFrontend.java rename to vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascFrontend.java index 1c36659..95b5193 100644 --- a/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascFrontend.java +++ b/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontends/swt/SwtVascFrontend.java @@ -24,13 +24,34 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.swt; +package net.forwardfire.vasc.frontends.swt; import java.io.FileOutputStream; import java.io.OutputStream; import java.util.logging.Level; import java.util.logging.Logger; +import net.forwardfire.vasc.core.AbstractVascFrontend; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; +import net.forwardfire.vasc.core.ui.VascOptionValueModelListener; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.core.ui.VascValueModelListener; +import net.forwardfire.vasc.frontends.swt.ui.SwtBoolean; +import net.forwardfire.vasc.frontends.swt.ui.SwtButton; +import net.forwardfire.vasc.frontends.swt.ui.SwtLabel; +import net.forwardfire.vasc.frontends.swt.ui.SwtList; +import net.forwardfire.vasc.frontends.swt.ui.SwtText; +import net.forwardfire.vasc.frontends.swt.ui.SwtTextArea; + import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; @@ -66,26 +87,6 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; -import org.x4o.vasc.core.AbstractVascFrontend; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryExporter; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import org.x4o.vasc.core.ui.VascOptionValueModelListener; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; -import org.x4o.vasc.core.ui.VascValueModelListener; -import org.x4o.vasc.frontends.swt.ui.SwtBoolean; -import org.x4o.vasc.frontends.swt.ui.SwtButton; -import org.x4o.vasc.frontends.swt.ui.SwtLabel; -import org.x4o.vasc.frontends.swt.ui.SwtList; -import org.x4o.vasc.frontends.swt.ui.SwtText; -import org.x4o.vasc.frontends.swt.ui.SwtTextArea; /** @@ -105,7 +106,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { } /** - * @see org.x4o.vasc.core.VascFrontend#getFrontendType() + * @see net.forwardfire.vasc.core.VascFrontend#getFrontendType() */ public String getFrontendType() { return "swt"; @@ -317,12 +318,12 @@ public class SwtVascFrontend extends AbstractVascFrontend { for (VascEntryField option:entry.getListOptions()) { for (int i=0;i4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-frontend-web-jsf 0.3.5-SNAPSHOT vasc-frontend-web-jsf vasc-frontend-web-jsf - org.x4o.vasc + net.forwardfire.vasc vasc-core ${project.version} - org.x4o.vasc + net.forwardfire.vasc vasc-ejb3 ${project.version} provided diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java similarity index 92% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java index be26c7c..2ab9f69 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -42,25 +42,26 @@ import javax.faces.context.FacesContext; import javax.naming.Context; import javax.naming.InitialContext; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendControllerLocal; -import org.x4o.vasc.core.VascBackendState; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryControllerLocal; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.entry.VascEntryBackendEventListener; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.entry.VascEntryRecordCreator; -import org.x4o.vasc.ejb3.VascServiceManager; -import org.x4o.vasc.impl.DefaultVascBackedEntryFinalizer; -import org.x4o.vasc.impl.DefaultVascFactory; -import org.x4o.vasc.impl.VascBackendProxyEventExecutor; -import org.x4o.vasc.impl.entry.DefaultVascEntryResourceResolver; -import org.x4o.vasc.impl.entry.SetParameterBackendListener; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendControllerLocal; +import net.forwardfire.vasc.core.VascBackendState; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryControllerLocal; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.entry.VascEntryBackendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryRecordCreator; +import net.forwardfire.vasc.ejb3.VascServiceManager; +import net.forwardfire.vasc.impl.DefaultVascBackedEntryFinalizer; +import net.forwardfire.vasc.impl.DefaultVascFactory; +import net.forwardfire.vasc.impl.VascBackendProxyEventExecutor; +import net.forwardfire.vasc.impl.entry.DefaultVascEntryResourceResolver; +import net.forwardfire.vasc.impl.entry.SetParameterBackendListener; + /** diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntryEventListener.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntryEventListener.java similarity index 86% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntryEventListener.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntryEventListener.java index 0fa65d4..933efbf 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntryEventListener.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntryEventListener.java @@ -1,7 +1,7 @@ /** * */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.util.ArrayList; import java.util.List; @@ -9,10 +9,11 @@ import java.util.List; import javax.el.ValueExpression; import javax.faces.context.FacesContext; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; + /** @@ -29,7 +30,7 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener } /** - * @see org.x4o.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() + * @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() */ public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java similarity index 97% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java index 4b50817..71cf060 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.io.Serializable; @@ -51,21 +51,22 @@ import javax.faces.model.SelectItem; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendPageNumber; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryState; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.VascLinkEntryType; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryExporter; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.impl.actions.AddRowAction; -import org.x4o.vasc.impl.actions.DeleteRowAction; -import org.x4o.vasc.impl.actions.EditRowAction; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendPageNumber; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryState; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.VascLinkEntryType; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.impl.actions.AddRowAction; +import net.forwardfire.vasc.impl.actions.DeleteRowAction; +import net.forwardfire.vasc.impl.actions.EditRowAction; + /** diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java similarity index 70% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java index 1def24e..b8b6fb2 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.io.Serializable; import java.util.logging.Logger; @@ -32,14 +32,15 @@ import java.util.logging.Logger; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; -import org.x4o.vasc.core.AbstractVascFrontend; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.entry.VascEntryExporter; -import org.x4o.vasc.frontends.web.jsf.ui.JSFBoolean; -import org.x4o.vasc.frontends.web.jsf.ui.JSFLabel; -import org.x4o.vasc.frontends.web.jsf.ui.JSFList; -import org.x4o.vasc.frontends.web.jsf.ui.JSFText; -import org.x4o.vasc.frontends.web.jsf.ui.JSFTextArea; +import net.forwardfire.vasc.core.AbstractVascFrontend; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFBoolean; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFLabel; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFList; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFText; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFTextArea; + /** @@ -61,7 +62,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser // Frontend Stuff /** - * @see org.x4o.vasc.core.VascFrontend#getFrontendType() + * @see net.forwardfire.vasc.core.VascFrontend#getFrontendType() */ public String getFrontendType() { return "jsf"; @@ -72,21 +73,21 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser VascFrontendData vfd = getVascEntry().getVascFrontendData(); // required UI components - vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_LABEL,JSFLabel.class.getName()); - vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_TEXT, JSFText.class.getName()); - vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_LIST, JSFList.class.getName()); - //vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_BUTTON, JSFButton.class.getName()); + vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_LABEL,JSFLabel.class.getName()); + vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_TEXT, JSFText.class.getName()); + vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_LIST, JSFList.class.getName()); + //vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_BUTTON, JSFButton.class.getName()); // optional UI components - vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_BOOLEAN , JSFBoolean.class.getName()); - //vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_DATE , JSFDate.class.getName()); - vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_TEXTAREA , JSFTextArea.class.getName()); - //vfd.putVascUIComponent(org.x4o.vasc.core.ui.VascUIComponent.VASC_COLOR , JSFColorChooser.class.getName()); + vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_BOOLEAN , JSFBoolean.class.getName()); + //vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_DATE , JSFDate.class.getName()); + vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_TEXTAREA , JSFTextArea.class.getName()); + //vfd.putVascUIComponent(net.forwardfire.vasc.core.ui.VascUIComponent.VASC_COLOR , JSFColorChooser.class.getName()); } /** - * @see org.x4o.vasc.core.VascFrontend#renderDelete(java.lang.Object) + * @see net.forwardfire.vasc.core.VascFrontend#renderDelete(java.lang.Object) */ public void renderDelete() throws Exception { logger.finer("renderDelete"); @@ -96,7 +97,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser } /** - * @see org.x4o.vasc.core.VascFrontend#renderEdit(java.lang.Object) + * @see net.forwardfire.vasc.core.VascFrontend#renderEdit(java.lang.Object) */ public void renderEdit() throws Exception { logger.finer("renderEdit"); @@ -118,7 +119,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser } /** - * @see org.x4o.vasc.core.VascFrontend#renderExport(org.x4o.vasc.core.entry.VascEntryExporter) + * @see net.forwardfire.vasc.core.VascFrontend#renderExport(net.forwardfire.vasc.core.entry.VascEntryExporter) */ public void renderExport(VascEntryExporter exporter) throws Exception { logger.finer("renderExport"); @@ -129,7 +130,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser } /** - * @see org.x4o.vasc.core.VascFrontend#renderView() + * @see net.forwardfire.vasc.core.VascFrontend#renderView() */ public void renderView() throws Exception { logger.finer("renderView"); diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponent.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponent.java similarity index 95% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponent.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponent.java index 3542f0e..92cca87 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponent.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponent.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.io.IOException; import java.util.ArrayList; @@ -37,18 +37,19 @@ import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; import javax.faces.context.FacesContext; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascEntryState; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import org.x4o.vasc.frontends.web.jsf.ui.JSFListModel; -import org.x4o.vasc.impl.DefaultVascFactory; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascEntryState; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFListModel; +import net.forwardfire.vasc.impl.DefaultVascFactory; + /** diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java similarity index 97% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java index a6927a8..856a77e 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.io.IOException; import java.io.Serializable; @@ -66,16 +66,17 @@ import javax.faces.render.Renderer; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.VascLinkEntryType; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.ui.VascOptionValueModelListener; -import org.x4o.vasc.core.ui.VascUIComponent; -import org.x4o.vasc.core.ui.VascValueModel; -import org.x4o.vasc.impl.actions.AddRowAction; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.VascLinkEntryType; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.ui.VascOptionValueModelListener; +import net.forwardfire.vasc.core.ui.VascUIComponent; +import net.forwardfire.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.impl.actions.AddRowAction; + /** diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentTag.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentTag.java similarity index 99% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentTag.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentTag.java index 967e0af..c46c496 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentTag.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascUIComponentTag.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import javax.el.ValueExpression; diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java similarity index 94% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java index ca9a7d0..a3fc9da 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java @@ -1,7 +1,7 @@ /** * */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.util.Iterator; import java.util.Map; @@ -17,8 +17,9 @@ import javax.faces.event.PhaseListener; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.frontends.web.jsf.JSFVascUIComponentRenderer.VascJSFInputValidator2; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.frontends.web.jsf.JSFVascUIComponentRenderer.VascJSFInputValidator2; + diff --git a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/OldVascUIComponent.java b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/OldVascUIComponent.java similarity index 95% rename from vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/OldVascUIComponent.java rename to vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/OldVascUIComponent.java index 694a933..0db990c 100644 --- a/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/OldVascUIComponent.java +++ b/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/OldVascUIComponent.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.frontends.web.jsf; +package net.forwardfire.vasc.frontends.web.jsf; import java.io.IOException; import java.io.Serializable; @@ -63,32 +63,33 @@ import javax.faces.validator.ValidatorException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import org.x4o.vasc.core.AbstractVascFrontend; -import org.x4o.vasc.core.VascBackend; -import org.x4o.vasc.core.VascBackendFilter; -import org.x4o.vasc.core.VascController; -import org.x4o.vasc.core.VascEntry; -import org.x4o.vasc.core.VascEntryField; -import org.x4o.vasc.core.VascException; -import org.x4o.vasc.core.VascFrontendData; -import org.x4o.vasc.core.VascLinkEntry; -import org.x4o.vasc.core.actions.GlobalVascAction; -import org.x4o.vasc.core.actions.RowVascAction; -import org.x4o.vasc.core.entry.VascEntryExporter; -import org.x4o.vasc.core.entry.VascEntryFieldValue; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener; -import org.x4o.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import org.x4o.vasc.core.ui.VascOptionValueModelListener; -import org.x4o.vasc.core.ui.VascValueModel; -import org.x4o.vasc.frontends.web.jsf.ui.JSFBoolean; -import org.x4o.vasc.frontends.web.jsf.ui.JSFLabel; -import org.x4o.vasc.frontends.web.jsf.ui.JSFList; -import org.x4o.vasc.frontends.web.jsf.ui.JSFText; -import org.x4o.vasc.frontends.web.jsf.ui.JSFTextArea; -import org.x4o.vasc.impl.VascBackendProxyFilter; -import org.x4o.vasc.impl.VascBackendProxyPaged; -import org.x4o.vasc.impl.VascBackendProxySearch; -import org.x4o.vasc.impl.VascBackendProxySort; +import net.forwardfire.vasc.core.AbstractVascFrontend; +import net.forwardfire.vasc.core.VascBackend; +import net.forwardfire.vasc.core.VascBackendFilter; +import net.forwardfire.vasc.core.VascController; +import net.forwardfire.vasc.core.VascEntry; +import net.forwardfire.vasc.core.VascEntryField; +import net.forwardfire.vasc.core.VascException; +import net.forwardfire.vasc.core.VascFrontendData; +import net.forwardfire.vasc.core.VascLinkEntry; +import net.forwardfire.vasc.core.actions.GlobalVascAction; +import net.forwardfire.vasc.core.actions.RowVascAction; +import net.forwardfire.vasc.core.entry.VascEntryExporter; +import net.forwardfire.vasc.core.entry.VascEntryFieldValue; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener; +import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; +import net.forwardfire.vasc.core.ui.VascOptionValueModelListener; +import net.forwardfire.vasc.core.ui.VascValueModel; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFBoolean; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFLabel; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFList; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFText; +import net.forwardfire.vasc.frontends.web.jsf.ui.JSFTextArea; +import net.forwardfire.vasc.impl.VascBackendProxyFilter; +import net.forwardfire.vasc.impl.VascBackendProxyPaged; +import net.forwardfire.vasc.impl.VascBackendProxySearch; +import net.forwardfire.vasc.impl.VascBackendProxySort; + /** @@ -103,7 +104,7 @@ import org.x4o.vasc.impl.VascBackendProxySort; */ public class OldVascUIComponent extends UIComponentBase { - public static final String COMPONENT_TYPE = "org.x4o.vasc.frontends.web.jsf.VascUIComponent"; + public static final String COMPONENT_TYPE = "net.forwardfire.vasc.frontends.web.jsf.VascUIComponent"; private Object[] state = null; private ValueExpression vascController = null; private ValueExpression vascFrontendData = null; @@ -822,12 +823,12 @@ public class OldVascUIComponent extends UIComponentBase { for (int i=0;i Vasc JSF Component vasc.jsf.component - org.x4o.vasc.frontends.web.jsf.JSFVascUIComponent + net.forwardfire.vasc.frontends.web.jsf.JSFVascUIComponent vasc.jsf.component.renderer @@ -16,13 +16,13 @@ vasc.jsf.component.family vasc.jsf.component.renderer - org.x4o.vasc.frontends.web.jsf.JSFVascUIComponentRenderer + net.forwardfire.vasc.frontends.web.jsf.JSFVascUIComponentRenderer - org.x4o.vasc.frontends.web.jsf.VascViewHandler + net.forwardfire.vasc.frontends.web.jsf.VascViewHandler diff --git a/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld b/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld index 27ac099..6b9158e 100644 --- a/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld +++ b/vasc-frontend-web-jsf/src/main/resources/META-INF/vasc.tld @@ -9,7 +9,7 @@ Renders the vasc entry JSF Frontend Renderer vascEntry - org.x4o.vasc.frontends.web.jsf.JSFVascUIComponentTag + net.forwardfire.vasc.frontends.web.jsf.JSFVascUIComponentTag JSP id @@ -33,7 +33,7 @@ vascController true - org.x4o.vasc.core.VascController + net.forwardfire.vasc.core.VascController @@ -47,7 +47,7 @@ vascFrontendData true - org.x4o.vasc.core.VascFrontendData + net.forwardfire.vasc.core.VascFrontendData diff --git a/vasc-xpql-ejb3/pom.xml b/vasc-xpql-ejb3/pom.xml index 6b1d0c4..b8caac7 100644 --- a/vasc-xpql-ejb3/pom.xml +++ b/vasc-xpql-ejb3/pom.xml @@ -2,17 +2,17 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-xpql-ejb3 0.3.5-SNAPSHOT vasc-xpql-ejb3 xpql parsing service for ejb3 - org.x4o.vasc + net.forwardfire.vasc vasc-xpql 0.3.5-SNAPSHOT diff --git a/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManager.java b/vasc-xpql-ejb3/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManager.java similarity index 89% rename from vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManager.java rename to vasc-xpql-ejb3/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManager.java index 683a262..6473d34 100644 --- a/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManager.java +++ b/vasc-xpql-ejb3/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManager.java @@ -1,5 +1,5 @@ -package org.x4o.vasc.xpql.ejb3; +package net.forwardfire.vasc.xpql.ejb3; import java.util.List; import java.util.Map; @@ -7,7 +7,7 @@ import java.util.Map; import javax.ejb.Local; import javax.ejb.Remote; -import org.x4o.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.Query; /** diff --git a/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManagerImpl.java b/vasc-xpql-ejb3/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManagerImpl.java similarity index 97% rename from vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManagerImpl.java rename to vasc-xpql-ejb3/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManagerImpl.java index 319916c..db62932 100644 --- a/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManagerImpl.java +++ b/vasc-xpql-ejb3/src/main/java/net/forwardfire/vasc/xpql/ejb3/XpqlQueryManagerImpl.java @@ -1,5 +1,5 @@ -package org.x4o.vasc.xpql.ejb3; +package net.forwardfire.vasc.xpql.ejb3; import java.io.IOException; import java.io.InputStream; @@ -20,10 +20,11 @@ import javax.naming.InitialContext; import javax.persistence.EntityManager; import javax.transaction.UserTransaction; -import org.x4o.vasc.xpql.QueryStore; -import org.x4o.vasc.xpql.XPQLParser; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryParameterValue; +import net.forwardfire.vasc.xpql.QueryStore; +import net.forwardfire.vasc.xpql.XPQLParser; +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; + /** diff --git a/vasc-xpql/pom.xml b/vasc-xpql/pom.xml index a30c922..d6db436 100644 --- a/vasc-xpql/pom.xml +++ b/vasc-xpql/pom.xml @@ -2,10 +2,10 @@ 4.0.0 vasc - org.x4o.vasc + net.forwardfire.vasc 0.3.5-SNAPSHOT - org.x4o.vasc + net.forwardfire.vasc vasc-xpql 0.3.5-SNAPSHOT vasc-xpql diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/QueryStore.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java similarity index 96% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/QueryStore.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java index 3c1aabd..91b9e6d 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/QueryStore.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/QueryStore.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql; +package net.forwardfire.vasc.xpql; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.x4o.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.Query; /** diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/XPQLParser.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLParser.java similarity index 98% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/XPQLParser.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLParser.java index f04dc04..6d7834b 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/XPQLParser.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/XPQLParser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql; +package net.forwardfire.vasc.xpql; import javax.el.ValueExpression; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQuery.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java similarity index 89% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQuery.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java index 0e2e626..9202428 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQuery.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl; +package net.forwardfire.vasc.xpql.impl; -import org.x4o.vasc.xpql.query.AbstractQuery; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryParameterValue; -import org.x4o.vasc.xpql.query.QueryPart; +import net.forwardfire.vasc.xpql.query.AbstractQuery; +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; +import net.forwardfire.vasc.xpql.query.QueryPart; /** * This class defines an executable SQL query. @@ -48,7 +48,7 @@ public class DefaultQuery extends AbstractQuery { // ========= QueryPart interface /** - * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toEdit() + * @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toEdit() */ @Override public String toEdit(Query query) { @@ -60,7 +60,7 @@ public class DefaultQuery extends AbstractQuery { } /** - * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toPreparedSQL() + * @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toPreparedSQL() */ @Override public String toPreparedSQL(Query query) { @@ -73,7 +73,7 @@ public class DefaultQuery extends AbstractQuery { } /** - * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toSQL() + * @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toSQL() */ @Override public String toSQL(Query query) { @@ -85,7 +85,7 @@ public class DefaultQuery extends AbstractQuery { } /** - * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toXML() + * @see net.forwardfire.vasc.xpql.query.AbstractQueryPart#toXML() */ @Override public String toXML(Query query) { diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQueryParameterValue.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java similarity index 92% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQueryParameterValue.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java index b2b3b0d..8b9c6cc 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQueryParameterValue.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl; +package net.forwardfire.vasc.xpql.impl; -import org.x4o.vasc.xpql.query.AbstractQueryParameterValue; -import org.x4o.vasc.xpql.query.QueryParameterValue; +import net.forwardfire.vasc.xpql.query.AbstractQueryParameterValue; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; /** * diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryInclude.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java similarity index 93% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryInclude.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java index 65b9fa1..291b558 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryInclude.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl; +package net.forwardfire.vasc.xpql.impl; + +import net.forwardfire.vasc.xpql.XPQLParser; +import net.forwardfire.vasc.xpql.query.AbstractQueryPart; +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryPart; -import org.x4o.vasc.xpql.XPQLParser; -import org.x4o.vasc.xpql.query.AbstractQueryPart; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryPart; /** diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryParameter.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java similarity index 95% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryParameter.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java index e3d0b6c..9935346 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryParameter.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java @@ -24,16 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl; +package net.forwardfire.vasc.xpql.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.x4o.vasc.xpql.query.AbstractQueryPart; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryParameterValue; -import org.x4o.vasc.xpql.query.QueryPart; +import net.forwardfire.vasc.xpql.query.AbstractQueryPart; +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; +import net.forwardfire.vasc.xpql.query.QueryPart; /** diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryText.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java similarity index 91% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryText.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java index 58f2e56..cf3c82f 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryText.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl; +package net.forwardfire.vasc.xpql.impl; -import org.x4o.vasc.xpql.query.AbstractQueryPart; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryPart; +import net.forwardfire.vasc.xpql.query.AbstractQueryPart; +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryPart; /** * diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/CommentElement.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java similarity index 96% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/CommentElement.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java index f69f96c..3268676 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/CommentElement.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/CommentElement.java @@ -24,9 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +package net.forwardfire.vasc.xpql.impl.x4o; + +import net.forwardfire.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.Query; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java similarity index 94% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java index a7b0fdf..7105353 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java @@ -24,9 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +package net.forwardfire.vasc.xpql.impl.x4o; + +import net.forwardfire.vasc.xpql.query.QueryParameterValue.QueryParameterType; -import org.x4o.vasc.xpql.query.QueryParameterValue.QueryParameterType; import org.x4o.xml.element.AbstractElementAttributeConverter; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementAttributeConverterException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryBindingHandler.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java similarity index 91% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryBindingHandler.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java index 796c54b..7173321 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryBindingHandler.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +package net.forwardfire.vasc.xpql.impl.x4o; + +import net.forwardfire.vasc.xpql.impl.QueryInclude; +import net.forwardfire.vasc.xpql.impl.QueryParameter; +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryParameterValue; +import net.forwardfire.vasc.xpql.query.QueryPart; -import org.x4o.vasc.xpql.impl.QueryInclude; -import org.x4o.vasc.xpql.impl.QueryParameter; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryParameterValue; -import org.x4o.vasc.xpql.query.QueryPart; import org.x4o.xml.element.AbstractElementBindingHandler; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementBindingHandlerException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryElementConfigurator.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryElementConfigurator.java similarity index 92% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryElementConfigurator.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryElementConfigurator.java index b8b242e..188e6e0 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryElementConfigurator.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryElementConfigurator.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +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.vasc.xpql.QueryStore; -import org.x4o.vasc.xpql.XPQLParser; -import org.x4o.vasc.xpql.query.Query; import org.x4o.xml.element.AbstractElementConfigurator; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementConfiguratorException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryIncludeElement.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java similarity index 94% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryIncludeElement.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java index 1d20310..f9b52cc 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryIncludeElement.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryIncludeElement.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +package net.forwardfire.vasc.xpql.impl.x4o; + +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryPart; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryPart; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryParameterElement.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java similarity index 94% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryParameterElement.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java index d9fc9e5..03cde23 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryParameterElement.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryParameterElement.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +package net.forwardfire.vasc.xpql.impl.x4o; + +import net.forwardfire.vasc.xpql.query.Query; +import net.forwardfire.vasc.xpql.query.QueryPart; -import org.x4o.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.query.QueryPart; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java similarity index 95% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java index 2cbf8cd..bcaa202 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java @@ -24,9 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +package net.forwardfire.vasc.xpql.impl.x4o; + +import net.forwardfire.vasc.xpql.query.Query.QueryType; -import org.x4o.vasc.xpql.query.Query.QueryType; import org.x4o.xml.element.AbstractElementAttributeConverter; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementAttributeConverterException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/SQLElement.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java similarity index 95% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/SQLElement.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java index 7085384..e45ef93 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/SQLElement.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/SQLElement.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.impl.x4o; +package net.forwardfire.vasc.xpql.impl.x4o; + +import net.forwardfire.vasc.xpql.impl.QueryText; +import net.forwardfire.vasc.xpql.query.Query; -import org.x4o.vasc.xpql.impl.QueryText; -import org.x4o.vasc.xpql.query.Query; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQuery.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java similarity index 74% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQuery.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java index ae67e06..9b2a520 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQuery.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.query; +package net.forwardfire.vasc.xpql.query; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -33,8 +33,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.x4o.vasc.xpql.QueryStore; -import org.x4o.vasc.xpql.impl.DefaultQueryParameterValue; +import net.forwardfire.vasc.xpql.QueryStore; +import net.forwardfire.vasc.xpql.impl.DefaultQueryParameterValue; + /** @@ -67,133 +68,133 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { } /** - * @see org.x4o.vasc.xpql.query.Query#getName() + * @see net.forwardfire.vasc.xpql.query.Query#getName() */ public String getName() { return name; } /** - * @see org.x4o.vasc.xpql.query.Query#setName(java.lang.String) + * @see net.forwardfire.vasc.xpql.query.Query#setName(java.lang.String) */ public void setName(String name) { this.name=name; } /** - * @see org.x4o.vasc.xpql.query.Query#addQueryComment(java.lang.String) + * @see net.forwardfire.vasc.xpql.query.Query#addQueryComment(java.lang.String) */ public void addQueryComment(String comment) { queryComments.add(comment); } /** - * @see org.x4o.vasc.xpql.query.Query#addQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue) + * @see net.forwardfire.vasc.xpql.query.Query#addQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue) */ public void addQueryParameterValue(QueryParameterValue value) { queryParameterValues.put(value.getName(), value); } /** - * @see org.x4o.vasc.xpql.query.Query#addLocalQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue) + * @see net.forwardfire.vasc.xpql.query.Query#addLocalQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue) */ public void addLocalQueryParameterValue(QueryParameterValue value) { localQueryParameterValues.put(value.getName(), value); } /** - * @see org.x4o.vasc.xpql.query.Query#addOrderQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue) + * @see net.forwardfire.vasc.xpql.query.Query#addOrderQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue) */ public void addOrderQueryParameterValue(QueryParameterValue value) { orderQueryParameterValues.add(value); } /** - * @see org.x4o.vasc.xpql.query.Query#addQueryPart(org.x4o.vasc.xpql.query.QueryPart) + * @see net.forwardfire.vasc.xpql.query.Query#addQueryPart(net.forwardfire.vasc.xpql.query.QueryPart) */ public void addQueryPart(QueryPart queryPart) { queryParts.add(queryPart); } /** - * @see org.x4o.vasc.xpql.query.Query#getProperty(java.lang.String) + * @see net.forwardfire.vasc.xpql.query.Query#getProperty(java.lang.String) */ public Object getProperty(String name) { return properties.get(name); } /** - * @see org.x4o.vasc.xpql.query.Query#getPropertyString(java.lang.String) + * @see net.forwardfire.vasc.xpql.query.Query#getPropertyString(java.lang.String) */ public String getPropertyString(String name) { return getProperty(name).toString(); } /** - * @see org.x4o.vasc.xpql.query.Query#getQueryComments() + * @see net.forwardfire.vasc.xpql.query.Query#getQueryComments() */ public List getQueryComments() { return queryComments; } /** - * @see org.x4o.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String) + * @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String) */ public QueryParameterValue getQueryParameterValue(String name) { return queryParameterValues.get(name); } /** - * @see org.x4o.vasc.xpql.query.Query#getQueryParts() + * @see net.forwardfire.vasc.xpql.query.Query#getQueryParts() */ public List getQueryParts() { return queryParts; } /** - * @see org.x4o.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object) + * @see net.forwardfire.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object) */ public void setProperty(String name, Object value) { properties.put(name,value); } /** - * @see org.x4o.vasc.xpql.query.Query#getPropertyKeys() + * @see net.forwardfire.vasc.xpql.query.Query#getPropertyKeys() */ public Collection getPropertyKeys() { return properties.keySet(); } /** - * @see org.x4o.vasc.xpql.query.Query#getQueryParameters() + * @see net.forwardfire.vasc.xpql.query.Query#getQueryParameters() */ public List getQueryParameters() { return null; } /** - * @see org.x4o.vasc.xpql.query.Query#getQueryParameterValues() + * @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValues() */ public Collection getQueryParameterValues() { return queryParameterValues.values(); } /** - * @see org.x4o.vasc.xpql.query.Query#getLocalQueryParameterValues() + * @see net.forwardfire.vasc.xpql.query.Query#getLocalQueryParameterValues() */ public Collection getLocalQueryParameterValues() { return localQueryParameterValues.values(); } /** - * @see org.x4o.vasc.xpql.query.Query#getOrderQueryParameterValues() + * @see net.forwardfire.vasc.xpql.query.Query#getOrderQueryParameterValues() */ public List getOrderQueryParameterValues() { return orderQueryParameterValues; } /** - * @see org.x4o.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object) + * @see net.forwardfire.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object) */ public void setQueryParameter(String name, Object value) { if (name==null) { @@ -229,28 +230,28 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { } /** - * @see org.x4o.vasc.xpql.query.Query#getType() + * @see net.forwardfire.vasc.xpql.query.Query#getType() */ public QueryType getType() { return type; } /** - * @see org.x4o.vasc.xpql.query.Query#setType(org.x4o.vasc.xpql.query.Query.QueryType) + * @see net.forwardfire.vasc.xpql.query.Query#setType(net.forwardfire.vasc.xpql.query.Query.QueryType) */ public void setType(QueryType type) { this.type=type; } /** - * @see org.x4o.vasc.xpql.query.Query#getQueryStore() + * @see net.forwardfire.vasc.xpql.query.Query#getQueryStore() */ public QueryStore getQueryStore() { return queryStore; } /** - * @see org.x4o.vasc.xpql.query.Query#setQueryStore(org.x4o.vasc.xpql.query.QueryStore) + * @see net.forwardfire.vasc.xpql.query.Query#setQueryStore(net.forwardfire.vasc.xpql.query.QueryStore) */ public void setQueryStore(QueryStore store) { this.queryStore=store; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryParameterValue.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java similarity index 78% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryParameterValue.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java index 35f9ceb..c382bed 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryParameterValue.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.query; +package net.forwardfire.vasc.xpql.query; /** * @@ -40,56 +40,56 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue private Class valueType = null; /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#getName() + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getName() */ public String getName() { return name; } /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#setName(java.lang.String) + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setName(java.lang.String) */ public void setName(String name) { this.name=name; } /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#getDefaultValue() + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getDefaultValue() */ public Object getDefaultValue() { return defaultValue; } /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object) + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object) */ public void setDefaultValue(Object defaultValue) { this.defaultValue=defaultValue; } /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#getValue() + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getValue() */ public Object getValue() { return value; } /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#setType(org.x4o.vasc.xpql.query.QueryParameterValue.QueryParameterType) + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setType(net.forwardfire.vasc.xpql.query.QueryParameterValue.QueryParameterType) */ public void setType(QueryParameterType type) { this.type=type; } /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#getType() + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getType() */ public QueryParameterType getType() { return type; } /** - * @see org.x4o.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object) + * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object) */ public void setValue(Object value) { this.value=value; diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryPart.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java similarity index 90% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryPart.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java index ac097f5..a8e76d7 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryPart.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.query; +package net.forwardfire.vasc.xpql.query; /** * @@ -34,13 +34,13 @@ package org.x4o.vasc.xpql.query; abstract public class AbstractQueryPart implements QueryPart { /** - * @see org.x4o.vasc.xpql.query.QueryPart#toSQL() + * @see net.forwardfire.vasc.xpql.query.QueryPart#toSQL() */ abstract public String toSQL(Query query); /** * Returns the toSQL() retult. - * @see org.x4o.vasc.xpql.query.QueryPart#toPreparedSQL() + * @see net.forwardfire.vasc.xpql.query.QueryPart#toPreparedSQL() */ public String toPreparedSQL(Query query) { return toSQL(query); @@ -48,7 +48,7 @@ abstract public class AbstractQueryPart implements QueryPart { /** * XML escapes the toSQL() return String. - * @see org.x4o.vasc.xpql.query.QueryPart#toXML() + * @see net.forwardfire.vasc.xpql.query.QueryPart#toXML() */ public String toXML(Query query) { return escapeXML(toSQL(query)); @@ -56,7 +56,7 @@ abstract public class AbstractQueryPart implements QueryPart { /** * Returns the toSQL() retult. - * @see org.x4o.vasc.xpql.query.QueryPart#toEdit() + * @see net.forwardfire.vasc.xpql.query.QueryPart#toEdit() */ public String toEdit(Query query) { return toSQL(query); diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/Query.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java similarity index 97% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/Query.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java index fcd588e..a64b299 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/Query.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.query; +package net.forwardfire.vasc.xpql.query; import java.util.Collection; import java.util.List; import java.util.Map; -import org.x4o.vasc.xpql.QueryStore; +import net.forwardfire.vasc.xpql.QueryStore; /** diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryParameterValue.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java similarity index 98% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryParameterValue.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java index 27c683f..0c0554a 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryParameterValue.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryParameterValue.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.query; +package net.forwardfire.vasc.xpql.query; /** * A QueryParameterValue diff --git a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryPart.java b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java similarity index 98% rename from vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryPart.java rename to vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java index 455e8b6..e958605 100644 --- a/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryPart.java +++ b/vasc-xpql/src/main/java/net/forwardfire/vasc/xpql/query/QueryPart.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package org.x4o.vasc.xpql.query; +package net.forwardfire.vasc.xpql.query; /** * diff --git a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld b/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld index 4804cc5..7502d38 100644 --- a/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld +++ b/vasc-xpql/src/main/resources/META-INF/xpql/xpql-lang.eld @@ -24,28 +24,26 @@ The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of IDCA. - - elementClassName="org.x4o.vasc.xpql.impl.x4o.QueryElement" --> - + - + - - + + - + - - - - - - + + + + + + - + diff --git a/vasc-xpql/src/test/resources/META-INF/logging.properties b/vasc-xpql/src/test/resources/META-INF/logging.properties index 3f67fa2..1f3700a 100644 --- a/vasc-xpql/src/test/resources/META-INF/logging.properties +++ b/vasc-xpql/src/test/resources/META-INF/logging.properties @@ -12,7 +12,7 @@ java.util.logging.ConsoleHandler.level = ALL # Set the default logging level for the root logger .level = ALL -org.x4o = ALL +net.forwardfire = ALL # Java 6 has internal logging on many builtin libs sun.level=OFF