From cc6331b7fed89789f74cddcb32574f8a4ee62166 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Fri, 30 Dec 2011 00:09:01 +0100 Subject: [PATCH] moved package to temparory org.x4o.vasc.etc --- .project | 2 +- demo-petstore/.project | 6 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.m2e.core.prefs | 5 + demo-petstore/demo-petstore-ear/.classpath | 5 +- demo-petstore/demo-petstore-ear/.project | 6 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.m2e.core.prefs | 5 + demo-petstore/demo-petstore-ear/pom.xml | 4 +- demo-petstore/demo-petstore-ejb/.classpath | 3 +- demo-petstore/demo-petstore-ejb/.project | 6 + .../org.eclipse.core.resources.prefs | 5 + .../.settings/org.eclipse.m2e.core.prefs | 5 + demo-petstore/demo-petstore-ejb/pom.xml | 18 +-- .../AbstractPetStoreFieldTemplates.java | 22 ++-- .../java/demo/petstore/models/Category.java | 4 +- .../demo/petstore/models/CategoryProduct.java | 6 +- .../main/java/demo/petstore/models/Item.java | 4 +- .../demo/petstore/models/ItemInventory.java | 4 +- .../demo/petstore/models/ItemSupplier.java | 4 +- .../main/java/demo/petstore/models/Order.java | 6 +- .../java/demo/petstore/models/OrderLine.java | 6 +- .../demo/petstore/models/OrderStatus.java | 4 +- .../demo/petstore/models/UserAccount.java | 4 +- .../demo/petstore/models/UserCredential.java | 6 +- .../demo/petstore/models/UserProfile.java | 8 +- demo-petstore/demo-petstore-war/.classpath | 5 +- demo-petstore/demo-petstore-war/.project | 6 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.m2e.core.prefs | 5 + demo-petstore/demo-petstore-war/pom.xml | 4 +- demo-petstore/pom.xml | 6 +- pom.xml | 24 ++-- src/site/apt/download.apt | 4 +- vasc-backend-jpa/.classpath | 1 + vasc-backend-jpa/.project | 6 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-backend-jpa/pom.xml | 8 +- .../jpa/AbstractHibernateVascBackend.java | 6 +- .../jpa/AbstractPersistenceVascBackend.java | 7 +- .../backends/jpa/EntityManagerProvider.java | 2 +- .../jpa/HibernateSessionProvider.java | 2 +- .../jpa/XpqlHibernateVascBackend.java | 72 ++++++------ .../jpa/XpqlPersistanceVascBackend.java | 75 ++++++------ vasc-backend-ldap/.classpath | 1 + vasc-backend-ldap/.project | 6 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-backend-ldap/pom.xml | 8 +- .../backends/ldap/LdapConnectionProvider.java | 2 +- .../vasc/backends/ldap/LdapVascBackend.java | 33 +++--- .../ldap/SimpleLdapConnectionProvider.java | 4 +- vasc-core/.classpath | 1 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-core/pom.xml | 10 +- .../annotations/VascAnnotationParser.java | 2 +- .../annotations/VascBundleKeyGenerator.java | 2 +- .../x4o}/vasc/annotations/VascChoices.java | 2 +- .../VascChoicesSelectItemModel.java | 13 ++- .../vasc/annotations/VascDefaultValue.java | 2 +- .../vasc/annotations/VascDisplayName.java | 2 +- .../x4o}/vasc/annotations/VascEntry.java | 2 +- .../vasc/annotations/VascEventChannel.java | 2 +- .../vasc/annotations/VascEventListener.java | 2 +- .../x4o}/vasc/annotations/VascField.java | 2 +- .../x4o}/vasc/annotations/VascFieldOrder.java | 2 +- .../vasc/annotations/VascFieldTemplate.java | 2 +- .../x4o}/vasc/annotations/VascFieldType.java | 2 +- .../x4o}/vasc/annotations/VascI18n.java | 3 +- .../vasc/annotations/VascModelReference.java | 2 +- .../x4o}/vasc/annotations/VascPrimaryKey.java | 2 +- .../x4o}/vasc/annotations/VascRoles.java | 2 +- .../x4o}/vasc/annotations/VascStyle.java | 2 +- .../backends/BeanVascEntryFieldValue.java | 17 +-- .../backends/BeanVascEntryRecordCreator.java | 7 +- .../vasc/backends/MapVascEntryFieldValue.java | 15 +-- .../backends/MapVascEntryRecordCreator.java | 7 +- .../backends/jdbc/JdbcConnectionProvider.java | 2 +- .../vasc/backends/jdbc/JdbcVascBackend.java | 33 +++--- .../backends/jdbc/JdbcXpqlVascBackend.java | 41 +++---- .../JdniDataSourceJdbcConnectionProvider.java | 4 +- .../jdbc/SimpleJdbcConnectionProvider.java | 4 +- .../x4o}/vasc/core/AbstractVascBackend.java | 28 ++--- .../vasc/core/AbstractVascBackendProxy.java | 45 ++++---- .../vasc/core/AbstractVascBackendState.java | 22 ++-- .../vasc/core/AbstractVascEntryFieldType.java | 45 ++++---- .../vasc/core/AbstractVascEntryState.java | 2 +- .../x4o}/vasc/core/AbstractVascFrontend.java | 8 +- .../x4o}/vasc/core/VascBackend.java | 7 +- .../x4o}/vasc/core/VascBackendController.java | 2 +- .../vasc/core/VascBackendControllerLocal.java | 2 +- .../x4o}/vasc/core/VascBackendFilter.java | 2 +- .../x4o}/vasc/core/VascBackendPageNumber.java | 2 +- .../x4o}/vasc/core/VascBackendState.java | 2 +- .../x4o}/vasc/core/VascController.java | 2 +- .../x4o}/vasc/core/VascEntry.java | 11 +- .../x4o}/vasc/core/VascEntryController.java | 2 +- .../vasc/core/VascEntryControllerLocal.java | 2 +- .../x4o}/vasc/core/VascEntryField.java | 7 +- .../x4o}/vasc/core/VascEntryFieldSet.java | 2 +- .../x4o}/vasc/core/VascEntryFieldType.java | 9 +- .../core/VascEntryFieldTypeController.java | 2 +- .../VascEntryFieldTypeControllerLocal.java | 2 +- .../x4o}/vasc/core/VascEntryFinalizer.java | 2 +- .../x4o}/vasc/core/VascEntryState.java | 2 +- .../vasc/core/VascEventChannelController.java | 2 +- .../core/VascEventChannelControllerLocal.java | 2 +- .../x4o}/vasc/core/VascException.java | 2 +- .../x4o}/vasc/core/VascFrontend.java | 4 +- .../x4o}/vasc/core/VascFrontendData.java | 13 ++- .../core/VascFrontendExceptionHandler.java | 2 +- .../x4o}/vasc/core/VascFrontendHelper.java | 9 +- .../x4o}/vasc/core/VascLinkEntry.java | 2 +- .../x4o}/vasc/core/VascLinkEntryType.java | 2 +- .../vasc/core/VascUserRoleController.java | 2 +- .../vasc/core/actions/AbstractVascAction.java | 6 +- .../vasc/core/actions/ColumnVascAction.java | 6 +- .../vasc/core/actions/GlobalVascAction.java | 4 +- .../x4o}/vasc/core/actions/RowVascAction.java | 4 +- .../x4o}/vasc/core/actions/VascAction.java | 2 +- .../entry/VascEntryBackendEventListener.java | 5 +- .../vasc/core/entry/VascEntryExporter.java | 7 +- .../entry/VascEntryFieldEventChannel.java | 2 +- .../entry/VascEntryFieldValidatorService.java | 7 +- .../vasc/core/entry/VascEntryFieldValue.java | 7 +- .../entry/VascEntryFrontendEventListener.java | 5 +- .../core/entry/VascEntryRecordCreator.java | 5 +- .../entry/VascEntryResourceImageResolver.java | 4 +- .../core/entry/VascEntryResourceResolver.java | 2 +- .../core/ui/VascColumnValueModelListener.java | 6 +- .../core/ui/VascOptionValueModelListener.java | 6 +- .../x4o}/vasc/core/ui/VascSelectItem.java | 2 +- .../vasc/core/ui/VascSelectItemModel.java | 7 +- .../vasc/core/ui/VascUIActionComponent.java | 2 +- .../ui/VascUIActionComponentListener.java | 2 +- .../x4o}/vasc/core/ui/VascUIComponent.java | 8 +- .../x4o}/vasc/core/ui/VascValueModel.java | 5 +- .../vasc/core/ui/VascValueModelListener.java | 5 +- .../impl/DefaultVascBackedEntryFinalizer.java | 27 ++--- .../impl/DefaultVascBackendController.java | 9 +- .../vasc/impl/DefaultVascBackendState.java | 4 +- .../x4o}/vasc/impl/DefaultVascController.java | 14 +-- .../x4o}/vasc/impl/DefaultVascEntry.java | 33 +++--- .../vasc/impl/DefaultVascEntryController.java | 15 +-- .../x4o}/vasc/impl/DefaultVascEntryField.java | 13 ++- .../vasc/impl/DefaultVascEntryFieldSet.java | 5 +- .../x4o}/vasc/impl/DefaultVascEntryState.java | 4 +- .../x4o}/vasc/impl/DefaultVascFactory.java | 21 ++-- .../vasc/impl/DefaultVascFrontendData.java | 57 ++++----- .../DefaultVascFrontendEntryFinalizer.java | 12 +- .../vasc/impl/DefaultVascFrontendHelper.java | 63 +++++----- .../x4o}/vasc/impl/DefaultVascLinkEntry.java | 7 +- .../vasc/impl/DefaultVascSelectItemModel.java | 21 ++-- .../impl/DefaultVascUserRoleController.java | 13 ++- .../x4o}/vasc/impl/VascBackendProxyCache.java | 15 +-- .../impl/VascBackendProxyEventExecutor.java | 31 ++--- .../vasc/impl/VascBackendProxyFilter.java | 17 +-- .../x4o}/vasc/impl/VascBackendProxyPaged.java | 17 +-- .../vasc/impl/VascBackendProxySearch.java | 17 +-- .../x4o}/vasc/impl/VascBackendProxySort.java | 19 +-- .../impl/VascBackendProxyTimerLogger.java | 25 ++-- .../x4o}/vasc/impl/actions/AddRowAction.java | 11 +- .../impl/actions/CSVExportGlobalAction.java | 15 +-- .../vasc/impl/actions/DeleteRowAction.java | 11 +- .../x4o}/vasc/impl/actions/EditRowAction.java | 13 ++- .../impl/actions/RefreshDataGlobalAction.java | 9 +- .../impl/actions/XMLExportGlobalAction.java | 15 +-- .../BeanPropertyVascEntryFieldValue.java | 17 +-- .../entry/BeanVascEntryRecordCreator.java | 7 +- .../DefaultVascEntryResourceResolver.java | 5 +- .../impl/entry/HibernateValidatorService.java | 10 +- .../entry/PersistanceValidatorService.java | 17 +-- .../entry/SetParameterBackendListener.java | 13 ++- .../entry/VascValidatorsValidatorService.java | 13 ++- .../impl/type/DefaultVascEntryFieldType.java | 6 +- .../DefaultVascEntryFieldTypeController.java | 13 ++- .../x4o}/vasc/impl/type/FieldTypeParser.java | 8 +- .../type/MultiTextVascEntryFieldType.java | 15 +-- .../impl/x4o/AnnotationParserElement.java | 32 +++--- .../x4o/SelectItemModelBindingHandler.java | 19 +-- .../vasc/impl/x4o/SetParameterElement.java | 11 +- .../x4o/VascBackendElementConfigurator.java | 18 +-- .../vasc/impl/x4o/VascEntryActionElement.java | 18 +-- .../x4o/VascEntryElementConfigurator.java | 21 ++-- .../x4o/VascEntryFieldBindingHandler.java | 17 +-- .../vasc/impl/x4o/VascEntryFieldElement.java | 12 +- .../VascEntryFieldSetAttributeConverter.java | 13 ++- .../VascEntryFieldTypeAttributeConverter.java | 13 ++- .../impl/x4o/VascEntryFieldTypeElement.java | 14 +-- .../impl/x4o/VascEventListenerElement.java | 10 +- .../x4o/VascLinkEntryParameterElement.java | 12 +- .../x4o}/vasc/impl/x4o/VascParser.java | 18 +-- .../x4o}/vasc/validators/VascDateFuture.java | 2 +- .../validators/VascDateFutureValidator.java | 8 +- .../x4o}/vasc/validators/VascDatePast.java | 2 +- .../validators/VascDatePastValidator.java | 8 +- .../x4o}/vasc/validators/VascIntSize.java | 2 +- .../vasc/validators/VascIntSizeValidator.java | 8 +- .../x4o}/vasc/validators/VascLongSize.java | 2 +- .../validators/VascLongSizeValidator.java | 8 +- .../vasc/validators/VascObjectNotNull.java | 2 +- .../VascObjectNotNullValidator.java | 8 +- .../x4o}/vasc/validators/VascObjectNull.java | 2 +- .../validators/VascObjectNullValidator.java | 8 +- .../x4o}/vasc/validators/VascObjectUrl.java | 2 +- .../validators/VascObjectUrlValidator.java | 8 +- .../x4o}/vasc/validators/VascStringEmail.java | 2 +- .../validators/VascStringEmailValidator.java | 6 +- .../vasc/validators/VascStringLength.java | 2 +- .../validators/VascStringLengthValidator.java | 6 +- .../x4o}/vasc/validators/VascStringRegex.java | 2 +- .../validators/VascStringRegexValidator.java | 8 +- .../vasc/validators/VascStringZipCode.java | 2 +- .../VascStringZipCodeValidator.java | 6 +- .../x4o}/vasc/validators/VascValidator.java | 2 +- .../validators/VascValidatorClassParser.java | 2 +- .../validators/VascValidatorException.java | 2 +- .../validators/VascValidatorMessages.java | 4 +- .../META-INF/fieldtype/fieldtype-lang.eld | 32 +++--- .../main/resources/META-INF/fieldtypes.xml | 2 +- .../resources/META-INF/vasc/vasc-lang.eld | 108 +++++++++--------- .../x4o}/vasc/FieldTypesTest.java | 7 +- .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-ejb3/pom.xml | 12 +- .../x4o}/vasc/ejb3/VascServiceManager.java | 5 +- .../vasc/ejb3/VascServiceManagerImpl.java | 52 ++++----- vasc-frontend-swing/.classpath | 1 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-frontend-swing/pom.xml | 8 +- .../frontends/swing/SwingVascFrontend.java | 47 ++++---- .../vasc/frontends/swing/ui/SwingBoolean.java | 25 ++-- .../vasc/frontends/swing/ui/SwingButton.java | 25 ++-- .../frontends/swing/ui/SwingColorChooser.java | 25 ++-- .../vasc/frontends/swing/ui/SwingDate.java | 25 ++-- .../vasc/frontends/swing/ui/SwingLabel.java | 25 ++-- .../vasc/frontends/swing/ui/SwingList.java | 29 ++--- .../vasc/frontends/swing/ui/SwingText.java | 25 ++-- .../frontends/swing/ui/SwingTextArea.java | 25 ++-- .../idcanet => org/x4o}/vasc/SwingTest.java | 7 +- .../idcanet => org/x4o}/vasc/TestModel.java | 19 +-- .../x4o}/vasc/TestModelVascDataSource.java | 25 ++-- .../test/java/org/x4o}/vasc/TestTable.java | 45 ++++---- vasc-frontend-swt/.classpath | 1 + vasc-frontend-swt/.project | 6 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-frontend-swt/pom.xml | 8 +- .../vasc/frontends/swt/SwtVascEditDialog.java | 14 +-- .../vasc/frontends/swt/SwtVascFrontend.java | 48 ++++---- .../vasc/frontends/swt/ui/SwtBoolean.java | 24 ++-- .../x4o}/vasc/frontends/swt/ui/SwtButton.java | 24 ++-- .../x4o}/vasc/frontends/swt/ui/SwtLabel.java | 24 ++-- .../x4o}/vasc/frontends/swt/ui/SwtList.java | 28 ++--- .../x4o}/vasc/frontends/swt/ui/SwtText.java | 24 ++-- .../vasc/frontends/swt/ui/SwtTextArea.java | 24 ++-- .../x4o}/vasc/SWTTableViewerTest.java | 2 +- .../idcanet => org/x4o}/vasc/SWTTest.java | 6 +- .../idcanet => org/x4o}/vasc/TestModel.java | 19 +-- .../x4o}/vasc/TestModelVascDataSource.java | 25 ++-- .../test/java/org/x4o}/vasc/TestTable.java | 45 ++++---- vasc-frontend-web-jsf/.classpath | 1 + vasc-frontend-web-jsf/.project | 6 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-frontend-web-jsf/pom.xml | 10 +- .../jsf/AbstractJSFVascFacesController.java | 43 +++---- .../web/jsf/JSFVascEntryEventListener.java | 13 ++- .../web/jsf/JSFVascEntrySupportBean.java | 33 +++--- .../web/jsf/JSFVascFrontendRenderer.java | 45 ++++---- .../frontends/web/jsf/JSFVascUIComponent.java | 27 ++--- .../web/jsf/JSFVascUIComponentRenderer.java | 29 ++--- .../web/jsf/JSFVascUIComponentTag.java | 2 +- .../web/jsf/JSFVascValidatePhaseListener.java | 7 +- .../frontends/web/jsf/OldVascUIComponent.java | 91 +++++++-------- .../web/jsf/VascDataBackendBean.java | 11 +- .../web/jsf/VascRequestFacesFilter.java | 2 +- .../frontends/web/jsf/VascViewHandler.java | 2 +- .../web/jsf/ui/AbstractJSFBaseComponent.java | 17 +-- .../vasc/frontends/web/jsf/ui/JSFBoolean.java | 17 +-- .../vasc/frontends/web/jsf/ui/JSFLabel.java | 15 +-- .../vasc/frontends/web/jsf/ui/JSFList.java | 19 +-- .../frontends/web/jsf/ui/JSFListModel.java | 11 +- .../vasc/frontends/web/jsf/ui/JSFText.java | 17 +-- .../frontends/web/jsf/ui/JSFTextArea.java | 17 +-- .../main/resources/META-INF/faces-config.xml | 6 +- .../src/main/resources/META-INF/vasc.tld | 6 +- vasc-xpql-ejb3/.classpath | 1 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-xpql-ejb3/pom.xml | 8 +- .../x4o}/vasc/xpql/ejb3/XpqlQueryManager.java | 5 +- .../vasc/xpql/ejb3/XpqlQueryManagerImpl.java | 14 +-- vasc-xpql/.classpath | 1 + .../org.eclipse.core.resources.prefs | 7 ++ .../.settings/org.eclipse.m2e.core.prefs | 5 + vasc-xpql/pom.xml | 17 +-- .../x4o}/vasc/xpql/QueryStore.java | 5 +- .../x4o}/vasc/xpql/XPQLParser.java | 6 +- .../x4o}/vasc/xpql/impl/DefaultQuery.java | 18 +-- .../xpql/impl/DefaultQueryParameterValue.java | 6 +- .../x4o}/vasc/xpql/impl/QueryInclude.java | 11 +- .../x4o}/vasc/xpql/impl/QueryParameter.java | 11 +- .../x4o}/vasc/xpql/impl/QueryText.java | 8 +- .../vasc/xpql/impl/x4o/CommentElement.java | 15 +-- .../x4o/ParameterTypeAttributeConverter.java | 13 ++- .../xpql/impl/x4o/QueryBindingHandler.java | 19 +-- .../impl/x4o/QueryElementConfigurator.java | 17 +-- .../xpql/impl/x4o/QueryIncludeElement.java | 13 ++- .../xpql/impl/x4o/QueryParameterElement.java | 13 ++- .../impl/x4o/QueryTypeAttributeConverter.java | 13 ++- .../x4o}/vasc/xpql/impl/x4o/SQLElement.java | 17 +-- .../x4o}/vasc/xpql/query/AbstractQuery.java | 53 ++++----- .../query/AbstractQueryParameterValue.java | 18 +-- .../vasc/xpql/query/AbstractQueryPart.java | 10 +- .../x4o}/vasc/xpql/query/Query.java | 5 +- .../vasc/xpql/query/QueryParameterValue.java | 2 +- .../x4o}/vasc/xpql/query/QueryPart.java | 2 +- .../resources/META-INF/xpql/xpql-lang.eld | 24 ++-- .../resources/META-INF/logging.properties | 2 +- 322 files changed, 2032 insertions(+), 1750 deletions(-) create mode 100644 demo-petstore/.settings/org.eclipse.core.resources.prefs create mode 100644 demo-petstore/.settings/org.eclipse.m2e.core.prefs create mode 100644 demo-petstore/demo-petstore-ear/.settings/org.eclipse.core.resources.prefs create mode 100644 demo-petstore/demo-petstore-ear/.settings/org.eclipse.m2e.core.prefs create mode 100644 demo-petstore/demo-petstore-ejb/.settings/org.eclipse.core.resources.prefs create mode 100644 demo-petstore/demo-petstore-ejb/.settings/org.eclipse.m2e.core.prefs create mode 100644 demo-petstore/demo-petstore-war/.settings/org.eclipse.core.resources.prefs create mode 100644 demo-petstore/demo-petstore-war/.settings/org.eclipse.m2e.core.prefs create mode 100644 vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs rename vasc-backend-jpa/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jpa/AbstractHibernateVascBackend.java (95%) rename vasc-backend-jpa/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jpa/AbstractPersistenceVascBackend.java (95%) rename vasc-backend-jpa/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jpa/EntityManagerProvider.java (97%) rename vasc-backend-jpa/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jpa/HibernateSessionProvider.java (97%) rename vasc-backend-jpa/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jpa/XpqlHibernateVascBackend.java (80%) rename vasc-backend-jpa/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jpa/XpqlPersistanceVascBackend.java (79%) create mode 100644 vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs rename vasc-backend-ldap/src/main/java/{com/idcanet => org/x4o}/vasc/backends/ldap/LdapConnectionProvider.java (97%) rename vasc-backend-ldap/src/main/java/{com/idcanet => org/x4o}/vasc/backends/ldap/LdapVascBackend.java (91%) rename vasc-backend-ldap/src/main/java/{com/idcanet => org/x4o}/vasc/backends/ldap/SimpleLdapConnectionProvider.java (96%) create mode 100644 vasc-core/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-core/.settings/org.eclipse.m2e.core.prefs rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascAnnotationParser.java (99%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascBundleKeyGenerator.java (99%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascChoices.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascChoicesSelectItemModel.java (86%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascDefaultValue.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascDisplayName.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascEntry.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascEventChannel.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascEventListener.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascField.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascFieldOrder.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascFieldTemplate.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascFieldType.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascI18n.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascModelReference.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascPrimaryKey.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascRoles.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/annotations/VascStyle.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/BeanVascEntryFieldValue.java (84%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/BeanVascEntryRecordCreator.java (81%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/MapVascEntryFieldValue.java (63%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/MapVascEntryRecordCreator.java (74%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jdbc/JdbcConnectionProvider.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jdbc/JdbcVascBackend.java (80%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jdbc/JdbcXpqlVascBackend.java (78%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java (96%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java (96%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/AbstractVascBackend.java (76%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/AbstractVascBackendProxy.java (72%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/AbstractVascBackendState.java (83%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/AbstractVascEntryFieldType.java (76%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/AbstractVascEntryState.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/AbstractVascFrontend.java (92%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascBackend.java (96%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascBackendController.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascBackendControllerLocal.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascBackendFilter.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascBackendPageNumber.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascBackendState.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascController.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntry.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryController.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryControllerLocal.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryField.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryFieldSet.java (99%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryFieldType.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryFieldTypeController.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryFieldTypeControllerLocal.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryFinalizer.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEntryState.java (99%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEventChannelController.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascEventChannelControllerLocal.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascException.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascFrontend.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascFrontendData.java (92%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascFrontendExceptionHandler.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascFrontendHelper.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascLinkEntry.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascLinkEntryType.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/VascUserRoleController.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/actions/AbstractVascAction.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/actions/ColumnVascAction.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/actions/GlobalVascAction.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/actions/RowVascAction.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/actions/VascAction.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryBackendEventListener.java (96%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryExporter.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryFieldEventChannel.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryFieldValidatorService.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryFieldValue.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryFrontendEventListener.java (96%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryRecordCreator.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryResourceImageResolver.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/entry/VascEntryResourceResolver.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascColumnValueModelListener.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascOptionValueModelListener.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascSelectItem.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascSelectItemModel.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascUIActionComponent.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascUIActionComponentListener.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascUIComponent.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascValueModel.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/core/ui/VascValueModelListener.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascBackedEntryFinalizer.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascBackendController.java (91%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascBackendState.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascController.java (91%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascEntry.java (95%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascEntryController.java (89%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascEntryField.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascEntryFieldSet.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascEntryState.java (73%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascFactory.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascFrontendData.java (83%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascFrontendEntryFinalizer.java (85%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascFrontendHelper.java (88%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascLinkEntry.java (97%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascSelectItemModel.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/DefaultVascUserRoleController.java (88%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/VascBackendProxyCache.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/VascBackendProxyEventExecutor.java (81%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/VascBackendProxyFilter.java (86%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/VascBackendProxyPaged.java (87%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/VascBackendProxySearch.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/VascBackendProxySort.java (89%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/VascBackendProxyTimerLogger.java (84%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/actions/AddRowAction.java (89%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/actions/CSVExportGlobalAction.java (91%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/actions/DeleteRowAction.java (89%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/actions/EditRowAction.java (87%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/actions/RefreshDataGlobalAction.java (91%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/actions/XMLExportGlobalAction.java (91%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java (82%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/entry/BeanVascEntryRecordCreator.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/entry/DefaultVascEntryResourceResolver.java (96%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/entry/HibernateValidatorService.java (96%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/entry/PersistanceValidatorService.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/entry/SetParameterBackendListener.java (85%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/entry/VascValidatorsValidatorService.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/type/DefaultVascEntryFieldType.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/type/DefaultVascEntryFieldTypeController.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/type/FieldTypeParser.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/type/MultiTextVascEntryFieldType.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/AnnotationParserElement.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/SelectItemModelBindingHandler.java (83%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/SetParameterElement.java (92%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascBackendElementConfigurator.java (83%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEntryActionElement.java (87%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEntryElementConfigurator.java (82%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEntryFieldBindingHandler.java (85%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEntryFieldElement.java (88%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java (85%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java (85%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEntryFieldTypeElement.java (87%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascEventListenerElement.java (91%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascLinkEntryParameterElement.java (89%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/impl/x4o/VascParser.java (89%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascDateFuture.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascDateFutureValidator.java (88%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascDatePast.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascDatePastValidator.java (88%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascIntSize.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascIntSizeValidator.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascLongSize.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascLongSizeValidator.java (90%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascObjectNotNull.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascObjectNotNullValidator.java (88%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascObjectNull.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascObjectNullValidator.java (88%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascObjectUrl.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascObjectUrlValidator.java (92%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringEmail.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringEmailValidator.java (92%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringLength.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringLengthValidator.java (94%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringRegex.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringRegexValidator.java (91%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringZipCode.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascStringZipCodeValidator.java (93%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascValidator.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascValidatorClassParser.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascValidatorException.java (98%) rename vasc-core/src/main/java/{com/idcanet => org/x4o}/vasc/validators/VascValidatorMessages.java (97%) rename vasc-core/src/test/java/{com/idcanet => org/x4o}/vasc/FieldTypesTest.java (95%) create mode 100644 vasc-ejb3/.settings/org.eclipse.m2e.core.prefs rename vasc-ejb3/src/main/java/{com/idcanet => org/x4o}/vasc/ejb3/VascServiceManager.java (96%) rename vasc-ejb3/src/main/java/{com/idcanet => org/x4o}/vasc/ejb3/VascServiceManagerImpl.java (90%) create mode 100644 vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/SwingVascFrontend.java (95%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingBoolean.java (84%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingButton.java (81%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingColorChooser.java (87%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingDate.java (84%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingLabel.java (80%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingList.java (85%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingText.java (86%) rename vasc-frontend-swing/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swing/ui/SwingTextArea.java (86%) rename vasc-frontend-swing/src/test/java/{com/idcanet => org/x4o}/vasc/SwingTest.java (97%) rename vasc-frontend-swing/src/test/java/{com/idcanet => org/x4o}/vasc/TestModel.java (89%) rename vasc-frontend-swing/src/test/java/{com/idcanet => org/x4o}/vasc/TestModelVascDataSource.java (87%) rename {vasc-frontend-swt/src/test/java/com/idcanet => vasc-frontend-swing/src/test/java/org/x4o}/vasc/TestTable.java (81%) create mode 100644 vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/SwtVascEditDialog.java (96%) rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/SwtVascFrontend.java (94%) rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/ui/SwtBoolean.java (84%) rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/ui/SwtButton.java (82%) rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/ui/SwtLabel.java (81%) rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/ui/SwtList.java (85%) rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/ui/SwtText.java (84%) rename vasc-frontend-swt/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/swt/ui/SwtTextArea.java (86%) rename vasc-frontend-swt/src/test/java/{com/idcanet => org/x4o}/vasc/SWTTableViewerTest.java (99%) rename vasc-frontend-swt/src/test/java/{com/idcanet => org/x4o}/vasc/SWTTest.java (96%) rename vasc-frontend-swt/src/test/java/{com/idcanet => org/x4o}/vasc/TestModel.java (89%) rename vasc-frontend-swt/src/test/java/{com/idcanet => org/x4o}/vasc/TestModelVascDataSource.java (87%) rename {vasc-frontend-swing/src/test/java/com/idcanet => vasc-frontend-swt/src/test/java/org/x4o}/vasc/TestTable.java (81%) create mode 100644 vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java (92%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/JSFVascEntryEventListener.java (86%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java (98%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java (71%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/JSFVascUIComponent.java (96%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java (97%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/JSFVascUIComponentTag.java (99%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java (94%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/OldVascUIComponent.java (95%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/VascDataBackendBean.java (97%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/VascRequestFacesFilter.java (99%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/VascViewHandler.java (99%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/ui/AbstractJSFBaseComponent.java (79%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/ui/JSFBoolean.java (87%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/ui/JSFLabel.java (87%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/ui/JSFList.java (93%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/ui/JSFListModel.java (95%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/ui/JSFText.java (91%) rename vasc-frontend-web-jsf/src/main/java/{com/idcanet => org/x4o}/vasc/frontends/web/jsf/ui/JSFTextArea.java (88%) create mode 100644 vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-xpql-ejb3/.settings/org.eclipse.m2e.core.prefs rename vasc-xpql-ejb3/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/ejb3/XpqlQueryManager.java (90%) rename vasc-xpql-ejb3/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/ejb3/XpqlQueryManagerImpl.java (96%) create mode 100644 vasc-xpql/.settings/org.eclipse.core.resources.prefs create mode 100644 vasc-xpql/.settings/org.eclipse.m2e.core.prefs rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/QueryStore.java (96%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/XPQLParser.java (95%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/DefaultQuery.java (90%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/DefaultQueryParameterValue.java (92%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/QueryInclude.java (93%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/QueryParameter.java (96%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/QueryText.java (92%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/CommentElement.java (85%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java (82%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/QueryBindingHandler.java (87%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/QueryElementConfigurator.java (83%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/QueryIncludeElement.java (88%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/QueryParameterElement.java (88%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java (83%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/impl/x4o/SQLElement.java (84%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/query/AbstractQuery.java (75%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/query/AbstractQueryParameterValue.java (79%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/query/AbstractQueryPart.java (90%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/query/Query.java (97%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/query/QueryParameterValue.java (98%) rename vasc-xpql/src/main/java/{com/idcanet => org/x4o}/vasc/xpql/query/QueryPart.java (98%) diff --git a/.project b/.project index ca19bfe..25014ac 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - com.idcanet.vasc + vasc diff --git a/demo-petstore/.project b/demo-petstore/.project index cffb8f9..f09a316 100644 --- a/demo-petstore/.project +++ b/demo-petstore/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/demo-petstore/.settings/org.eclipse.core.resources.prefs b/demo-petstore/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..fc3257d --- /dev/null +++ b/demo-petstore/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sun Dec 25 17:29:07 CET 2011 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/demo-petstore/.settings/org.eclipse.m2e.core.prefs b/demo-petstore/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/demo-petstore/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/demo-petstore/demo-petstore-ear/.classpath b/demo-petstore/demo-petstore-ear/.classpath index f42fb64..77b6db8 100644 --- a/demo-petstore/demo-petstore-ear/.classpath +++ b/demo-petstore/demo-petstore-ear/.classpath @@ -1,10 +1,7 @@ - - - - + diff --git a/demo-petstore/demo-petstore-ear/.project b/demo-petstore/demo-petstore-ear/.project index b15ca09..82c2b99 100644 --- a/demo-petstore/demo-petstore-ear/.project +++ b/demo-petstore/demo-petstore-ear/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/demo-petstore/demo-petstore-ear/.settings/org.eclipse.core.resources.prefs b/demo-petstore/demo-petstore-ear/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..fc3257d --- /dev/null +++ b/demo-petstore/demo-petstore-ear/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sun Dec 25 17:29:07 CET 2011 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/demo-petstore/demo-petstore-ear/.settings/org.eclipse.m2e.core.prefs b/demo-petstore/demo-petstore-ear/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/demo-petstore/demo-petstore-ear/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/demo-petstore/demo-petstore-ear/pom.xml b/demo-petstore/demo-petstore-ear/pom.xml index c9ddc4a..37413da 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 - com.idcanet.vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc demo-petstore-ear 0.3.5-SNAPSHOT \ No newline at end of file diff --git a/demo-petstore/demo-petstore-ejb/.classpath b/demo-petstore/demo-petstore-ejb/.classpath index f42fb64..9cb821b 100644 --- a/demo-petstore/demo-petstore-ejb/.classpath +++ b/demo-petstore/demo-petstore-ejb/.classpath @@ -2,9 +2,8 @@ - - + diff --git a/demo-petstore/demo-petstore-ejb/.project b/demo-petstore/demo-petstore-ejb/.project index 361ebfb..3d5a88f 100644 --- a/demo-petstore/demo-petstore-ejb/.project +++ b/demo-petstore/demo-petstore-ejb/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/demo-petstore/demo-petstore-ejb/.settings/org.eclipse.core.resources.prefs b/demo-petstore/demo-petstore-ejb/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..b1d07db --- /dev/null +++ b/demo-petstore/demo-petstore-ejb/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:07 CET 2011 +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/demo-petstore/demo-petstore-ejb/.settings/org.eclipse.m2e.core.prefs b/demo-petstore/demo-petstore-ejb/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/demo-petstore/demo-petstore-ejb/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/demo-petstore/demo-petstore-ejb/pom.xml b/demo-petstore/demo-petstore-ejb/pom.xml index 15ab11e..0a83ccd 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 - com.idcanet.vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc demo-petstore-ejb 0.3.5-SNAPSHOT ejb @@ -25,7 +25,7 @@ - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} @@ -53,35 +53,35 @@ provided - com.idcanet.x4o + org.x4o x4o-core ${x4o-core.version} provided - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} provided - com.idcanet.vasc + org.x4o.vasc vasc-backend-jpa ${project.version} provided - com.idcanet.vasc + org.x4o.vasc vasc-xpql ${project.version} - com.idcanet.vasc + org.x4o.vasc vasc-xpql-ejb3 ${project.version} - com.idcanet.vasc + org.x4o.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 a85e760..6a6c1e3 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,17 @@ package demo.petstore.models; import java.util.Date; -import com.idcanet.vasc.annotations.VascDefaultValue; -import com.idcanet.vasc.annotations.VascDisplayName; -import com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldOrder; -import com.idcanet.vasc.annotations.VascFieldType; -import com.idcanet.vasc.annotations.VascI18n; -import com.idcanet.vasc.annotations.VascPrimaryKey; -import com.idcanet.vasc.annotations.VascRoles; -import com.idcanet.vasc.annotations.VascStyle; -import com.idcanet.vasc.validators.VascObjectNotNull; -import com.idcanet.vasc.validators.VascStringLength; +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; 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 6ad587c..a4e0d4e 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; +import org.x4o.vasc.annotations.VascField; +import org.x4o.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 235b1d2..9ddfcf6 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; -import com.idcanet.vasc.annotations.VascModelReference; +import org.x4o.vasc.annotations.VascField; +import org.x4o.vasc.annotations.VascFieldTemplate; +import org.x4o.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 c378687..fde6535 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 com.idcanet.vasc.annotations.VascFieldTemplate; -import com.idcanet.vasc.annotations.VascModelReference; +import org.x4o.vasc.annotations.VascFieldTemplate; +import org.x4o.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 bb0556b..3091043 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 com.idcanet.vasc.annotations.VascFieldTemplate; -import com.idcanet.vasc.annotations.VascModelReference; +import org.x4o.vasc.annotations.VascFieldTemplate; +import org.x4o.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 3e31e96..59e527b 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; +import org.x4o.vasc.annotations.VascField; +import org.x4o.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 eed19b2..773a1d8 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; -import com.idcanet.vasc.annotations.VascModelReference; +import org.x4o.vasc.annotations.VascField; +import org.x4o.vasc.annotations.VascFieldTemplate; +import org.x4o.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 11874fb..d5234b3 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; -import com.idcanet.vasc.annotations.VascModelReference; +import org.x4o.vasc.annotations.VascField; +import org.x4o.vasc.annotations.VascFieldTemplate; +import org.x4o.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 75a3f02..8b8d161 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; +import org.x4o.vasc.annotations.VascField; +import org.x4o.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 8e19435..027081c 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; +import org.x4o.vasc.annotations.VascField; +import org.x4o.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 3467875..fd64bfb 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 com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; -import com.idcanet.vasc.annotations.VascModelReference; +import org.x4o.vasc.annotations.VascField; +import org.x4o.vasc.annotations.VascFieldTemplate; +import org.x4o.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 3759423..697b828 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 com.idcanet.vasc.annotations.VascDefaultValue; -import com.idcanet.vasc.annotations.VascField; -import com.idcanet.vasc.annotations.VascFieldTemplate; -import com.idcanet.vasc.annotations.VascModelReference; +import org.x4o.vasc.annotations.VascDefaultValue; +import org.x4o.vasc.annotations.VascField; +import org.x4o.vasc.annotations.VascFieldTemplate; +import org.x4o.vasc.annotations.VascModelReference; @Entity public class UserProfile extends AbstractPetStoreEntity { diff --git a/demo-petstore/demo-petstore-war/.classpath b/demo-petstore/demo-petstore-war/.classpath index f42fb64..77b6db8 100644 --- a/demo-petstore/demo-petstore-war/.classpath +++ b/demo-petstore/demo-petstore-war/.classpath @@ -1,10 +1,7 @@ - - - - + diff --git a/demo-petstore/demo-petstore-war/.project b/demo-petstore/demo-petstore-war/.project index 0e18434..29fbc66 100644 --- a/demo-petstore/demo-petstore-war/.project +++ b/demo-petstore/demo-petstore-war/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/demo-petstore/demo-petstore-war/.settings/org.eclipse.core.resources.prefs b/demo-petstore/demo-petstore-war/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..fc3257d --- /dev/null +++ b/demo-petstore/demo-petstore-war/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sun Dec 25 17:29:07 CET 2011 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/demo-petstore/demo-petstore-war/.settings/org.eclipse.m2e.core.prefs b/demo-petstore/demo-petstore-war/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/demo-petstore/demo-petstore-war/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/demo-petstore/demo-petstore-war/pom.xml b/demo-petstore/demo-petstore-war/pom.xml index 89f545c..69bb6f4 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 - com.idcanet.vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.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 f609bb2..e5da7c8 100644 --- a/demo-petstore/pom.xml +++ b/demo-petstore/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc demo-petstore 0.3.5-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index dab44ed..1f9f886 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ 4.0.0 -com.idcanet.vasc -vasc-base +org.x4o.vasc +vasc 0.3.5-SNAPSHOT pom vasc @@ -10,23 +10,19 @@ http://www.x4o.org/vasc 2007 - IDCA - http://www.idca.nl + X4O.oth + http://www.x4o.org - - Trac - https://decaid.idca.nl/trac/oss/ - BSD - http://repository.idcanet.com/licenses/bsd.txt + license.txt - https://decaid.idca.nl/hg/com.idcanet.vasc/ - scm:hg:${hg.repo.url} - https://decaid.idca.nl/hg/com.idcanet.vasc/file/ + git@bitbucket.org:im_ik/vasc.git + scm:hg:ssh://git@bitbucket.org:im_ik/vasc.git + https://bitbucket.org/im_ik/vasc.git vasc-backend-jpa @@ -41,12 +37,12 @@ demo-petstore - https://decaid.idca.nl/hg/com.idcanet.vasc/ + https://...vasc/ file://${project.build.directory}/target-maven-repo UTF-8 2.1.0 5.8 - 0.8.1 + 0.8.2-SNAPSHOT 4.3 diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt index d289aa8..c165bf5 100644 --- a/src/site/apt/download.apt +++ b/src/site/apt/download.apt @@ -4,8 +4,8 @@ Downloading +-- - com.idcanet - vasc + org.x4o.vasc + vasc-core 0.5-SNAPSHOT +-- diff --git a/vasc-backend-jpa/.classpath b/vasc-backend-jpa/.classpath index f42fb64..7106942 100644 --- a/vasc-backend-jpa/.classpath +++ b/vasc-backend-jpa/.classpath @@ -5,6 +5,7 @@ + diff --git a/vasc-backend-jpa/.project b/vasc-backend-jpa/.project index 360d79e..85c8a3a 100644 --- a/vasc-backend-jpa/.project +++ b/vasc-backend-jpa/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs b/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..155f2f0 --- /dev/null +++ b/vasc-backend-jpa/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:06 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-jpa/.settings/org.eclipse.m2e.core.prefs b/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..523f09f --- /dev/null +++ b/vasc-backend-jpa/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:02 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-backend-jpa/pom.xml b/vasc-backend-jpa/pom.xml index 7af311f..2204e31 100644 --- a/vasc-backend-jpa/pom.xml +++ b/vasc-backend-jpa/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-backend-jpa 0.3.5-SNAPSHOT vasc-backend-jpa vasc-backend-jpa - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} diff --git a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/AbstractHibernateVascBackend.java b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractHibernateVascBackend.java similarity index 95% rename from vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/AbstractHibernateVascBackend.java rename to vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractHibernateVascBackend.java index 173373d..b71ab3b 100644 --- a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/AbstractHibernateVascBackend.java +++ b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractHibernateVascBackend.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jpa; +package org.x4o.vasc.backends.jpa; import org.hibernate.Session; +import org.x4o.vasc.core.AbstractVascBackend; +import org.x4o.vasc.core.VascException; -import com.idcanet.vasc.core.AbstractVascBackend; -import com.idcanet.vasc.core.VascException; /** * diff --git a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/AbstractPersistenceVascBackend.java b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractPersistenceVascBackend.java similarity index 95% rename from vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/AbstractPersistenceVascBackend.java rename to vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractPersistenceVascBackend.java index ac57e7c..4f63818 100644 --- a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/AbstractPersistenceVascBackend.java +++ b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/AbstractPersistenceVascBackend.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jpa; +package org.x4o.vasc.backends.jpa; import java.lang.reflect.Method; import javax.persistence.EntityManager; -import com.idcanet.vasc.core.AbstractVascBackend; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.AbstractVascBackend; +import org.x4o.vasc.core.VascException; + /** * diff --git a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/EntityManagerProvider.java b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/EntityManagerProvider.java similarity index 97% rename from vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/EntityManagerProvider.java rename to vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/EntityManagerProvider.java index 16b08b0..3088284 100644 --- a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/EntityManagerProvider.java +++ b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/EntityManagerProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jpa; +package org.x4o.vasc.backends.jpa; import javax.persistence.EntityManager; diff --git a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/HibernateSessionProvider.java b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/HibernateSessionProvider.java similarity index 97% rename from vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/HibernateSessionProvider.java rename to vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/HibernateSessionProvider.java index f9f4173..70254c0 100644 --- a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/HibernateSessionProvider.java +++ b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/HibernateSessionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jpa; +package org.x4o.vasc.backends.jpa; import org.hibernate.Session; diff --git a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/XpqlHibernateVascBackend.java b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlHibernateVascBackend.java similarity index 80% rename from vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/XpqlHibernateVascBackend.java rename to vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlHibernateVascBackend.java index 0c81b86..d5a201e 100644 --- a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/XpqlHibernateVascBackend.java +++ b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlHibernateVascBackend.java @@ -24,23 +24,23 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jpa; +package org.x4o.vasc.backends.jpa; import java.util.List; 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; -import com.idcanet.vasc.backends.BeanVascEntryFieldValue; -import com.idcanet.vasc.backends.BeanVascEntryRecordCreator; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; -import com.idcanet.vasc.xpql.query.QueryParameterValue; /** * Manages persistance with xpql queries @@ -52,17 +52,17 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { private HibernateSessionProvider hibernateSessionProvider = null; - private com.idcanet.vasc.xpql.query.Query query = null; + private org.x4o.vasc.xpql.query.Query query = null; - private com.idcanet.vasc.xpql.query.Query queryTotal = null; + private org.x4o.vasc.xpql.query.Query queryTotal = null; - private com.idcanet.vasc.xpql.query.Query queryMoveUp = null; + private org.x4o.vasc.xpql.query.Query queryMoveUp = null; - private com.idcanet.vasc.xpql.query.Query queryMoveUpDown = null; + private org.x4o.vasc.xpql.query.Query queryMoveUpDown = null; - private com.idcanet.vasc.xpql.query.Query queryMoveDown = null; + private org.x4o.vasc.xpql.query.Query queryMoveDown = null; - private com.idcanet.vasc.xpql.query.Query queryMoveDownUp = null; + private org.x4o.vasc.xpql.query.Query queryMoveDownUp = null; private Class resultClass = null; @@ -70,7 +70,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() + * @see org.x4o.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() */ @Override Session getHibernateSession() { @@ -119,7 +119,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryFieldValue(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { BeanVascEntryFieldValue result = new BeanVascEntryFieldValue(); @@ -127,7 +127,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryRecordCreator(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new BeanVascEntryRecordCreator(resultClass); @@ -136,28 +136,28 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { /** * @return the query */ - public com.idcanet.vasc.xpql.query.Query getQuery() { + public org.x4o.vasc.xpql.query.Query getQuery() { return query; } /** * @param query the query to set */ - public void setQuery(com.idcanet.vasc.xpql.query.Query query) { + public void setQuery(org.x4o.vasc.xpql.query.Query query) { this.query = query; } /** * @return the queryTotal */ - public com.idcanet.vasc.xpql.query.Query getQueryTotal() { + public org.x4o.vasc.xpql.query.Query getQueryTotal() { return queryTotal; } /** * @param queryTotal the queryTotal to set */ - public void setQueryTotal(com.idcanet.vasc.xpql.query.Query queryTotal) { + public void setQueryTotal(org.x4o.vasc.xpql.query.Query queryTotal) { this.queryTotal = queryTotal; } @@ -190,7 +190,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.core.AbstractVascBackend#isPageable() + * @see org.x4o.vasc.core.AbstractVascBackend#isPageable() */ @Override public boolean isPageable() { @@ -201,7 +201,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { Session s = getHibernateSession(); @@ -230,7 +230,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.core.AbstractVascBackend#doRecordMoveDownById(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveDownById(java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { @@ -299,7 +299,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.core.AbstractVascBackend#doRecordMoveUpById(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveUpById(java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { @@ -368,7 +368,7 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { } /** - * @see com.idcanet.vasc.core.AbstractVascBackend#isRecordMoveable() + * @see org.x4o.vasc.core.AbstractVascBackend#isRecordMoveable() */ @Override public boolean isRecordMoveable() { @@ -378,56 +378,56 @@ public class XpqlHibernateVascBackend extends AbstractHibernateVascBackend { /** * @return the queryMoveUp */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveUp() { + public org.x4o.vasc.xpql.query.Query getQueryMoveUp() { return queryMoveUp; } /** * @param queryMoveUp the queryMoveUp to set */ - public void setQueryMoveUp(com.idcanet.vasc.xpql.query.Query queryMoveUp) { + public void setQueryMoveUp(org.x4o.vasc.xpql.query.Query queryMoveUp) { this.queryMoveUp = queryMoveUp; } /** * @return the queryMoveDown */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveDown() { + public org.x4o.vasc.xpql.query.Query getQueryMoveDown() { return queryMoveDown; } /** * @param queryMoveDown the queryMoveDown to set */ - public void setQueryMoveDown(com.idcanet.vasc.xpql.query.Query queryMoveDown) { + public void setQueryMoveDown(org.x4o.vasc.xpql.query.Query queryMoveDown) { this.queryMoveDown = queryMoveDown; } /** * @return the queryMoveUpDown */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveUpDown() { + public org.x4o.vasc.xpql.query.Query getQueryMoveUpDown() { return queryMoveUpDown; } /** * @param queryMoveUpDown the queryMoveUpDown to set */ - public void setQueryMoveUpDown(com.idcanet.vasc.xpql.query.Query queryMoveUpDown) { + public void setQueryMoveUpDown(org.x4o.vasc.xpql.query.Query queryMoveUpDown) { this.queryMoveUpDown = queryMoveUpDown; } /** * @return the queryMoveDownUp */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveDownUp() { + public org.x4o.vasc.xpql.query.Query getQueryMoveDownUp() { return queryMoveDownUp; } /** * @param queryMoveDownUp the queryMoveDownUp to set */ - public void setQueryMoveDownUp(com.idcanet.vasc.xpql.query.Query queryMoveDownUp) { + public void setQueryMoveDownUp(org.x4o.vasc.xpql.query.Query queryMoveDownUp) { this.queryMoveDownUp = queryMoveDownUp; } } \ No newline at end of file diff --git a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/XpqlPersistanceVascBackend.java b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlPersistanceVascBackend.java similarity index 79% rename from vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/XpqlPersistanceVascBackend.java rename to vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlPersistanceVascBackend.java index 159b8d8..6016def 100644 --- a/vasc-backend-jpa/src/main/java/com/idcanet/vasc/backends/jpa/XpqlPersistanceVascBackend.java +++ b/vasc-backend-jpa/src/main/java/org/x4o/vasc/backends/jpa/XpqlPersistanceVascBackend.java @@ -24,22 +24,23 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jpa; +package org.x4o.vasc.backends.jpa; import java.util.List; import javax.persistence.EntityManager; import javax.persistence.Query; -import com.idcanet.vasc.backends.BeanVascEntryFieldValue; -import com.idcanet.vasc.backends.BeanVascEntryRecordCreator; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; -import com.idcanet.vasc.xpql.query.QueryParameterValue; +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; + /** * Manages persistance with xpql queries @@ -51,17 +52,17 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend private EntityManagerProvider entityManagerProvider = null; - private com.idcanet.vasc.xpql.query.Query query = null; + private org.x4o.vasc.xpql.query.Query query = null; - private com.idcanet.vasc.xpql.query.Query queryTotal = null; + private org.x4o.vasc.xpql.query.Query queryTotal = null; - private com.idcanet.vasc.xpql.query.Query queryMoveUp = null; + private org.x4o.vasc.xpql.query.Query queryMoveUp = null; - private com.idcanet.vasc.xpql.query.Query queryMoveUpDown = null; + private org.x4o.vasc.xpql.query.Query queryMoveUpDown = null; - private com.idcanet.vasc.xpql.query.Query queryMoveDown = null; + private org.x4o.vasc.xpql.query.Query queryMoveDown = null; - private com.idcanet.vasc.xpql.query.Query queryMoveDownUp = null; + private org.x4o.vasc.xpql.query.Query queryMoveDownUp = null; private Class resultClass = null; @@ -69,7 +70,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see com.idcanet.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() + * @see org.x4o.vasc.backends.jpa.AbstractPersistenceVascBackend#getEntityManager() */ @Override EntityManager getEntityManager() { @@ -123,7 +124,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryFieldValue(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { VascEntryFieldValue result = new BeanVascEntryFieldValue(); @@ -131,7 +132,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryRecordCreator(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { VascEntryRecordCreator result = new BeanVascEntryRecordCreator(resultClass); @@ -141,28 +142,28 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend /** * @return the query */ - public com.idcanet.vasc.xpql.query.Query getQuery() { + public org.x4o.vasc.xpql.query.Query getQuery() { return query; } /** * @param query the query to set */ - public void setQuery(com.idcanet.vasc.xpql.query.Query query) { + public void setQuery(org.x4o.vasc.xpql.query.Query query) { this.query = query; } /** * @return the queryTotal */ - public com.idcanet.vasc.xpql.query.Query getQueryTotal() { + public org.x4o.vasc.xpql.query.Query getQueryTotal() { return queryTotal; } /** * @param queryTotal the queryTotal to set */ - public void setQueryTotal(com.idcanet.vasc.xpql.query.Query queryTotal) { + public void setQueryTotal(org.x4o.vasc.xpql.query.Query queryTotal) { this.queryTotal = queryTotal; } @@ -195,7 +196,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see com.idcanet.vasc.core.AbstractVascBackend#isPageable() + * @see org.x4o.vasc.core.AbstractVascBackend#isPageable() */ @Override public boolean isPageable() { @@ -206,7 +207,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see com.idcanet.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { EntityManager em = getEntityManager(); @@ -235,7 +236,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend /** - * @see com.idcanet.vasc.core.AbstractVascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { @@ -298,7 +299,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see com.idcanet.vasc.core.AbstractVascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { @@ -361,7 +362,7 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend } /** - * @see com.idcanet.vasc.core.AbstractVascBackend#isRecordMoveable() + * @see org.x4o.vasc.core.AbstractVascBackend#isRecordMoveable() */ @Override public boolean isRecordMoveable() { @@ -371,61 +372,61 @@ public class XpqlPersistanceVascBackend extends AbstractPersistenceVascBackend /** * @return the queryMoveUp */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveUp() { + public org.x4o.vasc.xpql.query.Query getQueryMoveUp() { return queryMoveUp; } /** * @param queryMoveUp the queryMoveUp to set */ - public void setQueryMoveUp(com.idcanet.vasc.xpql.query.Query queryMoveUp) { + public void setQueryMoveUp(org.x4o.vasc.xpql.query.Query queryMoveUp) { this.queryMoveUp = queryMoveUp; } /** * @return the queryMoveDown */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveDown() { + public org.x4o.vasc.xpql.query.Query getQueryMoveDown() { return queryMoveDown; } /** * @param queryMoveDown the queryMoveDown to set */ - public void setQueryMoveDown(com.idcanet.vasc.xpql.query.Query queryMoveDown) { + public void setQueryMoveDown(org.x4o.vasc.xpql.query.Query queryMoveDown) { this.queryMoveDown = queryMoveDown; } /** * @return the queryMoveUpDown */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveUpDown() { + public org.x4o.vasc.xpql.query.Query getQueryMoveUpDown() { return queryMoveUpDown; } /** * @param queryMoveUpDown the queryMoveUpDown to set */ - public void setQueryMoveUpDown(com.idcanet.vasc.xpql.query.Query queryMoveUpDown) { + public void setQueryMoveUpDown(org.x4o.vasc.xpql.query.Query queryMoveUpDown) { this.queryMoveUpDown = queryMoveUpDown; } /** * @return the queryMoveDownUp */ - public com.idcanet.vasc.xpql.query.Query getQueryMoveDownUp() { + public org.x4o.vasc.xpql.query.Query getQueryMoveDownUp() { return queryMoveDownUp; } /** * @param queryMoveDownUp the queryMoveDownUp to set */ - public void setQueryMoveDownUp(com.idcanet.vasc.xpql.query.Query queryMoveDownUp) { + public void setQueryMoveDownUp(org.x4o.vasc.xpql.query.Query queryMoveDownUp) { this.queryMoveDownUp = queryMoveDownUp; } /** - * @see com.idcanet.vasc.core.VascBackend#isSearchable() + * @see org.x4o.vasc.core.VascBackend#isSearchable() */ public boolean isSearchable() { if (query.getQueryParameterValue("text_search")==null) { diff --git a/vasc-backend-ldap/.classpath b/vasc-backend-ldap/.classpath index f42fb64..7106942 100644 --- a/vasc-backend-ldap/.classpath +++ b/vasc-backend-ldap/.classpath @@ -5,6 +5,7 @@ + diff --git a/vasc-backend-ldap/.project b/vasc-backend-ldap/.project index a227e5c..67a2499 100644 --- a/vasc-backend-ldap/.project +++ b/vasc-backend-ldap/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs b/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..6d54e61 --- /dev/null +++ b/vasc-backend-ldap/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:07 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-ldap/.settings/org.eclipse.m2e.core.prefs b/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..523f09f --- /dev/null +++ b/vasc-backend-ldap/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:02 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-backend-ldap/pom.xml b/vasc-backend-ldap/pom.xml index 603102b..5b95ef3 100644 --- a/vasc-backend-ldap/pom.xml +++ b/vasc-backend-ldap/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-backend-ldap 0.3.5-SNAPSHOT vasc-backend-ldap vasc-backend-ldap - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} diff --git a/vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/LdapConnectionProvider.java b/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapConnectionProvider.java similarity index 97% rename from vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/LdapConnectionProvider.java rename to vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapConnectionProvider.java index a519c76..84cd8f0 100644 --- a/vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/LdapConnectionProvider.java +++ b/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.ldap; +package org.x4o.vasc.backends.ldap; import com.novell.ldap.LDAPConnection; diff --git a/vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/LdapVascBackend.java b/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapVascBackend.java similarity index 91% rename from vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/LdapVascBackend.java rename to vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapVascBackend.java index 12eee3d..8f9aea5 100644 --- a/vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/LdapVascBackend.java +++ b/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/LdapVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.ldap; +package org.x4o.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 com.idcanet.vasc.backends.MapVascEntryFieldValue; -import com.idcanet.vasc.backends.MapVascEntryRecordCreator; -import com.idcanet.vasc.core.AbstractVascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; +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 com.novell.ldap.LDAPAttribute; import com.novell.ldap.LDAPAttributeSet; import com.novell.ldap.LDAPConnection; @@ -81,7 +82,7 @@ public class LdapVascBackend extends AbstractVascBackend { /** - * @see com.idcanet.vasc.core.VascBackend#execute() + * @see org.x4o.vasc.core.VascBackend#execute() */ public List execute(VascBackendState state) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -140,7 +141,7 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#merge(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -220,7 +221,7 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#persist(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -240,7 +241,7 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#delete(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { LdapConnectionProvider prov = getLdapConnectionProvider(); @@ -274,14 +275,14 @@ public class LdapVascBackend extends AbstractVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryRecordCreator(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new MapVascEntryRecordCreator(); } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryFieldValue(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return new MapVascEntryFieldValue(); diff --git a/vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/SimpleLdapConnectionProvider.java b/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/SimpleLdapConnectionProvider.java similarity index 96% rename from vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/SimpleLdapConnectionProvider.java rename to vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/SimpleLdapConnectionProvider.java index b14df75..9e4ef8e 100644 --- a/vasc-backend-ldap/src/main/java/com/idcanet/vasc/backends/ldap/SimpleLdapConnectionProvider.java +++ b/vasc-backend-ldap/src/main/java/org/x4o/vasc/backends/ldap/SimpleLdapConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.ldap; +package org.x4o.vasc.backends.ldap; import com.novell.ldap.LDAPConnection; @@ -42,7 +42,7 @@ public class SimpleLdapConnectionProvider implements LdapConnectionProvider { private String bindPass = null; /** - * @see com.idcanet.vasc.backends.ldap.LdapConnectionProvider#getLdapConnection() + * @see org.x4o.vasc.backends.ldap.LdapConnectionProvider#getLdapConnection() */ public LDAPConnection getLdapConnection() { try { diff --git a/vasc-core/.classpath b/vasc-core/.classpath index f42fb64..7106942 100644 --- a/vasc-core/.classpath +++ b/vasc-core/.classpath @@ -5,6 +5,7 @@ + diff --git a/vasc-core/.settings/org.eclipse.core.resources.prefs b/vasc-core/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..155f2f0 --- /dev/null +++ b/vasc-core/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:06 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-core/.settings/org.eclipse.m2e.core.prefs b/vasc-core/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/vasc-core/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-core/pom.xml b/vasc-core/pom.xml index 0b85680..94ad85b 100644 --- a/vasc-core/pom.xml +++ b/vasc-core/pom.xml @@ -1,23 +1,23 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-core 0.3.5-SNAPSHOT vasc-core vasc-core - com.idcanet.x4o + org.x4o x4o-core ${x4o-core.version} - com.idcanet.vasc + org.x4o.vasc vasc-xpql ${project.version} diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascAnnotationParser.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascAnnotationParser.java similarity index 99% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascAnnotationParser.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascAnnotationParser.java index e4f07c7..7514edb 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascAnnotationParser.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascAnnotationParser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascBundleKeyGenerator.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascBundleKeyGenerator.java similarity index 99% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascBundleKeyGenerator.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascBundleKeyGenerator.java index f803012..7bc148b 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascBundleKeyGenerator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascBundleKeyGenerator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascChoices.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoices.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascChoices.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoices.java index f4bcb29..d96e8c6 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascChoices.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoices.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascChoicesSelectItemModel.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoicesSelectItemModel.java similarity index 86% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascChoicesSelectItemModel.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoicesSelectItemModel.java index c51e516..fd7a611 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascChoicesSelectItemModel.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascChoicesSelectItemModel.java @@ -1,15 +1,16 @@ /** * */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascSelectItem; -import com.idcanet.vasc.core.ui.VascSelectItemModel; +import org.x4o.vasc.core.VascException; +import org.x4o.vasc.core.ui.VascSelectItem; +import org.x4o.vasc.core.ui.VascSelectItemModel; + /** * Selected the vasc choices @@ -30,9 +31,9 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa } /** - * @see com.idcanet.vasc.core.ui.VascSelectItemModel#getVascSelectItems(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.ui.VascSelectItemModel#getVascSelectItems(org.x4o.vasc.core.VascEntry) */ - public List getVascSelectItems(com.idcanet.vasc.core.VascEntry entry) throws VascException { + public List getVascSelectItems(org.x4o.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/com/idcanet/vasc/annotations/VascDefaultValue.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDefaultValue.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascDefaultValue.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascDefaultValue.java index b3a46bc..f8a1060 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascDefaultValue.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDefaultValue.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascDisplayName.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDisplayName.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascDisplayName.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascDisplayName.java index 0d879ea..100dd76 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascDisplayName.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascDisplayName.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEntry.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEntry.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEntry.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascEntry.java index fe18002..75d5b89 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEntry.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEntry.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEventChannel.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventChannel.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEventChannel.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventChannel.java index 2a843a8..1d09bc0 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEventChannel.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventChannel.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEventListener.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventListener.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEventListener.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventListener.java index c12168c..1f57f57 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascEventListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascEventListener.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascField.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascField.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascField.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascField.java index 1d08b63..c58c0e9 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascField.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascField.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldOrder.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldOrder.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldOrder.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldOrder.java index 1bdd4a6..ee48e11 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldOrder.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldOrder.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldTemplate.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldTemplate.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldTemplate.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldTemplate.java index a250ed3..54dafbf 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldTemplate.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldTemplate.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldType.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldType.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldType.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldType.java index 9340839..589cfd0 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascFieldType.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascFieldType.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascI18n.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascI18n.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascI18n.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascI18n.java index 4cd3fd7..5725846 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascI18n.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascI18n.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -44,7 +44,6 @@ public @interface VascI18n { /** * The key of the Label default to "null" - * @see com.idcanet.i18n.I18nAnnotationParser#getI18nLabelKey(Class, String) * @return The key of the ToolTip */ String name() default ""; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascModelReference.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascModelReference.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascModelReference.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascModelReference.java index fbdafe4..2726ba3 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascModelReference.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascModelReference.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascPrimaryKey.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascPrimaryKey.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascPrimaryKey.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascPrimaryKey.java index 34131fb..3803b0f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascPrimaryKey.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascPrimaryKey.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascRoles.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascRoles.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascRoles.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascRoles.java index 418014f..cb651c1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascRoles.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascRoles.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascStyle.java b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascStyle.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/annotations/VascStyle.java rename to vasc-core/src/main/java/org/x4o/vasc/annotations/VascStyle.java index 75c36f9..80c9498 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/annotations/VascStyle.java +++ b/vasc-core/src/main/java/org/x4o/vasc/annotations/VascStyle.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.annotations; +package org.x4o.vasc.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/backends/BeanVascEntryFieldValue.java b/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryFieldValue.java similarity index 84% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/BeanVascEntryFieldValue.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryFieldValue.java index c3d94e7..b5e6b2a 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/BeanVascEntryFieldValue.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryFieldValue.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends; +package org.x4o.vasc.backends; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.x4o.impl.DefaultElementObjectPropertyValue; + +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; +import org.x4o.vasc.core.entry.VascEntryFieldValue; +import org.x4o.xml.impl.DefaultElementObjectPropertyValue; /** * @@ -42,7 +43,7 @@ public class BeanVascEntryFieldValue implements VascEntryFieldValue { private DefaultElementObjectPropertyValue bean = new DefaultElementObjectPropertyValue(); /** - * @see com.idcanet.vasc.core.entry.VascEntryFieldValue#getValue(com.idcanet.vasc.core.VascEntryField, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) */ public Object getValue(VascEntryField field, Object record) throws VascException { if (field==null) { @@ -63,7 +64,7 @@ public class BeanVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see com.idcanet.vasc.core.entry.VascEntryFieldValue#getDisplayValue(com.idcanet.vasc.core.VascEntryField, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getDisplayValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) */ public String getDisplayValue(VascEntryField field, Object record) throws VascException { Object value = getValue(field,record); @@ -88,7 +89,7 @@ public class BeanVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see com.idcanet.vasc.core.entry.VascEntryFieldValue#setValue(com.idcanet.vasc.core.VascEntryField, java.lang.Object, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryFieldValue#setValue(org.x4o.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/com/idcanet/vasc/backends/BeanVascEntryRecordCreator.java b/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryRecordCreator.java similarity index 81% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/BeanVascEntryRecordCreator.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryRecordCreator.java index 9352ee2..f840fb5 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/BeanVascEntryRecordCreator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/BeanVascEntryRecordCreator.java @@ -1,10 +1,11 @@ /** * */ -package com.idcanet.vasc.backends; +package org.x4o.vasc.backends; + +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.entry.VascEntryRecordCreator; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; /** * @author willemc diff --git a/vasc-core/src/main/java/com/idcanet/vasc/backends/MapVascEntryFieldValue.java b/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryFieldValue.java similarity index 63% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/MapVascEntryFieldValue.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryFieldValue.java index 417897d..aa94251 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/MapVascEntryFieldValue.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryFieldValue.java @@ -1,13 +1,14 @@ /** * */ -package com.idcanet.vasc.backends; +package org.x4o.vasc.backends; import java.util.Map; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; +import org.x4o.vasc.core.entry.VascEntryFieldValue; + /** * @author willemc @@ -18,7 +19,7 @@ public class MapVascEntryFieldValue implements VascEntryFieldValue { private static final long serialVersionUID = 1L; /** - * @see com.idcanet.vasc.core.entry.VascEntryFieldValue#getValue(com.idcanet.vasc.core.VascEntryField, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) */ @SuppressWarnings("unchecked") public Object getValue(VascEntryField field, Object record) throws VascException { @@ -31,14 +32,14 @@ public class MapVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see com.idcanet.vasc.core.entry.VascEntryFieldValue#getDisplayValue(com.idcanet.vasc.core.VascEntryField, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getDisplayValue(org.x4o.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 com.idcanet.vasc.core.entry.VascEntryFieldValue#setValue(com.idcanet.vasc.core.VascEntryField, java.lang.Object, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryFieldValue#setValue(org.x4o.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/com/idcanet/vasc/backends/MapVascEntryRecordCreator.java b/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryRecordCreator.java similarity index 74% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/MapVascEntryRecordCreator.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryRecordCreator.java index d6d95fb..82a4a99 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/MapVascEntryRecordCreator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/MapVascEntryRecordCreator.java @@ -1,13 +1,14 @@ /** * */ -package com.idcanet.vasc.backends; +package org.x4o.vasc.backends; import java.util.HashMap; import java.util.Map; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.entry.VascEntryRecordCreator; + /** * @author willemc diff --git a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcConnectionProvider.java b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcConnectionProvider.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcConnectionProvider.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcConnectionProvider.java index 6dbae00..1f77975 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcConnectionProvider.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jdbc; +package org.x4o.vasc.backends.jdbc; import java.sql.Connection; import java.sql.SQLException; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcVascBackend.java b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcVascBackend.java similarity index 80% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcVascBackend.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcVascBackend.java index 4f6b824..b970153 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcVascBackend.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jdbc; +package org.x4o.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 com.idcanet.vasc.backends.MapVascEntryFieldValue; -import com.idcanet.vasc.backends.MapVascEntryRecordCreator; -import com.idcanet.vasc.core.AbstractVascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; +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; + /** * @@ -73,7 +74,7 @@ public class JdbcVascBackend extends AbstractVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ public List execute(VascBackendState state) throws VascException { JdbcConnectionProvider prov = getJdbcConnectionProvider(); @@ -108,33 +109,33 @@ public class JdbcVascBackend extends AbstractVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#merge(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { return object; } /** - * @see com.idcanet.vasc.core.VascBackend#persist(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { } /** - * @see com.idcanet.vasc.core.VascBackend#delete(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryFieldValue(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return new MapVascEntryFieldValue(); } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryRecordCreator(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new MapVascEntryRecordCreator(); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcXpqlVascBackend.java b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcXpqlVascBackend.java similarity index 78% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcXpqlVascBackend.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcXpqlVascBackend.java index 3aa0e53..92d96de 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdbcXpqlVascBackend.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdbcXpqlVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jdbc; +package org.x4o.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 com.idcanet.vasc.backends.MapVascEntryFieldValue; -import com.idcanet.vasc.backends.MapVascEntryRecordCreator; -import com.idcanet.vasc.core.AbstractVascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; -import com.idcanet.vasc.xpql.query.QueryParameterValue; +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; + /** * @@ -54,7 +55,7 @@ public class JdbcXpqlVascBackend extends AbstractVascBackend { private JdbcConnectionProvider jdbcConnectionProvider = null; - private com.idcanet.vasc.xpql.query.Query query = null; + private org.x4o.vasc.xpql.query.Query query = null; /** * @return the JdbcConnectionProvider @@ -73,19 +74,19 @@ public class JdbcXpqlVascBackend extends AbstractVascBackend { /** * @return the query */ - public com.idcanet.vasc.xpql.query.Query getQuery() { + public org.x4o.vasc.xpql.query.Query getQuery() { return query; } /** * @param query the query to set */ - public void setQuery(com.idcanet.vasc.xpql.query.Query query) { + public void setQuery(org.x4o.vasc.xpql.query.Query query) { this.query = query; } /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ public List execute(VascBackendState state) throws VascException { // Copy parameters @@ -131,33 +132,33 @@ public class JdbcXpqlVascBackend extends AbstractVascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#merge(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { return object; } /** - * @see com.idcanet.vasc.core.VascBackend#persist(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { } /** - * @see com.idcanet.vasc.core.VascBackend#delete(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryFieldValue(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return new MapVascEntryFieldValue(); } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryRecordCreator(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return new MapVascEntryRecordCreator(); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java similarity index 96% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java index 74788c6..a443048 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/JdniDataSourceJdbcConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jdbc; +package org.x4o.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 com.idcanet.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() + * @see org.x4o.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() */ public Connection getJdbcConnection() throws SQLException { Connection connection = getDataSource(dataSourceName).getConnection(); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java similarity index 96% rename from vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java rename to vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java index 317477f..1ada6d1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java +++ b/vasc-core/src/main/java/org/x4o/vasc/backends/jdbc/SimpleJdbcConnectionProvider.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.backends.jdbc; +package org.x4o.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 com.idcanet.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() + * @see org.x4o.vasc.backends.jdbc.JdbcConnectionProvider#getJdbcConnection() */ public Connection getJdbcConnection() throws SQLException { if (loadedDriver==false) { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackend.java b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackend.java similarity index 76% rename from vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackend.java rename to vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackend.java index f745a75..af174a6 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackend.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.Map; @@ -39,14 +39,14 @@ abstract public class AbstractVascBackend implements VascBackend { private String id = null; /** - * @see com.idcanet.vasc.core.VascBackend#getId() + * @see org.x4o.vasc.core.VascBackend#getId() */ public String getId() { return id; } /** - * @see com.idcanet.vasc.core.VascBackend#setId(java.lang.String) + * @see org.x4o.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 com.idcanet.vasc.core.VascBackend#isPageable() + * @see org.x4o.vasc.core.VascBackend#isPageable() */ public boolean isPageable() { return false; } /** - * @see com.idcanet.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { return 0; } /** - * @see com.idcanet.vasc.core.VascBackend#isSearchable() + * @see org.x4o.vasc.core.VascBackend#isSearchable() */ public boolean isSearchable() { return false; } /** - * @see com.idcanet.vasc.core.VascBackend#isSortable() + * @see org.x4o.vasc.core.VascBackend#isSortable() */ public boolean isSortable() { return false; } /** - * @see com.idcanet.vasc.core.VascBackend#isRecordMoveable() + * @see org.x4o.vasc.core.VascBackend#isRecordMoveable() */ public boolean isRecordMoveable() { return false; } /** - * @see com.idcanet.vasc.core.VascBackend#doRecordMoveDownById(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#doRecordMoveDownById(java.lang.Object) */ public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { return 0l; } /** - * @see com.idcanet.vasc.core.VascBackend#doRecordMoveUpById(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#doRecordMoveUpById(java.lang.Object) */ public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { return 0l; } /** - * @see com.idcanet.vasc.core.VascBackend#executePageSummary() + * @see org.x4o.vasc.core.VascBackend#executePageSummary() */ public Map executePageSummary() { return null; } /** - * @see com.idcanet.vasc.core.VascBackend#executeTotalSummary() + * @see org.x4o.vasc.core.VascBackend#executeTotalSummary() */ public Map executeTotalSummary() { return null; } /** - * @see com.idcanet.vasc.core.VascBackend#isPageSummary() + * @see org.x4o.vasc.core.VascBackend#isPageSummary() */ public boolean isPageSummary() { return false; } /** - * @see com.idcanet.vasc.core.VascBackend#isTotalSummary() + * @see org.x4o.vasc.core.VascBackend#isTotalSummary() */ public boolean isTotalSummary() { return false; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackendProxy.java b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendProxy.java similarity index 72% rename from vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackendProxy.java rename to vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendProxy.java index 78894d7..29dbb12 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackendProxy.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendProxy.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; +import org.x4o.vasc.core.entry.VascEntryFieldValue; +import org.x4o.vasc.core.entry.VascEntryRecordCreator; + /** * @@ -49,14 +50,14 @@ abstract public class AbstractVascBackendProxy implements VascBackend { } /** - * @see com.idcanet.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ public long fetchTotalExecuteSize(VascBackendState state) { return backend.fetchTotalExecuteSize(state); } /** - * @see com.idcanet.vasc.core.VascBackend#isSortable() + * @see org.x4o.vasc.core.VascBackend#isSortable() */ public boolean isSortable() { return backend.isSortable(); @@ -64,119 +65,119 @@ abstract public class AbstractVascBackendProxy implements VascBackend { /** * @throws Exception - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ public List execute(VascBackendState state) throws VascException { return backend.execute(state); } /** - * @see com.idcanet.vasc.core.VascBackend#delete(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#delete(java.lang.Object) */ public void delete(Object object) throws VascException { backend.delete(object); } /** - * @see com.idcanet.vasc.core.VascBackend#isPageable() + * @see org.x4o.vasc.core.VascBackend#isPageable() */ public boolean isPageable() { return backend.isPageable(); } /** - * @see com.idcanet.vasc.core.VascBackend#isSearchable() + * @see org.x4o.vasc.core.VascBackend#isSearchable() */ public boolean isSearchable() { return backend.isSearchable(); } /** - * @see com.idcanet.vasc.core.VascBackend#merge(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#merge(java.lang.Object) */ public Object merge(Object object) throws VascException { return backend.merge(object); } /** - * @see com.idcanet.vasc.core.VascBackend#persist(java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#persist(java.lang.Object) */ public void persist(Object object) throws VascException { backend.persist(object); } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryFieldValue(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryFieldValue(org.x4o.vasc.core.VascEntryField) */ public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) { return backend.provideVascEntryFieldValue(field); } /** - * @see com.idcanet.vasc.core.VascBackend#provideVascEntryRecordCreator(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascBackend#provideVascEntryRecordCreator(org.x4o.vasc.core.VascEntry) */ public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) { return backend.provideVascEntryRecordCreator(vascEntry); } /** - * @see com.idcanet.vasc.core.VascBackend#getId() + * @see org.x4o.vasc.core.VascBackend#getId() */ public String getId() { return backend.getId(); } /** - * @see com.idcanet.vasc.core.VascBackend#setId(java.lang.String) + * @see org.x4o.vasc.core.VascBackend#setId(java.lang.String) */ public void setId(String id) { backend.setId(id); } /** - * @see com.idcanet.vasc.core.VascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object) */ public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascException { return backend.doRecordMoveDownById(state,primaryId); } /** - * @see com.idcanet.vasc.core.VascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) + * @see org.x4o.vasc.core.VascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object) */ public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascException { return backend.doRecordMoveUpById(state,primaryId); } /** - * @see com.idcanet.vasc.core.VascBackend#isRecordMoveable() + * @see org.x4o.vasc.core.VascBackend#isRecordMoveable() */ public boolean isRecordMoveable() { return backend.isRecordMoveable(); } /** - * @see com.idcanet.vasc.core.VascBackend#executePageSummary() + * @see org.x4o.vasc.core.VascBackend#executePageSummary() */ public Map executePageSummary() { return backend.executePageSummary(); } /** - * @see com.idcanet.vasc.core.VascBackend#executeTotalSummary() + * @see org.x4o.vasc.core.VascBackend#executeTotalSummary() */ public Map executeTotalSummary() { return backend.executeTotalSummary(); } /** - * @see com.idcanet.vasc.core.VascBackend#isPageSummary() + * @see org.x4o.vasc.core.VascBackend#isPageSummary() */ public boolean isPageSummary() { return backend.isPageSummary(); } /** - * @see com.idcanet.vasc.core.VascBackend#isTotalSummary() + * @see org.x4o.vasc.core.VascBackend#isTotalSummary() */ public boolean isTotalSummary() { return backend.isTotalSummary(); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackendState.java b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendState.java similarity index 83% rename from vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackendState.java rename to vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendState.java index e4fc903..1496176 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascBackendState.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascBackendState.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.HashMap; import java.util.Map; @@ -64,70 +64,70 @@ abstract public class AbstractVascBackendState implements VascBackendState { } /** - * @see com.idcanet.vasc.core.VascBackend#getPageIndex() + * @see org.x4o.vasc.core.VascBackend#getPageIndex() */ public int getPageIndex() { return pageIndex; } /** - * @see com.idcanet.vasc.core.VascBackend#setPageIndex(int) + * @see org.x4o.vasc.core.VascBackend#setPageIndex(int) */ public void setPageIndex(int pageIndex) { this.pageIndex=pageIndex; } /** - * @see com.idcanet.vasc.core.VascBackend#getPageSize() + * @see org.x4o.vasc.core.VascBackend#getPageSize() */ public int getPageSize() { return pageSize; } /** - * @see com.idcanet.vasc.core.VascBackend#setPageSize(int) + * @see org.x4o.vasc.core.VascBackend#setPageSize(int) */ public void setPageSize(int pageSize) { this.pageSize=pageSize; } /** - * @see com.idcanet.vasc.core.VascBackend#getSearchString() + * @see org.x4o.vasc.core.VascBackend#getSearchString() */ public String getSearchString() { return searchString; } /** - * @see com.idcanet.vasc.core.VascBackend#setSearchString(java.lang.String) + * @see org.x4o.vasc.core.VascBackend#setSearchString(java.lang.String) */ public void setSearchString(String searchString) { this.searchString=searchString; } /** - * @see com.idcanet.vasc.core.VascBackend#isSortAscending() + * @see org.x4o.vasc.core.VascBackend#isSortAscending() */ public boolean isSortAscending() { return ascending; } /** - * @see com.idcanet.vasc.core.VascBackend#setSortAscending(boolean) + * @see org.x4o.vasc.core.VascBackend#setSortAscending(boolean) */ public void setSortAscending(boolean ascending) { this.ascending=ascending; } /** - * @see com.idcanet.vasc.core.VascBackend#getSortField() + * @see org.x4o.vasc.core.VascBackend#getSortField() */ public String getSortField() { return sortField; } /** - * @see com.idcanet.vasc.core.VascBackend#setSortField(java.lang.String) + * @see org.x4o.vasc.core.VascBackend#setSortField(java.lang.String) */ public void setSortField(String sortField) { this.sortField=sortField; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascEntryFieldType.java b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryFieldType.java similarity index 76% rename from vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascEntryFieldType.java rename to vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryFieldType.java index 1167f14..f5789cd 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascEntryFieldType.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryFieldType.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; -import com.idcanet.vasc.validators.VascValidator; +import org.x4o.vasc.core.ui.VascUIComponent; +import org.x4o.vasc.core.ui.VascValueModel; +import org.x4o.vasc.validators.VascValidator; + /** * @@ -64,35 +65,35 @@ abstract public class AbstractVascEntryFieldType implements VascEntryFieldType { abstract public VascEntryFieldType clone() throws CloneNotSupportedException; /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getId() + * @see org.x4o.vasc.core.VascEntryFieldType#getId() */ public String getId() { return id; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#setId(java.lang.String) + * @see org.x4o.vasc.core.VascEntryFieldType#setId(java.lang.String) */ public void setId(String id) { this.id=id; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getProperty(java.lang.String) + * @see org.x4o.vasc.core.VascEntryFieldType#getProperty(java.lang.String) */ public String getProperty(String name) { return properties.get(name); } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#setProperty(java.lang.String, java.lang.String) + * @see org.x4o.vasc.core.VascEntryFieldType#setProperty(java.lang.String, java.lang.String) */ public void setProperty(String name, String value) { properties.put(name, value); } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getPropertyNames() + * @see org.x4o.vasc.core.VascEntryFieldType#getPropertyNames() */ public List getPropertyNames() { return new ArrayList(properties.keySet()); @@ -113,77 +114,77 @@ abstract public class AbstractVascEntryFieldType implements VascEntryFieldType { } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getVascValidators() + * @see org.x4o.vasc.core.VascEntryFieldType#getVascValidators() */ public List getVascValidators() { return vascValidators; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#addVascValidator(com.idcanet.vasc.validators.VascValidator) + * @see org.x4o.vasc.core.VascEntryFieldType#addVascValidator(org.x4o.vasc.validators.VascValidator) */ public void addVascValidator(VascValidator vascValidator) { vascValidators.add(vascValidator); } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#removeVascValidator(com.idcanet.vasc.validators.VascValidator) + * @see org.x4o.vasc.core.VascEntryFieldType#removeVascValidator(org.x4o.vasc.validators.VascValidator) */ public void removeVascValidator(VascValidator vascValidator) { vascValidators.remove(vascValidator); } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getAutoDetectClass() + * @see org.x4o.vasc.core.VascEntryFieldType#getAutoDetectClass() */ public Class getAutoDetectClass() { return autoDetectClass; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#setAutoDetectClass(java.lang.Class) + * @see org.x4o.vasc.core.VascEntryFieldType#setAutoDetectClass(java.lang.Class) */ public void setAutoDetectClass(Class autoDetectClass) { this.autoDetectClass=autoDetectClass; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getInputMask() + * @see org.x4o.vasc.core.VascEntryFieldType#getInputMask() */ public String getInputMask() { return inputMask; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#setInputMask(java.lang.String) + * @see org.x4o.vasc.core.VascEntryFieldType#setInputMask(java.lang.String) */ public void setInputMask(String inputMask) { this.inputMask=inputMask; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getUIComponentId() + * @see org.x4o.vasc.core.VascEntryFieldType#getUIComponentId() */ public String getUIComponentId() { return uiComponentId; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#setUIComponentId(java.lang.String) + * @see org.x4o.vasc.core.VascEntryFieldType#setUIComponentId(java.lang.String) */ public void setUIComponentId(String uiComponentId) { this.uiComponentId=uiComponentId; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#getUIComponentCount() + * @see org.x4o.vasc.core.VascEntryFieldType#getUIComponentCount() */ public int getUIComponentCount(VascEntryField entryField) throws VascException { return 1; } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#provideEditorUIComponent(int) + * @see org.x4o.vasc.core.VascEntryFieldType#provideEditorUIComponent(int) */ public VascUIComponent provideEditorUIComponent(int index,VascEntryField entryField) throws VascException { ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -198,14 +199,14 @@ abstract public class AbstractVascEntryFieldType implements VascEntryFieldType { } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#provideLabelUIComponent(int) + * @see org.x4o.vasc.core.VascEntryFieldType#provideLabelUIComponent(int) */ public VascUIComponent provideLabelUIComponent(int index,VascEntryField entryField) throws VascException { return entryField.getVascEntry().getVascFrontendData().getVascUIComponent(VascUIComponent.VASC_LABEL); } /** - * @see com.idcanet.vasc.core.VascEntryFieldType#provideEditorVascValueModel() + * @see org.x4o.vasc.core.VascEntryFieldType#provideEditorVascValueModel() */ public VascValueModel provideEditorVascValueModel(int index,VascEntryField entryField) throws VascException { if (index>0) { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascEntryState.java b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryState.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascEntryState.java rename to vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryState.java index cb88124..2f4b6c2 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascEntryState.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascEntryState.java @@ -1,7 +1,7 @@ /** * */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.ArrayList; import java.util.HashMap; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascFrontend.java b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascFrontend.java similarity index 92% rename from vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascFrontend.java rename to vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascFrontend.java index a454753..4d0993b 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/AbstractVascFrontend.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/AbstractVascFrontend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.logging.Logger; @@ -55,7 +55,7 @@ abstract public class AbstractVascFrontend implements VascFrontend { abstract protected void addUiComponents(); /** - * @see com.idcanet.vasc.core.VascFrontend#initEntry(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascFrontend#initEntry(org.x4o.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 com.idcanet.vasc.core.VascFrontend#getId() + * @see org.x4o.vasc.core.VascFrontend#getId() */ public String getId() { return id; } /** - * @see com.idcanet.vasc.core.VascFrontend#setId(java.lang.String) + * @see org.x4o.vasc.core.VascFrontend#setId(java.lang.String) */ public void setId(String id) { this.id=id; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackend.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackend.java similarity index 96% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascBackend.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascBackend.java index 925bf2a..2aba85f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackend.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackend.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; +import org.x4o.vasc.core.entry.VascEntryFieldValue; +import org.x4o.vasc.core.entry.VascEntryRecordCreator; + /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendController.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendController.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendController.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascBackendController.java index 6a05d43..32c8bd1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendControllerLocal.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendControllerLocal.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendControllerLocal.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascBackendControllerLocal.java index 2249590..ae4a761 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendControllerLocal.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendFilter.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendFilter.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendFilter.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascBackendFilter.java index ee4cbd8..4ea5ba9 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendFilter.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendFilter.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendPageNumber.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendPageNumber.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendPageNumber.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascBackendPageNumber.java index c86e947..aea2875 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendPageNumber.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendPageNumber.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendState.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendState.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendState.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascBackendState.java index cb48a78..c8b815e 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascBackendState.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascBackendState.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; import java.util.Set; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascController.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascController.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascController.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascController.java index b202c13..0ccebb5 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntry.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntry.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntry.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntry.java index 1189866..5973167 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntry.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntry.java @@ -24,15 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; import java.util.List; -import com.idcanet.vasc.core.actions.ColumnVascAction; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryFieldEventChannel; +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; + /** * The main vasc entry diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryController.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryController.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryController.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryController.java index 16bd5fe..6004e6a 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryControllerLocal.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryControllerLocal.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryControllerLocal.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryControllerLocal.java index 3c38f4f..8ba252d 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryControllerLocal.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryField.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryField.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryField.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryField.java index b8e9733..348130d 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryField.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryField.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; import java.util.List; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.validators.VascValidator; +import org.x4o.vasc.core.entry.VascEntryFieldValue; +import org.x4o.vasc.validators.VascValidator; + /** * Defines an VascEntryField diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldSet.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldSet.java similarity index 99% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldSet.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldSet.java index 3fce41f..f7023df 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldSet.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldSet.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldType.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldType.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldType.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldType.java index 32698c4..4ecc334 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldType.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldType.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; import java.util.List; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; -import com.idcanet.vasc.validators.VascValidator; +import org.x4o.vasc.core.ui.VascUIComponent; +import org.x4o.vasc.core.ui.VascValueModel; +import org.x4o.vasc.validators.VascValidator; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldTypeController.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeController.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldTypeController.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeController.java index 115067a..2f99530 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldTypeController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldTypeControllerLocal.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeControllerLocal.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldTypeControllerLocal.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeControllerLocal.java index d019818..7f5f2f1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFieldTypeControllerLocal.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFieldTypeControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFinalizer.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFinalizer.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFinalizer.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFinalizer.java index af2f5c5..0d56c6e 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryFinalizer.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryFinalizer.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryState.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryState.java similarity index 99% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryState.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEntryState.java index 04529ad..c1e72f0 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEntryState.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEntryState.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; import java.util.List; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEventChannelController.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelController.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEventChannelController.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelController.java index 58b6dc5..c5dd6e2 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEventChannelController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEventChannelControllerLocal.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelControllerLocal.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascEventChannelControllerLocal.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelControllerLocal.java index 16691c4..4f7d482 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascEventChannelControllerLocal.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascEventChannelControllerLocal.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascException.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascException.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascException.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascException.java index 2a26e34..b9fd1ac 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascException.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascException.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontend.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontend.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontend.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascFrontend.java index 5cf39f8..43c7321 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontend.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontend.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; -import com.idcanet.vasc.core.entry.VascEntryExporter; +import org.x4o.vasc.core.entry.VascEntryExporter; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendData.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendData.java similarity index 92% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendData.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendData.java index 6704322..2352454 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendData.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendData.java @@ -24,15 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; -import com.idcanet.vasc.core.entry.VascEntryFieldValidatorService; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryResourceImageResolver; -import com.idcanet.vasc.core.entry.VascEntryResourceResolver; -import com.idcanet.vasc.core.ui.VascUIComponent; +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; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendExceptionHandler.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendExceptionHandler.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendExceptionHandler.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendExceptionHandler.java index f7810df..9dba6dd 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendExceptionHandler.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendExceptionHandler.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.EventListener; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendHelper.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendHelper.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendHelper.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendHelper.java index 6dacda2..b704895 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascFrontendHelper.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascFrontendHelper.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; +import org.x4o.vasc.core.actions.GlobalVascAction; +import org.x4o.vasc.core.actions.RowVascAction; +import org.x4o.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascLinkEntry.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntry.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascLinkEntry.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntry.java index 53f0441..46f6fb4 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascLinkEntry.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntry.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; import java.util.List; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascLinkEntryType.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntryType.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascLinkEntryType.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntryType.java index 79db136..8e7b09a 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascLinkEntryType.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascLinkEntryType.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.io.Serializable; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/VascUserRoleController.java b/vasc-core/src/main/java/org/x4o/vasc/core/VascUserRoleController.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/VascUserRoleController.java rename to vasc-core/src/main/java/org/x4o/vasc/core/VascUserRoleController.java index 93cca4e..38168cd 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/VascUserRoleController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/VascUserRoleController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core; +package org.x4o.vasc.core; import java.util.List; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/AbstractVascAction.java b/vasc-core/src/main/java/org/x4o/vasc/core/actions/AbstractVascAction.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/actions/AbstractVascAction.java rename to vasc-core/src/main/java/org/x4o/vasc/core/actions/AbstractVascAction.java index d82fe4b..39a5737 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/AbstractVascAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/actions/AbstractVascAction.java @@ -25,7 +25,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.actions; +package org.x4o.vasc.core.actions; /** @@ -64,14 +64,14 @@ abstract public class AbstractVascAction implements VascAction { } /** - * @see com.idcanet.vasc.core.actions.VascAction#getId() + * @see org.x4o.vasc.core.actions.VascAction#getId() */ public String getId() { return id; } /** - * @see com.idcanet.vasc.core.actions.VascAction#setId(java.lang.String) + * @see org.x4o.vasc.core.actions.VascAction#setId(java.lang.String) */ public void setId(String id) { this.id=id; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/ColumnVascAction.java b/vasc-core/src/main/java/org/x4o/vasc/core/actions/ColumnVascAction.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/core/actions/ColumnVascAction.java rename to vasc-core/src/main/java/org/x4o/vasc/core/actions/ColumnVascAction.java index 6f4491d..c92adef 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/ColumnVascAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/actions/ColumnVascAction.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.actions; +package org.x4o.vasc.core.actions; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntryField; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/GlobalVascAction.java b/vasc-core/src/main/java/org/x4o/vasc/core/actions/GlobalVascAction.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/actions/GlobalVascAction.java rename to vasc-core/src/main/java/org/x4o/vasc/core/actions/GlobalVascAction.java index dc33b67..af9e578 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/GlobalVascAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/actions/GlobalVascAction.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.actions; +package org.x4o.vasc.core.actions; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntry; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/RowVascAction.java b/vasc-core/src/main/java/org/x4o/vasc/core/actions/RowVascAction.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/actions/RowVascAction.java rename to vasc-core/src/main/java/org/x4o/vasc/core/actions/RowVascAction.java index 2c4ee09..1bc74bb 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/RowVascAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/actions/RowVascAction.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.actions; +package org.x4o.vasc.core.actions; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntry; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/VascAction.java b/vasc-core/src/main/java/org/x4o/vasc/core/actions/VascAction.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/actions/VascAction.java rename to vasc-core/src/main/java/org/x4o/vasc/core/actions/VascAction.java index 4fd08ec..f07a2f6 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/actions/VascAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/actions/VascAction.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.actions; +package org.x4o.vasc.core.actions; import java.io.Serializable; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryBackendEventListener.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryBackendEventListener.java similarity index 96% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryBackendEventListener.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryBackendEventListener.java index bbfc18d..8c23873 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryBackendEventListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryBackendEventListener.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; import java.io.Serializable; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntry; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryExporter.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryExporter.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryExporter.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryExporter.java index 40e9f88..d13f46e 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryExporter.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryExporter.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; import java.io.OutputStream; import java.io.Serializable; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascException; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldEventChannel.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldEventChannel.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldEventChannel.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldEventChannel.java index 840978d..82d5ca0 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldEventChannel.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldEventChannel.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; import java.io.Serializable; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldValidatorService.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValidatorService.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldValidatorService.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValidatorService.java index 753a6de..e62c3eb 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldValidatorService.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValidatorService.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; import java.util.List; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldValue.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValue.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldValue.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValue.java index c595180..ce94545 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFieldValue.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFieldValue.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; import java.io.Serializable; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; + /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFrontendEventListener.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFrontendEventListener.java similarity index 96% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFrontendEventListener.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFrontendEventListener.java index b8ba926..ec7509c 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryFrontendEventListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryFrontendEventListener.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; import java.io.Serializable; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntry; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryRecordCreator.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryRecordCreator.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryRecordCreator.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryRecordCreator.java index 8774718..d2d2f21 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryRecordCreator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryRecordCreator.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; import java.io.Serializable; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntry; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryResourceImageResolver.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceImageResolver.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryResourceImageResolver.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceImageResolver.java index d59e77b..41ee396 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryResourceImageResolver.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceImageResolver.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntry; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryResourceResolver.java b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceResolver.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryResourceResolver.java rename to vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceResolver.java index 737a90c..e0c0962 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/entry/VascEntryResourceResolver.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/entry/VascEntryResourceResolver.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.entry; +package org.x4o.vasc.core.entry; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascColumnValueModelListener.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascColumnValueModelListener.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascColumnValueModelListener.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascColumnValueModelListener.java index 67f5e85..c3136be 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascColumnValueModelListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascColumnValueModelListener.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascOptionValueModelListener.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascOptionValueModelListener.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascOptionValueModelListener.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascOptionValueModelListener.java index deb7471..3545990 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascOptionValueModelListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascOptionValueModelListener.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascSelectItem.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItem.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascSelectItem.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItem.java index e15e079..4dee337 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascSelectItem.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItem.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascSelectItemModel.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItemModel.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascSelectItemModel.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItemModel.java index 2dc52bc..22ec98c 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascSelectItemModel.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascSelectItemModel.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; import java.io.Serializable; import java.util.List; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascException; + /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIActionComponent.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponent.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIActionComponent.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponent.java index ade93be..97c210c 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIActionComponent.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponent.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIActionComponentListener.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponentListener.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIActionComponentListener.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponentListener.java index 49ffaf5..3476889 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIActionComponentListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIActionComponentListener.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIComponent.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIComponent.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIComponent.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIComponent.java index 4aace44..969aba1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascUIComponent.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascUIComponent.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascValueModel.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModel.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascValueModel.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModel.java index adc5ddb..9cd77e7 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascValueModel.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModel.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascException; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascValueModelListener.java b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModelListener.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascValueModelListener.java rename to vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModelListener.java index d5ab5ee..3195582 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/core/ui/VascValueModelListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/core/ui/VascValueModelListener.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.core.ui; +package org.x4o.vasc.core.ui; import java.util.EventListener; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascException; + diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackedEntryFinalizer.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackedEntryFinalizer.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackedEntryFinalizer.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackedEntryFinalizer.java index 0f816ec..6a2ee49 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackedEntryFinalizer.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackedEntryFinalizer.java @@ -24,22 +24,23 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.Collections; import java.util.Comparator; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFieldSet; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.vasc.core.VascEntryFinalizer; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.VascLinkEntryType; -import com.idcanet.vasc.core.actions.VascAction; +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; + /** * Checks for minimal needed stuff @@ -52,7 +53,7 @@ import com.idcanet.vasc.core.actions.VascAction; public class DefaultVascBackedEntryFinalizer implements VascEntryFinalizer { /** - * @see com.idcanet.vasc.core.VascEntryFinalizer#finalizeVascEntry(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascEntryFinalizer#finalizeVascEntry(org.x4o.vasc.core.VascEntry) */ public VascEntry finalizeVascEntry(VascEntry entry,VascController vascController) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackendController.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendController.java similarity index 91% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackendController.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendController.java index 97b9db8..8d0d9aa 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackendController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendController.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.HashMap; import java.util.Map; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendControllerLocal; +import org.x4o.vasc.core.VascBackend; +import org.x4o.vasc.core.VascBackendControllerLocal; + /** * @@ -47,7 +48,7 @@ public class DefaultVascBackendController implements VascBackendControllerLocal } /** - * @see com.idcanet.vasc.core.VascBackendController#getVascBackendById(java.lang.String) + * @see org.x4o.vasc.core.VascBackendController#getVascBackendById(java.lang.String) */ public VascBackend getVascBackendById(String id) { return backends.get(id); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackendState.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendState.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackendState.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendState.java index cbe03c4..4e241d4 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascBackendState.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascBackendState.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; -import com.idcanet.vasc.core.AbstractVascBackendState; +import org.x4o.vasc.core.AbstractVascBackendState; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascController.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascController.java similarity index 91% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascController.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascController.java index 972924d..0037e64 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascController.java @@ -24,14 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; -import com.idcanet.vasc.core.VascBackendController; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntryController; -import com.idcanet.vasc.core.VascEntryFieldTypeController; -import com.idcanet.vasc.core.VascEventChannelController; -import com.idcanet.vasc.core.VascUserRoleController; +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; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntry.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntry.java similarity index 95% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntry.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntry.java index fe2d1b5..63659f3 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntry.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntry.java @@ -24,24 +24,25 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.VascBackendFilter; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFieldSet; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.actions.ColumnVascAction; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.actions.VascAction; -import com.idcanet.vasc.core.entry.VascEntryFieldEventChannel; +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; + /** * VascEntry @@ -464,7 +465,7 @@ public class DefaultVascEntry implements VascEntry { } /** - * @see com.idcanet.vasc.core.VascEntry#getVascEntryFieldById(java.lang.String) + * @see org.x4o.vasc.core.VascEntry#getVascEntryFieldById(java.lang.String) */ public VascEntryField getVascEntryFieldById(String id) { for (VascEntryField v:vascFields) { @@ -641,21 +642,21 @@ public class DefaultVascEntry implements VascEntry { } /** - * @see com.idcanet.vasc.core.VascEntry#getEntryParameter(java.lang.String) + * @see org.x4o.vasc.core.VascEntry#getEntryParameter(java.lang.String) */ public Object getEntryParameter(String key) { return entryParameters.get(key); } /** - * @see com.idcanet.vasc.core.VascEntry#getEntryParameterKeys() + * @see org.x4o.vasc.core.VascEntry#getEntryParameterKeys() */ public List getEntryParameterKeys() { return new ArrayList(entryParameters.keySet()); } /** - * @see com.idcanet.vasc.core.VascEntry#setEntryParameter(java.lang.String, java.lang.Object) + * @see org.x4o.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/com/idcanet/vasc/impl/DefaultVascEntryController.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryController.java similarity index 89% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryController.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryController.java index 54e9620..93022a3 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.Collections; @@ -32,10 +32,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryControllerLocal; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascController; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntryControllerLocal; +import org.x4o.vasc.core.VascException; + /** * @@ -58,7 +59,7 @@ public class DefaultVascEntryController implements VascEntryControllerLocal { } /** - * @see com.idcanet.vasc.core.VascEntryController#getVascEntryById(java.lang.String) + * @see org.x4o.vasc.core.VascEntryController#getVascEntryById(java.lang.String) */ public VascEntry getVascEntryById(String id) { VascEntry entry = entries.get(id); @@ -79,7 +80,7 @@ public class DefaultVascEntryController implements VascEntryControllerLocal { } /** - * @see com.idcanet.vasc.core.VascEntryController#getVascEntryIds() + * @see org.x4o.vasc.core.VascEntryController#getVascEntryIds() */ public List getVascEntryIds() { List result = new ArrayList(entries.keySet()); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryField.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryField.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryField.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryField.java index 081da97..3e7f061 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryField.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryField.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.validators.VascValidator; +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; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryFieldSet.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryFieldSet.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryFieldSet.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryFieldSet.java index fbd1b06..5b0ea73 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryFieldSet.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryFieldSet.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.VascEntryFieldSet; +import org.x4o.vasc.core.VascEntryFieldSet; + /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryState.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryState.java similarity index 73% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryState.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryState.java index 529579d..bfb8dcf 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascEntryState.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascEntryState.java @@ -1,9 +1,9 @@ /** * */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; -import com.idcanet.vasc.core.AbstractVascEntryState; +import org.x4o.vasc.core.AbstractVascEntryState; /** * Holds all state values diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFactory.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFactory.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFactory.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFactory.java index 78a451d..8a62a5d 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFactory.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFactory.java @@ -24,20 +24,21 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.Locale; import java.util.ResourceBundle; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendFilter; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.impl.entry.DefaultVascEntryResourceResolver; -import com.idcanet.vasc.impl.entry.VascValidatorsValidatorService; -import com.idcanet.vasc.impl.type.DefaultVascEntryFieldTypeController; +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; + /** * Default Vasc Factory for creating some base object plumming for vasc useage. diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendData.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendData.java similarity index 83% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendData.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendData.java index b552ade..22f3c90 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendData.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendData.java @@ -24,31 +24,32 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFinalizer; -import com.idcanet.vasc.core.VascEntryState; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontend; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.VascFrontendHelper; -import com.idcanet.vasc.core.actions.ColumnVascAction; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.actions.VascAction; -import com.idcanet.vasc.core.entry.VascEntryFieldValidatorService; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryResourceImageResolver; -import com.idcanet.vasc.core.entry.VascEntryResourceResolver; -import com.idcanet.vasc.core.ui.VascUIComponent; +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; + /** * @@ -95,14 +96,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see com.idcanet.vasc.core.VascBackendData#getVascEntryFinalizer() + * @see org.x4o.vasc.core.VascBackendData#getVascEntryFinalizer() */ public VascEntryFinalizer getVascEntryFinalizer() { return vascEntryFinalizer; } /** - * @see com.idcanet.vasc.core.VascBackendData#setVascEntryFinalizer(com.idcanet.vasc.core.VascEntryFinalizer) + * @see org.x4o.vasc.core.VascBackendData#setVascEntryFinalizer(org.x4o.vasc.core.VascEntryFinalizer) */ public void setVascEntryFinalizer(VascEntryFinalizer vascEntryFinalizer) { this.vascEntryFinalizer=vascEntryFinalizer; @@ -160,14 +161,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see com.idcanet.vasc.core.VascFrontendData#getVascUIComponent(java.lang.String) + * @see org.x4o.vasc.core.VascFrontendData#getVascUIComponent(java.lang.String) */ public String getVascUIComponentClass(String rendererId) { return uiComponents.get(rendererId); } /** - * @see com.idcanet.vasc.core.VascFrontendData#putVascUIComponent(java.lang.String, java.lang.String) + * @see org.x4o.vasc.core.VascFrontendData#putVascUIComponent(java.lang.String, java.lang.String) */ public void putVascUIComponent(String rendererId, String uiComponentClass) { uiComponents.put(rendererId, uiComponentClass); @@ -188,7 +189,7 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see com.idcanet.vasc.core.VascFrontendData#addFieldVascUIComponents(com.idcanet.vasc.core.VascEntryField, com.idcanet.vasc.core.ui.VascUIComponent, java.lang.Object) + * @see org.x4o.vasc.core.VascFrontendData#addFieldVascUIComponents(org.x4o.vasc.core.VascEntryField, org.x4o.vasc.core.ui.VascUIComponent, java.lang.Object) */ public void addFieldVascUIComponents(VascEntryField field,VascUIComponent uiComponent, Object editor) { fieldComps.put(field, uiComponent); @@ -201,14 +202,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see com.idcanet.vasc.core.VascFrontendData#getFieldRealRenderer(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascFrontendData#getFieldRealRenderer(org.x4o.vasc.core.VascEntryField) */ public Object getFieldRealRenderer(VascEntryField field) { return fieldEditors.get(field); } /** - * @see com.idcanet.vasc.core.VascFrontendData#getFieldVascUIComponent(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascFrontendData#getFieldVascUIComponent(org.x4o.vasc.core.VascEntryField) */ public VascUIComponent getFieldVascUIComponent(VascEntryField field) { return fieldComps.get(field); @@ -229,14 +230,14 @@ public class DefaultVascFrontendData implements VascFrontendData { } /** - * @see com.idcanet.vasc.core.VascFrontendData#addVascValidatorService(com.idcanet.vasc.core.entry.VascEntryFieldValidatorService) + * @see org.x4o.vasc.core.VascFrontendData#addVascValidatorService(org.x4o.vasc.core.entry.VascEntryFieldValidatorService) */ public void addVascValidatorService(VascEntryFieldValidatorService validatorService) { validatorServices.add(validatorService); } /** - * @see com.idcanet.vasc.core.VascFrontendData#getVascValidatorServices() + * @see org.x4o.vasc.core.VascFrontendData#getVascValidatorServices() */ public List getVascValidatorServices() { return validatorServices; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendEntryFinalizer.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendEntryFinalizer.java similarity index 85% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendEntryFinalizer.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendEntryFinalizer.java index 7665da2..8141af2 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendEntryFinalizer.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendEntryFinalizer.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryFinalizer; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascController; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntryFinalizer; +import org.x4o.vasc.core.VascException; /** @@ -40,7 +40,7 @@ import com.idcanet.vasc.core.VascException; public class DefaultVascFrontendEntryFinalizer implements VascEntryFinalizer { /** - * @see com.idcanet.vasc.core.VascEntryFinalizer#finalizeVascEntry(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascEntryFinalizer#finalizeVascEntry(org.x4o.vasc.core.VascEntry) */ public VascEntry finalizeVascEntry(VascEntry entry,VascController vascController) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendHelper.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendHelper.java similarity index 88% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendHelper.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendHelper.java index f0aee14..5060145 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascFrontendHelper.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascFrontendHelper.java @@ -24,29 +24,30 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.logging.Logger; -import com.idcanet.vasc.core.VascBackendFilter; -import com.idcanet.vasc.core.VascBackendPageNumber; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontendHelper; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.VascLinkEntryType; -import com.idcanet.vasc.core.VascUserRoleController; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryFieldValidatorService; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import com.idcanet.vasc.core.ui.VascUIComponent; +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; + /** * @@ -58,7 +59,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { private Logger logger = Logger.getLogger(DefaultVascFrontendHelper.class.getName()); /** - * @see com.idcanet.vasc.core.VascFrontendHelper#renderView(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascFrontendHelper#renderView(org.x4o.vasc.core.VascEntryField) */ public boolean renderView(VascEntryField field) { if (field.getView()==false) { @@ -68,7 +69,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#renderCreate(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascFrontendHelper#renderCreate(org.x4o.vasc.core.VascEntryField) */ public boolean renderCreate(VascEntryField field) { if (renderView(field)==false) { @@ -85,7 +86,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#renderEdit(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascFrontendHelper#renderEdit(org.x4o.vasc.core.VascEntryField) */ public boolean renderEdit(VascEntryField field) { if (renderView(field)==false) { @@ -107,7 +108,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#renderEditReadOnly(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascFrontendHelper#renderEditReadOnly(org.x4o.vasc.core.VascEntryField) */ public boolean renderEditReadOnly(VascEntryField field) { if (renderView(field)==false) { @@ -124,7 +125,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#renderList(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.VascFrontendHelper#renderList(org.x4o.vasc.core.VascEntryField) */ public boolean renderList(VascEntryField field) { if (renderView(field)==false) { @@ -141,21 +142,21 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#renderGlobalVascAction(com.idcanet.vasc.core.actions.GlobalVascAction) + * @see org.x4o.vasc.core.VascFrontendHelper#renderGlobalVascAction(org.x4o.vasc.core.actions.GlobalVascAction) */ public boolean renderGlobalVascAction(GlobalVascAction action) { return true; } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#renderRowVascAction(com.idcanet.vasc.core.actions.RowVascAction) + * @see org.x4o.vasc.core.VascFrontendHelper#renderRowVascAction(org.x4o.vasc.core.actions.RowVascAction) */ public boolean renderRowVascAction(RowVascAction action) { return true; } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#fireVascEvent(com.idcanet.vasc.core.entry.VascEntryEventListener.VascEventType, java.lang.Object) + * @see org.x4o.vasc.core.VascFrontendHelper#fireVascEvent(org.x4o.vasc.core.entry.VascEntryEventListener.VascEventType, java.lang.Object) */ public void fireVascEvent(VascEntry entry,VascFrontendEventType type, Object data) { List list = entry.getVascFrontendData().getVascEntryFrontendEventListener(type); @@ -165,7 +166,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#getTotalColumnsWidth(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascFrontendHelper#getTotalColumnsWidth(org.x4o.vasc.core.VascEntry) */ public Integer getTotalColumnsWidth(VascEntry entry) { int result = 0; @@ -219,14 +220,14 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#handleException(com.idcanet.vasc.core.VascEntry,java.lang.Exception) + * @see org.x4o.vasc.core.VascFrontendHelper#handleException(org.x4o.vasc.core.VascEntry,java.lang.Exception) */ public void handleException(VascEntry entry,Exception exception) { fireVascEvent(entry,VascFrontendEventType.EXCEPTION , exception); } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#initEditObject(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascFrontendHelper#initEditObject(org.x4o.vasc.core.VascEntry) */ public Object createObject(VascEntry entry) { try { @@ -296,7 +297,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#mergeObject(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascFrontendHelper#mergeObject(org.x4o.vasc.core.VascEntry) */ public Object mergeObject(VascEntry entry) { Object object = entry.getVascFrontendData().getVascEntryState().getEntryDataObject(); @@ -342,7 +343,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#refreshData(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascFrontendHelper#refreshData(org.x4o.vasc.core.VascEntry) */ public void refreshData(VascEntry entry) { fireVascEvent(entry,VascEntryFrontendEventListener.VascFrontendEventType.PRE_READ, null); @@ -373,7 +374,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } /** - * @see com.idcanet.vasc.core.VascFrontendHelper#validateObjectField(com.idcanet.vasc.core.VascEntryField, java.lang.Object) + * @see org.x4o.vasc.core.VascFrontendHelper#validateObjectField(org.x4o.vasc.core.VascEntryField, java.lang.Object) */ public List validateObjectField(VascEntryField field) { if (field==null) { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascLinkEntry.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascLinkEntry.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascLinkEntry.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascLinkEntry.java index d1eaa02..b4d1981 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascLinkEntry.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascLinkEntry.java @@ -24,15 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.VascLinkEntryType; +import org.x4o.vasc.core.VascLinkEntry; +import org.x4o.vasc.core.VascLinkEntryType; + /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascSelectItemModel.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascSelectItemModel.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascSelectItemModel.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascSelectItemModel.java index ff640e1..0b7b677 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascSelectItemModel.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascSelectItemModel.java @@ -24,21 +24,22 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.ui.VascSelectItem; -import com.idcanet.vasc.core.ui.VascSelectItemModel; +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; + /** @@ -60,7 +61,7 @@ public class DefaultVascSelectItemModel implements VascSelectItemModel { private Boolean useParentFields = null; /** - * @see com.idcanet.vasc.core.ui.VascSelectItemModel#getVascSelectItems(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.ui.VascSelectItemModel#getVascSelectItems(org.x4o.vasc.core.VascEntry) */ public List getVascSelectItems(VascEntry currentEntry) throws VascException { List result = new ArrayList(100); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascUserRoleController.java b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascUserRoleController.java similarity index 88% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascUserRoleController.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascUserRoleController.java index 631c303..b8108f4 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/DefaultVascUserRoleController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/DefaultVascUserRoleController.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.VascUserRoleController; +import org.x4o.vasc.core.VascUserRoleController; + /** * Simple default user controller for wrapping user info into vasc @@ -66,28 +67,28 @@ public class DefaultVascUserRoleController implements VascUserRoleController { /** - * @see com.idcanet.vasc.core.VascUserRoleController#getUserId() + * @see org.x4o.vasc.core.VascUserRoleController#getUserId() */ public Long getUserId() { return userId; } /** - * @see com.idcanet.vasc.core.VascUserRoleController#getUserName() + * @see org.x4o.vasc.core.VascUserRoleController#getUserName() */ public String getUserName() { return userName; } /** - * @see com.idcanet.vasc.core.VascUserRoleController#getUserRoles() + * @see org.x4o.vasc.core.VascUserRoleController#getUserRoles() */ public List getUserRoles() { return userRoles; } /** - * @see com.idcanet.vasc.core.VascUserRoleController#hasRole(java.lang.String) + * @see org.x4o.vasc.core.VascUserRoleController#hasRole(java.lang.String) */ public boolean hasRole(String roles) { if (roles==null) { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyCache.java b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyCache.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyCache.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyCache.java index 544ecb9..28c5bad 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyCache.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyCache.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.AbstractVascBackendProxy; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; +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; + /** * Does simple caching for the data. @@ -81,7 +82,7 @@ public class VascBackendProxyCache extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyEventExecutor.java b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyEventExecutor.java similarity index 81% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyEventExecutor.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyEventExecutor.java index 68c44b0..b660cdd 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyEventExecutor.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyEventExecutor.java @@ -24,18 +24,19 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.AbstractVascBackendProxy; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryBackendEventListener; -import com.idcanet.vasc.core.entry.VascEntryBackendEventListener.VascBackendEventType; +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; + /** @@ -94,7 +95,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) */ @Override public void delete(Object object) throws VascException { @@ -104,7 +105,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(com.idcanet.vasc.core.VascBackendState, java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(org.x4o.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state, Object primaryId) throws VascException { @@ -115,7 +116,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(com.idcanet.vasc.core.VascBackendState, java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(org.x4o.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state, Object primaryId) throws VascException { @@ -126,7 +127,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#execute(com.idcanet.vasc.core.VascBackendState) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#execute(org.x4o.vasc.core.VascBackendState) */ @Override public List execute(VascBackendState state) throws VascException { @@ -137,7 +138,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#fetchTotalExecuteSize(com.idcanet.vasc.core.VascBackendState) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#fetchTotalExecuteSize(org.x4o.vasc.core.VascBackendState) */ @Override public long fetchTotalExecuteSize(VascBackendState state) { @@ -148,7 +149,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) */ @Override public Object merge(Object object) throws VascException { @@ -159,7 +160,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) */ @Override public void persist(Object object) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyFilter.java b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyFilter.java similarity index 86% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyFilter.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyFilter.java index cd81f95..ef7f8fd 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyFilter.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyFilter.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.AbstractVascBackendProxy; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendFilter; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; +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; + /** @@ -54,7 +55,7 @@ public class VascBackendProxyFilter extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyPaged.java b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyPaged.java similarity index 87% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyPaged.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyPaged.java index 34abc50..0df7dde 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyPaged.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyPaged.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.ArrayList; import java.util.List; -import com.idcanet.vasc.core.AbstractVascBackendProxy; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; +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; + /** @@ -51,7 +52,7 @@ public class VascBackendProxyPaged extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.VascBackend#isPageable() + * @see org.x4o.vasc.core.VascBackend#isPageable() */ @Override public boolean isPageable() { @@ -59,7 +60,7 @@ public class VascBackendProxyPaged extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxySearch.java b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySearch.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxySearch.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySearch.java index 32fcac3..e10499a 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxySearch.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySearch.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.lang.reflect.Method; import java.util.ArrayList; @@ -33,11 +33,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.idcanet.vasc.core.AbstractVascBackendProxy; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; +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; + /** @@ -55,7 +56,7 @@ public class VascBackendProxySearch extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.VascBackend#isSearchable() + * @see org.x4o.vasc.core.VascBackend#isSearchable() */ @Override public boolean isSearchable() { @@ -63,7 +64,7 @@ public class VascBackendProxySearch extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxySort.java b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySort.java similarity index 89% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxySort.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySort.java index 76df4d2..3d0f4c8 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxySort.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxySort.java @@ -24,19 +24,20 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.Collections; import java.util.Comparator; import java.util.List; -import com.idcanet.vasc.core.AbstractVascBackendProxy; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; +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; + /** @@ -57,7 +58,7 @@ public class VascBackendProxySort extends AbstractVascBackendProxy { // sort stuff /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ @SuppressWarnings("unchecked") @Override diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyTimerLogger.java b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyTimerLogger.java similarity index 84% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyTimerLogger.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyTimerLogger.java index 7da3430..6680d8f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/VascBackendProxyTimerLogger.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/VascBackendProxyTimerLogger.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl; +package org.x4o.vasc.impl; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import com.idcanet.vasc.core.AbstractVascBackendProxy; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascException; +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; + /** * Does simple caching for the data. @@ -53,7 +54,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.VascBackend#execute(VascBackendState state) + * @see org.x4o.vasc.core.VascBackend#execute(VascBackendState state) */ @Override public List execute(VascBackendState state) throws VascException { @@ -78,7 +79,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(com.idcanet.vasc.core.VascBackendState, java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveDownById(org.x4o.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveDownById(VascBackendState state, Object primaryId) throws VascException { @@ -92,7 +93,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(com.idcanet.vasc.core.VascBackendState, java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#doRecordMoveUpById(org.x4o.vasc.core.VascBackendState, java.lang.Object) */ @Override public long doRecordMoveUpById(VascBackendState state, Object primaryId) throws VascException { @@ -106,7 +107,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#delete(java.lang.Object) */ @Override public void delete(Object object) throws VascException { @@ -120,7 +121,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#merge(java.lang.Object) */ @Override public Object merge(Object object) throws VascException { @@ -134,7 +135,7 @@ public class VascBackendProxyTimerLogger extends AbstractVascBackendProxy { } /** - * @see com.idcanet.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) + * @see org.x4o.vasc.core.AbstractVascBackendProxy#persist(java.lang.Object) */ @Override public void persist(Object object) throws VascException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/AddRowAction.java b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/AddRowAction.java similarity index 89% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/actions/AddRowAction.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/actions/AddRowAction.java index b8027cd..a206e3f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/AddRowAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/AddRowAction.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.actions; +package org.x4o.vasc.impl.actions; + +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.actions.AbstractVascAction; +import org.x4o.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.actions.AbstractVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; /** * @@ -53,7 +54,7 @@ public class AddRowAction extends AbstractVascAction implements RowVascAction { } /** - * @see com.idcanet.vasc.core.actions.RowVascAction#isMultiRowAction() + * @see org.x4o.vasc.core.actions.RowVascAction#isMultiRowAction() */ public boolean isMultiRowAction() { return false; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/CSVExportGlobalAction.java b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/CSVExportGlobalAction.java similarity index 91% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/actions/CSVExportGlobalAction.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/actions/CSVExportGlobalAction.java index fa49e9f..d76820e 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/CSVExportGlobalAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/CSVExportGlobalAction.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.actions; +package org.x4o.vasc.impl.actions; import java.io.OutputStream; import java.io.PrintWriter; -import com.idcanet.vasc.core.entry.VascEntryExporter; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.actions.AbstractVascAction; -import com.idcanet.vasc.core.actions.GlobalVascAction; +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; + /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/DeleteRowAction.java b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/DeleteRowAction.java similarity index 89% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/actions/DeleteRowAction.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/actions/DeleteRowAction.java index 7b0e09d..001282b 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/DeleteRowAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/DeleteRowAction.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.actions; +package org.x4o.vasc.impl.actions; + +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.actions.AbstractVascAction; +import org.x4o.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.actions.AbstractVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; /** * @@ -53,7 +54,7 @@ public class DeleteRowAction extends AbstractVascAction implements RowVascAction } /** - * @see com.idcanet.vasc.core.actions.RowVascAction#isMultiRowAction() + * @see org.x4o.vasc.core.actions.RowVascAction#isMultiRowAction() */ public boolean isMultiRowAction() { return true; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/EditRowAction.java b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/EditRowAction.java similarity index 87% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/actions/EditRowAction.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/actions/EditRowAction.java index 4aae191..e726f41 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/EditRowAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/EditRowAction.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.actions; +package org.x4o.vasc.impl.actions; + +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; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.actions.AbstractVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; /** * @@ -58,7 +59,7 @@ public class EditRowAction extends AbstractVascAction implements RowVascAction { /** - * @see com.idcanet.vasc.core.actions.RowVascAction#isMultiRowAction() + * @see org.x4o.vasc.core.actions.RowVascAction#isMultiRowAction() */ public boolean isMultiRowAction() { return false; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/RefreshDataGlobalAction.java b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/RefreshDataGlobalAction.java similarity index 91% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/actions/RefreshDataGlobalAction.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/actions/RefreshDataGlobalAction.java index 3afe54d..e76cc73 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/RefreshDataGlobalAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/RefreshDataGlobalAction.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.actions; +package org.x4o.vasc.impl.actions; + +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.actions.AbstractVascAction; +import org.x4o.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.actions.AbstractVascAction; -import com.idcanet.vasc.core.actions.GlobalVascAction; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/XMLExportGlobalAction.java b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/XMLExportGlobalAction.java similarity index 91% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/actions/XMLExportGlobalAction.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/actions/XMLExportGlobalAction.java index ca9d1ec..fc62338 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/actions/XMLExportGlobalAction.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/actions/XMLExportGlobalAction.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.actions; +package org.x4o.vasc.impl.actions; import java.io.OutputStream; import java.io.PrintWriter; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.actions.AbstractVascAction; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.entry.VascEntryExporter; +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; + /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java similarity index 82% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java index ea047dc..edec9a9 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanPropertyVascEntryFieldValue.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.entry; +package org.x4o.vasc.impl.entry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.x4o.impl.DefaultElementObjectPropertyValue; + +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascException; +import org.x4o.vasc.core.entry.VascEntryFieldValue; +import org.x4o.xml.impl.DefaultElementObjectPropertyValue; /** * @@ -52,7 +53,7 @@ public class BeanPropertyVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see com.idcanet.vasc.core.column.VascColumnValue#getValue(com.idcanet.vasc.core.column.VascTableColumn, java.lang.Object) + * @see org.x4o.vasc.core.column.VascColumnValue#getValue(org.x4o.vasc.core.column.VascTableColumn, java.lang.Object) */ public Object getValue(VascEntryField column,Object record) throws VascException { if(getProperty()==null) { @@ -69,14 +70,14 @@ public class BeanPropertyVascEntryFieldValue implements VascEntryFieldValue { } /** - * @see com.idcanet.vasc.core.entry.VascEntryFieldValue#getDisplayValue(com.idcanet.vasc.core.VascEntryField, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryFieldValue#getDisplayValue(org.x4o.vasc.core.VascEntryField, java.lang.Object) */ public String getDisplayValue(VascEntryField field, Object record) throws VascException { return ""+getValue(field,record); // not supported } /** - * @see com.idcanet.vasc.core.column.VascColumnValue#setValue(com.idcanet.vasc.core.column.VascTableColumn, java.lang.Object, java.lang.Object) + * @see org.x4o.vasc.core.column.VascColumnValue#setValue(org.x4o.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/com/idcanet/vasc/impl/entry/BeanVascEntryRecordCreator.java b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanVascEntryRecordCreator.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/entry/BeanVascEntryRecordCreator.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanVascEntryRecordCreator.java index b84a063..2631ca8 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/BeanVascEntryRecordCreator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/BeanVascEntryRecordCreator.java @@ -24,10 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.entry; +package org.x4o.vasc.impl.entry; + +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.entry.VascEntryRecordCreator; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/DefaultVascEntryResourceResolver.java b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/DefaultVascEntryResourceResolver.java similarity index 96% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/entry/DefaultVascEntryResourceResolver.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/entry/DefaultVascEntryResourceResolver.java index d1dd66a..e1a90dc 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/DefaultVascEntryResourceResolver.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/DefaultVascEntryResourceResolver.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.entry; +package org.x4o.vasc.impl.entry; import java.text.MessageFormat; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.idcanet.vasc.core.entry.VascEntryResourceResolver; +import org.x4o.vasc.core.entry.VascEntryResourceResolver; + /** * diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/HibernateValidatorService.java b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/HibernateValidatorService.java similarity index 96% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/entry/HibernateValidatorService.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/entry/HibernateValidatorService.java index 402c21f..1d5af5b 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/HibernateValidatorService.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/HibernateValidatorService.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.entry; +package org.x4o.vasc.impl.entry; import java.io.Serializable; import java.lang.annotation.Annotation; @@ -42,11 +42,11 @@ 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; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValidatorService; /** * Executes the hibernate field validators diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/PersistanceValidatorService.java b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/PersistanceValidatorService.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/entry/PersistanceValidatorService.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/entry/PersistanceValidatorService.java index a9d6ce6..b2c1bdb 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/PersistanceValidatorService.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/PersistanceValidatorService.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.entry; +package org.x4o.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 com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValidatorService; -import com.idcanet.vasc.validators.VascObjectNotNullValidator; -import com.idcanet.vasc.validators.VascStringLengthValidator; -import com.idcanet.vasc.validators.VascValidator; -import com.idcanet.vasc.validators.VascValidatorMessages; +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; + /** * Scans for JPA annotations and wrap some items aroud in a vasc validator. diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/SetParameterBackendListener.java b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/SetParameterBackendListener.java similarity index 85% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/entry/SetParameterBackendListener.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/entry/SetParameterBackendListener.java index 64f2dd2..32ce67f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/SetParameterBackendListener.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/SetParameterBackendListener.java @@ -1,8 +1,9 @@ -package com.idcanet.vasc.impl.entry; +package org.x4o.vasc.impl.entry; + +import org.x4o.vasc.core.VascBackendState; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.entry.VascEntryBackendEventListener; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.entry.VascEntryBackendEventListener; public class SetParameterBackendListener implements VascEntryBackendEventListener { @@ -26,7 +27,7 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene } /** - * @see com.idcanet.vasc.core.entry.VascEntryBackendEventListener#getEventType() + * @see org.x4o.vasc.core.entry.VascEntryBackendEventListener#getEventType() */ public VascBackendEventType[] getEventTypes() { return new VascBackendEventType[] { @@ -41,7 +42,7 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene } /** - * @see com.idcanet.vasc.core.entry.VascEntryBackendEventListener#vascEvent(com.idcanet.vasc.core.VascEntry, java.lang.Object) + * @see org.x4o.vasc.core.entry.VascEntryBackendEventListener#vascEvent(org.x4o.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/com/idcanet/vasc/impl/entry/VascValidatorsValidatorService.java b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/VascValidatorsValidatorService.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/entry/VascValidatorsValidatorService.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/entry/VascValidatorsValidatorService.java index 2b41f2f..3638b85 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/VascValidatorsValidatorService.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/entry/VascValidatorsValidatorService.java @@ -24,17 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.entry; +package org.x4o.vasc.impl.entry; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValidatorService; -import com.idcanet.vasc.validators.VascValidator; -import com.idcanet.vasc.validators.VascValidatorMessages; +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; + /** * Executes the normal vasc validators for fields. diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/type/DefaultVascEntryFieldType.java b/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldType.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/type/DefaultVascEntryFieldType.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldType.java index a93cb3d..5cf597c 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/type/DefaultVascEntryFieldType.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldType.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.type; +package org.x4o.vasc.impl.type; -import com.idcanet.vasc.core.AbstractVascEntryFieldType; -import com.idcanet.vasc.core.VascEntryFieldType; +import org.x4o.vasc.core.AbstractVascEntryFieldType; +import org.x4o.vasc.core.VascEntryFieldType; /** * Only knows how to clone its self. diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/type/DefaultVascEntryFieldTypeController.java b/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldTypeController.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/type/DefaultVascEntryFieldTypeController.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldTypeController.java index 0ef07e0..bb3b056 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/type/DefaultVascEntryFieldTypeController.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/type/DefaultVascEntryFieldTypeController.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.type; +package org.x4o.vasc.impl.type; import java.util.ArrayList; import java.util.Collections; @@ -32,9 +32,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.vasc.core.VascEntryFieldTypeControllerLocal; -import com.idcanet.vasc.core.VascException; +import org.x4o.vasc.core.VascEntryFieldType; +import org.x4o.vasc.core.VascEntryFieldTypeControllerLocal; +import org.x4o.vasc.core.VascException; + /** * @@ -70,7 +71,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo } /** - * @see com.idcanet.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeById(java.lang.String) + * @see org.x4o.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeById(java.lang.String) */ public VascEntryFieldType getVascEntryFieldTypeById(String id) { VascEntryFieldType result = vascEntryFieldTypes.get(id); @@ -95,7 +96,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo /** - * @see com.idcanet.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeIds() + * @see org.x4o.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeIds() */ public List getVascEntryFieldTypeIds() { List result = new ArrayList(5); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/type/FieldTypeParser.java b/vasc-core/src/main/java/org/x4o/vasc/impl/type/FieldTypeParser.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/type/FieldTypeParser.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/type/FieldTypeParser.java index 117763d..3f53da3 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/type/FieldTypeParser.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/type/FieldTypeParser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.type; +package org.x4o.vasc.impl.type; import java.io.IOException; import java.util.ArrayList; @@ -35,9 +35,9 @@ import javax.xml.parsers.ParserConfigurationException; import org.xml.sax.SAXException; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.x4o.core.X4OParser; -import com.idcanet.x4o.element.Element; +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/com/idcanet/vasc/impl/type/MultiTextVascEntryFieldType.java b/vasc-core/src/main/java/org/x4o/vasc/impl/type/MultiTextVascEntryFieldType.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/type/MultiTextVascEntryFieldType.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/type/MultiTextVascEntryFieldType.java index 610a1a7..0ec2a0b 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/type/MultiTextVascEntryFieldType.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/type/MultiTextVascEntryFieldType.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.type; +package org.x4o.vasc.impl.type; import java.util.List; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** @@ -109,7 +110,7 @@ public class MultiTextVascEntryFieldType extends DefaultVascEntryFieldType { */ /** - * @see com.idcanet.vasc.core.AbstractVascEntryFieldType#getUIComponentCount(com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.AbstractVascEntryFieldType#getUIComponentCount(org.x4o.vasc.core.VascEntryField) */ @Override public int getUIComponentCount(VascEntryField entryField) throws VascException { @@ -132,7 +133,7 @@ public class MultiTextVascEntryFieldType extends DefaultVascEntryFieldType { } /** - * @see com.idcanet.vasc.core.AbstractVascEntryFieldType#provideEditorVascValueModel(int, com.idcanet.vasc.core.VascEntryField) + * @see org.x4o.vasc.core.AbstractVascEntryFieldType#provideEditorVascValueModel(int, org.x4o.vasc.core.VascEntryField) */ @Override public VascValueModel provideEditorVascValueModel(final int index,final VascEntryField entryField) { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/AnnotationParserElement.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/AnnotationParserElement.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/AnnotationParserElement.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/AnnotationParserElement.java index affff42..edaa2f4 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/AnnotationParserElement.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/AnnotationParserElement.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; import java.io.IOException; import java.io.StringReader; @@ -37,21 +37,21 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import com.idcanet.vasc.annotations.VascAnnotationParser; -import com.idcanet.vasc.annotations.VascChoices; -import com.idcanet.vasc.annotations.VascChoicesSelectItemModel; -import com.idcanet.vasc.annotations.VascEventListener; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.vasc.impl.DefaultVascEntryField; -import com.idcanet.vasc.validators.VascValidator; -import com.idcanet.vasc.validators.VascValidatorClassParser; -import com.idcanet.x4o.core.X4OParser; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; +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 org.x4o.xml.core.X4OParser; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; /** @@ -63,7 +63,7 @@ import com.idcanet.x4o.element.ElementException; public class AnnotationParserElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementRun() + * @see org.x4o.xml.element.AbstractElement#doElementRun() */ @Override public void doElementRun() throws ElementException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SelectItemModelBindingHandler.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SelectItemModelBindingHandler.java similarity index 83% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SelectItemModelBindingHandler.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SelectItemModelBindingHandler.java index 0d69411..3cfadcf 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SelectItemModelBindingHandler.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SelectItemModelBindingHandler.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.vasc.core.ui.VascSelectItemModel; -import com.idcanet.x4o.element.AbstractElementBindingHandler; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementBindingHandlerException; + +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascEntryFieldType; +import org.x4o.vasc.core.ui.VascSelectItemModel; +import org.x4o.xml.element.AbstractElementBindingHandler; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementBindingHandlerException; /** * Binds SelectItems @@ -43,7 +44,7 @@ import com.idcanet.x4o.element.ElementBindingHandlerException; public class SelectItemModelBindingHandler extends AbstractElementBindingHandler { /** - * @see com.idcanet.x4o.element.ElementBindingHandler#canBind(com.idcanet.x4o.element.Element) + * @see org.x4o.xml.element.ElementBindingHandler#canBind(org.x4o.xml.element.Element) */ public boolean canBind(Element element) { if (element.getParent()==null) { @@ -59,7 +60,7 @@ public class SelectItemModelBindingHandler extends AbstractElementBindingHandler } /** - * @see com.idcanet.x4o.element.ElementBindingHandler#doBind(com.idcanet.x4o.element.Element) + * @see org.x4o.xml.element.ElementBindingHandler#doBind(org.x4o.xml.element.Element) */ public void doBind(Element element) throws ElementBindingHandlerException { Object child = element.getElementObject(); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SetParameterElement.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SetParameterElement.java similarity index 92% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SetParameterElement.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SetParameterElement.java index b579901..898a435 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SetParameterElement.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/SetParameterElement.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; import java.util.logging.Logger; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; + +import org.x4o.vasc.core.VascEntry; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; /** * Handles the diffent EntryParameter xml tags @@ -43,7 +44,7 @@ public class SetParameterElement extends AbstractElement { private Logger logger = Logger.getLogger(SetParameterElement.class.getName()); /** - * @see com.idcanet.x4o.element.AbstractElement#doElementRun() + * @see org.x4o.xml.element.AbstractElement#doElementRun() */ @Override public void doElementRun() throws ElementException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascBackendElementConfigurator.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascBackendElementConfigurator.java similarity index 83% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascBackendElementConfigurator.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascBackendElementConfigurator.java index b447a17..b68f547 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascBackendElementConfigurator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascBackendElementConfigurator.java @@ -24,16 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendController; -import com.idcanet.vasc.core.VascBackendControllerLocal; -import com.idcanet.vasc.core.VascController; -import com.idcanet.x4o.element.AbstractElementConfigurator; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementConfiguratorException; +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 org.x4o.xml.element.AbstractElementConfigurator; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementConfiguratorException; /** @@ -45,7 +45,7 @@ import com.idcanet.x4o.element.ElementConfiguratorException; public class VascBackendElementConfigurator extends AbstractElementConfigurator { /** - * @see com.idcanet.x4o.element.AbstractElementConfigurator#doConfigEndTag(com.idcanet.x4o.element.Element) + * @see org.x4o.xml.element.AbstractElementConfigurator#doConfigEndTag(org.x4o.xml.element.Element) */ public void doConfigElement(Element element) throws ElementConfiguratorException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryActionElement.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryActionElement.java similarity index 87% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryActionElement.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryActionElement.java index 3c13768..9e99add 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryActionElement.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryActionElement.java @@ -24,16 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.actions.ColumnVascAction; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.x4o.core.X4OParser; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; +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 org.x4o.xml.core.X4OParser; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; /** * Handed the eventListener xml tag. @@ -44,7 +44,7 @@ import com.idcanet.x4o.element.ElementException; public class VascEntryActionElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementRun() + * @see org.x4o.xml.element.AbstractElement#doElementRun() */ @Override public void doElementRun() throws ElementException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryElementConfigurator.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryElementConfigurator.java similarity index 82% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryElementConfigurator.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryElementConfigurator.java index 4670a55..6867ac1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryElementConfigurator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryElementConfigurator.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryController; -import com.idcanet.vasc.core.VascEntryControllerLocal; -import com.idcanet.vasc.core.VascException; -import com.idcanet.x4o.element.AbstractElementConfigurator; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementConfiguratorException; + +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 org.x4o.xml.element.AbstractElementConfigurator; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementConfiguratorException; /** @@ -45,7 +46,7 @@ import com.idcanet.x4o.element.ElementConfiguratorException; public class VascEntryElementConfigurator extends AbstractElementConfigurator { /** - * @see com.idcanet.x4o.element.AbstractElementConfigurator#doConfigEndTag(com.idcanet.x4o.element.Element) + * @see org.x4o.xml.element.AbstractElementConfigurator#doConfigEndTag(org.x4o.xml.element.Element) */ public void doConfigElement(Element element) throws ElementConfiguratorException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldBindingHandler.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldBindingHandler.java similarity index 85% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldBindingHandler.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldBindingHandler.java index 7446704..0a9580c 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldBindingHandler.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldBindingHandler.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.x4o.element.AbstractElementBindingHandler; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementBindingHandlerException; + +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.xml.element.AbstractElementBindingHandler; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementBindingHandlerException; /** * Binds fields @@ -42,7 +43,7 @@ import com.idcanet.x4o.element.ElementBindingHandlerException; public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler { /** - * @see com.idcanet.x4o.element.ElementBindingHandler#canBind(com.idcanet.x4o.element.Element) + * @see org.x4o.xml.element.ElementBindingHandler#canBind(org.x4o.xml.element.Element) */ public boolean canBind(Element element) { if (element.getParent()==null) { @@ -58,7 +59,7 @@ public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler } /** - * @see com.idcanet.x4o.element.ElementBindingHandler#doBind(com.idcanet.x4o.element.Element) + * @see org.x4o.xml.element.ElementBindingHandler#doBind(org.x4o.xml.element.Element) */ public void doBind(Element element) throws ElementBindingHandlerException { Object childObject = element.getElementObject(); diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldElement.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldElement.java similarity index 88% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldElement.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldElement.java index cb70b5b..aeb41ac 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldElement.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldElement.java @@ -24,15 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; import java.util.logging.Logger; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; /** @@ -47,7 +47,7 @@ public class VascEntryFieldElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementRun() + * @see org.x4o.xml.element.AbstractElement#doElementRun() */ @Override public void doElementRun() throws ElementException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java similarity index 85% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java index 40f9d07..9b922ca 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldSetAttributeConverter.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascEntryFieldSet; -import com.idcanet.x4o.element.AbstractElementAttributeConverter; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementAttributeConverterException; + +import org.x4o.vasc.core.VascEntryFieldSet; +import org.x4o.xml.element.AbstractElementAttributeConverter; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementAttributeConverterException; /** @@ -41,7 +42,7 @@ import com.idcanet.x4o.element.ElementAttributeConverterException; public class VascEntryFieldSetAttributeConverter extends AbstractElementAttributeConverter { /** - * @see com.idcanet.x4o.element.AbstractElementAttributeConverter#doConvertAttribute(com.idcanet.x4o.element.Element, java.lang.Object) + * @see org.x4o.xml.element.AbstractElementAttributeConverter#doConvertAttribute(org.x4o.xml.element.Element, java.lang.Object) */ public Object doConvertAttribute(Element element, Object parameterValue) throws ElementAttributeConverterException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java similarity index 85% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java index b6660dd..03fe736 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeAttributeConverter.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascController; -import com.idcanet.x4o.element.AbstractElementAttributeConverter; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementAttributeConverterException; + +import org.x4o.vasc.core.VascController; +import org.x4o.xml.element.AbstractElementAttributeConverter; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementAttributeConverterException; /** @@ -41,7 +42,7 @@ import com.idcanet.x4o.element.ElementAttributeConverterException; public class VascEntryFieldTypeAttributeConverter extends AbstractElementAttributeConverter { /** - * @see com.idcanet.x4o.element.AbstractElementAttributeConverter#doConvertAttribute(com.idcanet.x4o.element.Element, java.lang.Object) + * @see org.x4o.xml.element.AbstractElementAttributeConverter#doConvertAttribute(org.x4o.xml.element.Element, java.lang.Object) */ public Object doConvertAttribute(Element element, Object attributeValue) throws ElementAttributeConverterException { if (attributeValue==null) { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldTypeElement.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeElement.java similarity index 87% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldTypeElement.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeElement.java index 18b4d25..429a494 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEntryFieldTypeElement.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEntryFieldTypeElement.java @@ -24,16 +24,16 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; import java.util.logging.Logger; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.x4o.core.X4OPhase; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; +import org.x4o.vasc.core.VascEntryField; +import org.x4o.vasc.core.VascEntryFieldType; +import org.x4o.xml.core.X4OPhase; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; /** @@ -48,7 +48,7 @@ public class VascEntryFieldTypeElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementRun() + * @see org.x4o.xml.element.AbstractElement#doElementRun() */ @Override public void doElementRun() throws ElementException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEventListenerElement.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEventListenerElement.java similarity index 91% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEventListenerElement.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEventListenerElement.java index 39c5eb8..d064bc4 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascEventListenerElement.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascEventListenerElement.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; +import org.x4o.vasc.core.VascEntry; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; /** * Handed the eventListener xml tag. @@ -40,7 +40,7 @@ import com.idcanet.x4o.element.ElementException; public class VascEventListenerElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementRun() + * @see org.x4o.xml.element.AbstractElement#doElementRun() */ @Override public void doElementRun() throws ElementException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascLinkEntryParameterElement.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascLinkEntryParameterElement.java similarity index 89% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascLinkEntryParameterElement.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascLinkEntryParameterElement.java index 310343d..5de90ee 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascLinkEntryParameterElement.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascLinkEntryParameterElement.java @@ -24,13 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.impl.DefaultVascSelectItemModel; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; +import org.x4o.vasc.core.VascLinkEntry; +import org.x4o.vasc.impl.DefaultVascSelectItemModel; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; /** * Adds the link is paramets @@ -41,7 +41,7 @@ import com.idcanet.x4o.element.ElementException; public class VascLinkEntryParameterElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementRun() + * @see org.x4o.xml.element.AbstractElement#doElementRun() */ @Override public void doElementRun() throws ElementException { diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascParser.java b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascParser.java similarity index 89% rename from vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascParser.java rename to vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascParser.java index 468659f..531af08 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/VascParser.java +++ b/vasc-core/src/main/java/org/x4o/vasc/impl/x4o/VascParser.java @@ -24,18 +24,18 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.impl.x4o; +package org.x4o.vasc.impl.x4o; import javax.el.ValueExpression; -import com.idcanet.vasc.core.VascController; -import com.idcanet.x4o.core.AbstractX4OPhaseHandler; -import com.idcanet.x4o.core.X4OParser; -import com.idcanet.x4o.core.X4OPhaseException; -import com.idcanet.x4o.core.X4OPhaseHandler; -import com.idcanet.x4o.core.X4OPhase; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementContext; +import org.x4o.vasc.core.VascController; +import org.x4o.xml.core.AbstractX4OPhaseHandler; +import org.x4o.xml.core.X4OParser; +import org.x4o.xml.core.X4OPhase; +import org.x4o.xml.core.X4OPhaseException; +import org.x4o.xml.core.X4OPhaseHandler; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementContext; /** * Parses the vasc xml streams diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDateFuture.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFuture.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascDateFuture.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFuture.java index 3a23479..d4e9ad6 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDateFuture.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFuture.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDateFutureValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFutureValidator.java similarity index 88% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascDateFutureValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFutureValidator.java index a0ee67d..3f373c2 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDateFutureValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDateFutureValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.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 com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.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 com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascDateFuture.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDatePast.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePast.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascDatePast.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePast.java index de2912c..0877175 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDatePast.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePast.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDatePastValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePastValidator.java similarity index 88% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascDatePastValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePastValidator.java index a74f3cb..6128354 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascDatePastValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascDatePastValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.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 com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.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 com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascDatePast.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascIntSize.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSize.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascIntSize.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSize.java index f96d5d5..73fe2c1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascIntSize.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSize.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascIntSizeValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSizeValidator.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascIntSizeValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSizeValidator.java index cc91386..7f1206a 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascIntSizeValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascIntSizeValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; @@ -40,7 +40,7 @@ public class VascIntSizeValidator implements VascValidator { private int min = Integer.MIN_VALUE; /** - * @see com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.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 com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascIntSizeValidator.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.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/com/idcanet/vasc/validators/VascLongSize.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSize.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascLongSize.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSize.java index aa11134..987c771 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascLongSize.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSize.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascLongSizeValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSizeValidator.java similarity index 90% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascLongSizeValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSizeValidator.java index bd842c4..9fe0f8f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascLongSizeValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascLongSizeValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; @@ -40,7 +40,7 @@ public class VascLongSizeValidator implements VascValidator { private long min = Long.MIN_VALUE; /** - * @see com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.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 com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascLongSize.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.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/com/idcanet/vasc/validators/VascObjectNotNull.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNull.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNotNull.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNull.java index fbffd31..7033d9f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNotNull.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNull.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNotNullValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNullValidator.java similarity index 88% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNotNullValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNullValidator.java index 17192a2..4d1780a 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNotNullValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNotNullValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; @@ -37,21 +37,21 @@ import java.lang.annotation.Annotation; public class VascObjectNotNullValidator implements VascValidator { /** - * @see com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { return object!=null; } /** - * @see com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascObjectNotNull.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNull.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNull.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNull.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNull.java index 5a0bbab..8605b20 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNull.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNull.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNullValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNullValidator.java similarity index 88% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNullValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNullValidator.java index 1dc948c..d4adc2c 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectNullValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectNullValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; @@ -37,21 +37,21 @@ import java.lang.annotation.Annotation; public class VascObjectNullValidator implements VascValidator { /** - * @see com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { return object==null; } /** - * @see com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascObjectNull.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ public void initAnnotation(Annotation annotation) { } diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectUrl.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrl.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectUrl.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrl.java index a503932..1a0e359 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectUrl.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrl.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectUrlValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrlValidator.java similarity index 92% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectUrlValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrlValidator.java index 8d23fa7..f7efa52 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascObjectUrlValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascObjectUrlValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; import java.net.MalformedURLException; @@ -64,7 +64,7 @@ public class VascObjectUrlValidator implements VascValidator { } /** - * @see com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ public boolean isObjectValid(Object object) throws VascValidatorException { @@ -95,14 +95,14 @@ public class VascObjectUrlValidator implements VascValidator { } /** - * @see com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascObjectNull.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.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/com/idcanet/vasc/validators/VascStringEmail.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmail.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringEmail.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmail.java index 60a0e9a..40b57f5 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringEmail.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmail.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringEmailValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmailValidator.java similarity index 92% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringEmailValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmailValidator.java index 0a245d9..47ffd12 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringEmailValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringEmailValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; /** * Validates emails addresses. @@ -49,14 +49,14 @@ public class VascStringEmailValidator extends VascStringRegexValidator { } /** - * @see com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascStringEmail.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.Class) + * @see org.x4o.vasc.validators.VascValidator#initAnnotation(java.lang.Class) */ public void initAnnotation(Class annotationType) { } diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringLength.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLength.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringLength.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLength.java index ed929e5..2ce92ce 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringLength.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLength.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringLengthValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLengthValidator.java similarity index 94% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringLengthValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLengthValidator.java index 99e781a..91a38a3 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringLengthValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringLengthValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; @@ -41,7 +41,7 @@ public class VascStringLengthValidator implements VascValidator { private boolean nullable = false; /** - * @see com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.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 com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.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/com/idcanet/vasc/validators/VascStringRegex.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegex.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringRegex.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegex.java index 2824a83..177d30f 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringRegex.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegex.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringRegexValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegexValidator.java similarity index 91% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringRegexValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegexValidator.java index 9e8b24e..e954397 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringRegexValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringRegexValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; import java.util.regex.Matcher; @@ -62,7 +62,7 @@ public class VascStringRegexValidator implements VascValidator { } /** - * @see com.idcanet.vasc.validators.VascValidator#isObjectValid(java.lang.Object) + * @see org.x4o.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 com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascStringRegex.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) + * @see org.x4o.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/com/idcanet/vasc/validators/VascStringZipCode.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCode.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringZipCode.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCode.java index 309389a..836a4d9 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringZipCode.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCode.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringZipCodeValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCodeValidator.java similarity index 93% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringZipCodeValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCodeValidator.java index c299c35..1c7e0e0 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascStringZipCodeValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascStringZipCodeValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; /** * Validates @@ -60,14 +60,14 @@ public class VascStringZipCodeValidator extends VascStringRegexValidator { } /** - * @see com.idcanet.vasc.validators.VascValidator#getAnnotationType() + * @see org.x4o.vasc.validators.VascValidator#getAnnotationType() */ public Class getAnnotationType() { return VascStringZipCode.class; } /** - * @see com.idcanet.vasc.validators.VascValidator#initAnnotation(java.lang.Class) + * @see org.x4o.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/com/idcanet/vasc/validators/VascValidator.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidator.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidator.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascValidator.java index de9f24f..03900eb 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidator.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidator.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorClassParser.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorClassParser.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorClassParser.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorClassParser.java index 830e980..e14cb93 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorClassParser.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorClassParser.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorException.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorException.java similarity index 98% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorException.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorException.java index 9c1040c..96ccde7 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorException.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorException.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; /** diff --git a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorMessages.java b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorMessages.java similarity index 97% rename from vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorMessages.java rename to vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorMessages.java index b4dfe67..b09b3b1 100644 --- a/vasc-core/src/main/java/com/idcanet/vasc/validators/VascValidatorMessages.java +++ b/vasc-core/src/main/java/org/x4o/vasc/validators/VascValidatorMessages.java @@ -24,9 +24,9 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.validators; +package org.x4o.vasc.validators; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.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 9775506..b5550ce 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 1810fbd..55152e8 100644 --- a/vasc-core/src/main/resources/META-INF/fieldtypes.xml +++ b/vasc-core/src/main/resources/META-INF/fieldtypes.xml @@ -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 e5d8b67..7c38b5a 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/com/idcanet/vasc/FieldTypesTest.java b/vasc-core/src/test/java/org/x4o/vasc/FieldTypesTest.java similarity index 95% rename from vasc-core/src/test/java/com/idcanet/vasc/FieldTypesTest.java rename to vasc-core/src/test/java/org/x4o/vasc/FieldTypesTest.java index a3938fa..73a1478 100644 --- a/vasc-core/src/test/java/com/idcanet/vasc/FieldTypesTest.java +++ b/vasc-core/src/test/java/org/x4o/vasc/FieldTypesTest.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc; +package org.x4o.vasc; import java.io.InputStream; import java.util.logging.LogManager; -import com.idcanet.vasc.core.VascEntryFieldType; -import com.idcanet.vasc.impl.type.FieldTypeParser; +import org.x4o.vasc.core.VascEntryFieldType; +import org.x4o.vasc.impl.type.FieldTypeParser; + import junit.framework.TestCase; diff --git a/vasc-ejb3/.settings/org.eclipse.m2e.core.prefs b/vasc-ejb3/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/vasc-ejb3/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-ejb3/pom.xml b/vasc-ejb3/pom.xml index f026661..069b4bb 100644 --- a/vasc-ejb3/pom.xml +++ b/vasc-ejb3/pom.xml @@ -1,23 +1,23 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-ejb3 0.3.5-SNAPSHOT vasc-ejb3 vasc-ejb3 - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} - com.idcanet.vasc + org.x4o.vasc vasc-backend-jpa ${project.version} @@ -34,7 +34,7 @@ provided - com.idcanet.vasc + org.x4o.vasc vasc-xpql-ejb3 ${project.version} provided diff --git a/vasc-ejb3/src/main/java/com/idcanet/vasc/ejb3/VascServiceManager.java b/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManager.java similarity index 96% rename from vasc-ejb3/src/main/java/com/idcanet/vasc/ejb3/VascServiceManager.java rename to vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManager.java index 9adf581..73a90be 100644 --- a/vasc-ejb3/src/main/java/com/idcanet/vasc/ejb3/VascServiceManager.java +++ b/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManager.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.ejb3; +package org.x4o.vasc.ejb3; import java.util.List; import java.util.Map; @@ -32,7 +32,8 @@ import java.util.Map; import javax.ejb.Local; import javax.ejb.Remote; -import com.idcanet.vasc.core.VascEntry; +import org.x4o.vasc.core.VascEntry; + /** * diff --git a/vasc-ejb3/src/main/java/com/idcanet/vasc/ejb3/VascServiceManagerImpl.java b/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManagerImpl.java similarity index 90% rename from vasc-ejb3/src/main/java/com/idcanet/vasc/ejb3/VascServiceManagerImpl.java rename to vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManagerImpl.java index 79f5251..31c8b67 100644 --- a/vasc-ejb3/src/main/java/com/idcanet/vasc/ejb3/VascServiceManagerImpl.java +++ b/vasc-ejb3/src/main/java/org/x4o/vasc/ejb3/VascServiceManagerImpl.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.ejb3; +package org.x4o.vasc.ejb3; import java.io.IOException; import java.io.InputStream; @@ -47,33 +47,33 @@ import javax.el.ValueExpression; import javax.naming.InitialContext; import javax.persistence.EntityManager; -import com.idcanet.vasc.backends.jpa.EntityManagerProvider; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendControllerLocal; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.impl.DefaultVascBackedEntryFinalizer; -import com.idcanet.vasc.impl.DefaultVascEntryController; -import com.idcanet.vasc.impl.DefaultVascFactory; -import com.idcanet.vasc.impl.VascBackendProxyEventExecutor; -import com.idcanet.vasc.impl.actions.AddRowAction; -import com.idcanet.vasc.impl.actions.CSVExportGlobalAction; -import com.idcanet.vasc.impl.actions.DeleteRowAction; -import com.idcanet.vasc.impl.actions.EditRowAction; -import com.idcanet.vasc.impl.actions.XMLExportGlobalAction; -import com.idcanet.vasc.impl.entry.DefaultVascEntryResourceResolver; -import com.idcanet.vasc.impl.x4o.VascParser; -import com.idcanet.vasc.xpql.ejb3.XpqlQueryManager; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.x4o.core.AbstractX4OPhaseHandler; -import com.idcanet.x4o.core.X4OPhase; -import com.idcanet.x4o.core.X4OPhaseException; -import com.idcanet.x4o.core.X4OPhaseHandler; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementContext; +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 org.x4o.xml.core.AbstractX4OPhaseHandler; +import org.x4o.xml.core.X4OPhase; +import org.x4o.xml.core.X4OPhaseException; +import org.x4o.xml.core.X4OPhaseHandler; +import org.x4o.xml.element.Element; +import org.x4o.xml.element.ElementContext; /** * @@ -313,7 +313,7 @@ public class VascServiceManagerImpl implements VascServiceManager.IRemote,VascSe class DatafeedsEntityManagerProvider implements EntityManagerProvider { /** - * @see com.idcanet.vasc.backends.jpa.EntityManagerProvider#getEntityManager() + * @see org.x4o.vasc.backends.jpa.EntityManagerProvider#getEntityManager() */ public EntityManager getEntityManager() { return entityManager; diff --git a/vasc-frontend-swing/.classpath b/vasc-frontend-swing/.classpath index f42fb64..7106942 100644 --- a/vasc-frontend-swing/.classpath +++ b/vasc-frontend-swing/.classpath @@ -5,6 +5,7 @@ + diff --git a/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs b/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..6d54e61 --- /dev/null +++ b/vasc-frontend-swing/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:07 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-frontend-swing/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..523f09f --- /dev/null +++ b/vasc-frontend-swing/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:02 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-frontend-swing/pom.xml b/vasc-frontend-swing/pom.xml index cc42c83..6274b4e 100644 --- a/vasc-frontend-swing/pom.xml +++ b/vasc-frontend-swing/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-frontend-swing 0.3.5-SNAPSHOT vasc-frontend-swing vasc-frontend-swing - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/SwingVascFrontend.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/SwingVascFrontend.java similarity index 95% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/SwingVascFrontend.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/SwingVascFrontend.java index c2729a5..acd6d19 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/SwingVascFrontend.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/SwingVascFrontend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.frontends.swing; +package org.x4o.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 com.idcanet.vasc.core.AbstractVascFrontend; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryExporter; -import com.idcanet.vasc.core.ui.VascColumnValueModelListener; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; -import com.idcanet.vasc.frontends.swing.ui.SwingBoolean; -import com.idcanet.vasc.frontends.swing.ui.SwingButton; -import com.idcanet.vasc.frontends.swing.ui.SwingColorChooser; -import com.idcanet.vasc.frontends.swing.ui.SwingLabel; -import com.idcanet.vasc.frontends.swing.ui.SwingList; -import com.idcanet.vasc.frontends.swing.ui.SwingText; -import com.idcanet.vasc.frontends.swing.ui.SwingTextArea; +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; + /** * @@ -99,7 +100,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { } /** - * @see com.idcanet.vasc.core.VascFrontend#getFrontendType() + * @see org.x4o.vasc.core.VascFrontend#getFrontendType() */ public String getFrontendType() { return "swing"; @@ -144,7 +145,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { /** - * @see com.idcanet.vasc.core.VascViewRenderer#renderEdit(com.idcanet.vasc.core.VascEntry, java.lang.Object) + * @see org.x4o.vasc.core.VascViewRenderer#renderEdit(org.x4o.vasc.core.VascEntry, java.lang.Object) */ public void renderEdit() throws Exception { logger.fine("Rending Edit View"); @@ -326,7 +327,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { /** - * @see com.idcanet.vasc.core.VascViewRenderer#renderExport(com.idcanet.vasc.core.VascEntry, com.idcanet.vasc.core.VascDataExporter) + * @see org.x4o.vasc.core.VascViewRenderer#renderExport(org.x4o.vasc.core.VascEntry, org.x4o.vasc.core.VascDataExporter) */ public void renderExport(VascEntryExporter exporter) throws Exception { @@ -360,7 +361,7 @@ public class SwingVascFrontend extends AbstractVascFrontend { /** - * @see com.idcanet.vasc.core.VascViewRenderer#renderView(com.idcanet.vasc.core.VascEntry) + * @see org.x4o.vasc.core.VascViewRenderer#renderView(org.x4o.vasc.core.VascEntry) */ public void renderView() throws Exception { diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingBoolean.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingBoolean.java similarity index 84% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingBoolean.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingBoolean.java index 1ced898..88bf252 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingBoolean.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** @@ -61,7 +62,7 @@ public class SwingBoolean implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (checkBox==null) { @@ -71,7 +72,7 @@ public class SwingBoolean implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (checkBox==null) { @@ -86,28 +87,28 @@ public class SwingBoolean implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !checkBox.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { checkBox.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return checkBox.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { checkBox.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingButton.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingButton.java similarity index 81% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingButton.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingButton.java index 9c869f5..fd86045 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingButton.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.vasc.frontends.swing.ui; import java.awt.Color; import javax.swing.JButton; import javax.swing.JComponent; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** * @@ -57,7 +58,7 @@ public class SwingButton implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (vascButton==null) { @@ -67,7 +68,7 @@ public class SwingButton implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (vascButton==null) { @@ -82,28 +83,28 @@ public class SwingButton implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !vascButton.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { vascButton.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return vascButton.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { vascButton.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingColorChooser.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingColorChooser.java similarity index 87% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingColorChooser.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingColorChooser.java index 8c01003..7f9c489 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingColorChooser.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** * @@ -60,7 +61,7 @@ public class SwingColorChooser implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (colorButton==null) { @@ -70,7 +71,7 @@ public class SwingColorChooser implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (colorButton==null) { @@ -85,28 +86,28 @@ public class SwingColorChooser implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !colorButton.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { colorButton.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return colorButton.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { colorButton.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingDate.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingDate.java similarity index 84% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingDate.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingDate.java index ec24216..1c8918c 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingDate.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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 com.michaelbaranov.microba.calendar.DatePicker; @@ -67,7 +68,7 @@ public class SwingDate implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (datePicker==null) { @@ -77,7 +78,7 @@ public class SwingDate implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (datePicker==null) { @@ -92,28 +93,28 @@ public class SwingDate implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !datePicker.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { datePicker.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return datePicker.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { datePicker.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingLabel.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingLabel.java similarity index 80% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingLabel.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingLabel.java index 5daa5f5..2e02757 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingLabel.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.vasc.frontends.swing.ui; import java.awt.Color; import javax.swing.JComponent; import javax.swing.JLabel; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** @@ -58,7 +59,7 @@ public class SwingLabel implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (label==null) { @@ -68,7 +69,7 @@ public class SwingLabel implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (label==null) { @@ -83,28 +84,28 @@ public class SwingLabel implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !label.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { label.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return label.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { label.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingList.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingList.java similarity index 85% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingList.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingList.java index 079061a..3e553d8 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingList.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascSelectItem; -import com.idcanet.vasc.core.ui.VascSelectItemModel; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** @@ -97,7 +98,7 @@ public class SwingList implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (comboBox==null) { @@ -107,7 +108,7 @@ public class SwingList implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (comboBox==null) { @@ -122,28 +123,28 @@ public class SwingList implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !comboBox.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { comboBox.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return comboBox.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { comboBox.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingText.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingText.java similarity index 86% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingText.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingText.java index a33ced9..d101c4c 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingText.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** @@ -60,7 +61,7 @@ public class SwingText implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (textField==null) { @@ -70,7 +71,7 @@ public class SwingText implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (textField==null) { @@ -85,28 +86,28 @@ public class SwingText implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !textField.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { textField.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return textField.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { textField.setVisible(rendered); diff --git a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingTextArea.java b/vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingTextArea.java similarity index 86% rename from vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingTextArea.java rename to vasc-frontend-swing/src/main/java/org/x4o/vasc/frontends/swing/ui/SwingTextArea.java index 37f4ff7..1c19ab7 100644 --- a/vasc-frontend-swing/src/main/java/com/idcanet/vasc/frontends/swing/ui/SwingTextArea.java +++ b/vasc-frontend-swing/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.swing.ui; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; +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; + /** @@ -69,7 +70,7 @@ public class SwingTextArea implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#getErrorText() + * @see org.x4o.vasc.core.ui.VascUIComponent#getErrorText() */ public String getErrorText() { if (textArea==null) { @@ -79,7 +80,7 @@ public class SwingTextArea implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) + * @see org.x4o.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ public void setErrorText(String text) { if (textArea==null) { @@ -94,28 +95,28 @@ public class SwingTextArea implements VascUIComponent { } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isDisabled() + * @see org.x4o.vasc.core.ui.VascUIComponent#isDisabled() */ public boolean isDisabled() { return !textArea.isEnabled(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setDisabled(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ public void setDisabled(boolean disabled) { textArea.setEnabled(!disabled); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#isRendered() + * @see org.x4o.vasc.core.ui.VascUIComponent#isRendered() */ public boolean isRendered() { return textArea.isVisible(); } /** - * @see com.idcanet.vasc.core.ui.VascUIComponent#setRendered(boolean) + * @see org.x4o.vasc.core.ui.VascUIComponent#setRendered(boolean) */ public void setRendered(boolean rendered) { textArea.setVisible(rendered); diff --git a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/SwingTest.java b/vasc-frontend-swing/src/test/java/org/x4o/vasc/SwingTest.java similarity index 97% rename from vasc-frontend-swing/src/test/java/com/idcanet/vasc/SwingTest.java rename to vasc-frontend-swing/src/test/java/org/x4o/vasc/SwingTest.java index a94738c..2164543 100644 --- a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/SwingTest.java +++ b/vasc-frontend-swing/src/test/java/org/x4o/vasc/SwingTest.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.frontends.swing.SwingVascFrontend; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.frontends.swing.SwingVascFrontend; + import junit.framework.TestCase; diff --git a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/TestModel.java b/vasc-frontend-swing/src/test/java/org/x4o/vasc/TestModel.java similarity index 89% rename from vasc-frontend-swing/src/test/java/com/idcanet/vasc/TestModel.java rename to vasc-frontend-swing/src/test/java/org/x4o/vasc/TestModel.java index f00b321..157b2dd 100644 --- a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/TestModel.java +++ b/vasc-frontend-swing/src/test/java/org/x4o/vasc/TestModel.java @@ -25,22 +25,23 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc; +package org.x4o.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 org.hibernate.validator.NotNull; //import org.hibernate.validator.Max; -import com.idcanet.vasc.annotations.VascEntry; -import com.idcanet.vasc.annotations.VascStyle; -import com.idcanet.vasc.annotations.VascDefaultValue; -import com.idcanet.vasc.annotations.VascModelReference; -import com.idcanet.vasc.annotations.VascI18n; -import com.idcanet.vasc.validators.VascDateFuture; -import com.idcanet.vasc.validators.VascObjectNotNull; -import com.idcanet.vasc.validators.VascStringLength; /** * TestModel diff --git a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/TestModelVascDataSource.java b/vasc-frontend-swing/src/test/java/org/x4o/vasc/TestModelVascDataSource.java similarity index 87% rename from vasc-frontend-swing/src/test/java/com/idcanet/vasc/TestModelVascDataSource.java rename to vasc-frontend-swing/src/test/java/org/x4o/vasc/TestModelVascDataSource.java index 42d28ac..ee4c9cd 100644 --- a/vasc-frontend-swing/src/test/java/com/idcanet/vasc/TestModelVascDataSource.java +++ b/vasc-frontend-swing/src/test/java/org/x4o/vasc/TestModelVascDataSource.java @@ -24,23 +24,24 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc; +package org.x4o.vasc; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.idcanet.vasc.core.AbstractVascBackend; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; -import com.idcanet.vasc.core.ui.VascSelectItem; -import com.idcanet.vasc.core.ui.VascSelectItemModel; -import com.idcanet.vasc.impl.entry.BeanPropertyVascEntryFieldValue; -import com.idcanet.vasc.impl.entry.BeanVascEntryRecordCreator; +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; + /** * diff --git a/vasc-frontend-swt/src/test/java/com/idcanet/vasc/TestTable.java b/vasc-frontend-swing/src/test/java/org/x4o/vasc/TestTable.java similarity index 81% rename from vasc-frontend-swt/src/test/java/com/idcanet/vasc/TestTable.java rename to vasc-frontend-swing/src/test/java/org/x4o/vasc/TestTable.java index 95c68f1..c4fbeab 100644 --- a/vasc-frontend-swt/src/test/java/com/idcanet/vasc/TestTable.java +++ b/vasc-frontend-swing/src/test/java/org/x4o/vasc/TestTable.java @@ -24,34 +24,35 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc; +package org.x4o.vasc; import java.io.File; import java.io.FileOutputStream; import java.lang.reflect.Method; import java.util.Locale; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendControllerLocal; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.impl.DefaultVascBackedEntryFinalizer; -import com.idcanet.vasc.impl.DefaultVascFactory; -import com.idcanet.vasc.impl.DefaultVascFrontendData; -import com.idcanet.vasc.impl.DefaultVascFrontendHelper; -import com.idcanet.vasc.impl.VascBackendProxyPaged; -import com.idcanet.vasc.impl.VascBackendProxySearch; -import com.idcanet.vasc.impl.VascBackendProxySort; -import com.idcanet.vasc.impl.actions.AddRowAction; -import com.idcanet.vasc.impl.actions.CSVExportGlobalAction; -import com.idcanet.vasc.impl.actions.DeleteRowAction; -import com.idcanet.vasc.impl.actions.EditRowAction; -import com.idcanet.vasc.impl.actions.RefreshDataGlobalAction; -import com.idcanet.vasc.impl.actions.XMLExportGlobalAction; -import com.idcanet.vasc.impl.x4o.VascParser; +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; + /** diff --git a/vasc-frontend-swt/.classpath b/vasc-frontend-swt/.classpath index f42fb64..7106942 100644 --- a/vasc-frontend-swt/.classpath +++ b/vasc-frontend-swt/.classpath @@ -5,6 +5,7 @@ + diff --git a/vasc-frontend-swt/.project b/vasc-frontend-swt/.project index 1aa490f..c9727b8 100644 --- a/vasc-frontend-swt/.project +++ b/vasc-frontend-swt/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs b/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..6d54e61 --- /dev/null +++ b/vasc-frontend-swt/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:07 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-frontend-swt/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..523f09f --- /dev/null +++ b/vasc-frontend-swt/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:02 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-frontend-swt/pom.xml b/vasc-frontend-swt/pom.xml index a8a22bf..bd17eef 100644 --- a/vasc-frontend-swt/pom.xml +++ b/vasc-frontend-swt/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-frontend-swt 0.3.5-SNAPSHOT vasc-frontend-swt vasc-frontend-swt - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} diff --git a/vasc-frontend-swt/src/main/java/com/idcanet/vasc/frontends/swt/SwtVascEditDialog.java b/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascEditDialog.java similarity index 96% rename from vasc-frontend-swt/src/main/java/com/idcanet/vasc/frontends/swt/SwtVascEditDialog.java rename to vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascEditDialog.java index 26a5be3..e412363 100644 --- a/vasc-frontend-swt/src/main/java/com/idcanet/vasc/frontends/swt/SwtVascEditDialog.java +++ b/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascEditDialog.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.frontends.swt; +package org.x4o.vasc.frontends.swt; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -41,13 +41,13 @@ 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; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.ui.VascColumnValueModelListener; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; /** * diff --git a/vasc-frontend-swt/src/main/java/com/idcanet/vasc/frontends/swt/SwtVascFrontend.java b/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascFrontend.java similarity index 94% rename from vasc-frontend-swt/src/main/java/com/idcanet/vasc/frontends/swt/SwtVascFrontend.java rename to vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascFrontend.java index 95a2cc9..1c36659 100644 --- a/vasc-frontend-swt/src/main/java/com/idcanet/vasc/frontends/swt/SwtVascFrontend.java +++ b/vasc-frontend-swt/src/main/java/org/x4o/vasc/frontends/swt/SwtVascFrontend.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.frontends.swt; +package org.x4o.vasc.frontends.swt; import java.io.FileOutputStream; import java.io.OutputStream; @@ -66,27 +66,27 @@ 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; -import com.idcanet.vasc.core.AbstractVascFrontend; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryExporter; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import com.idcanet.vasc.core.ui.VascOptionValueModelListener; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; -import com.idcanet.vasc.core.ui.VascValueModelListener; -import com.idcanet.vasc.frontends.swt.ui.SwtBoolean; -import com.idcanet.vasc.frontends.swt.ui.SwtButton; -import com.idcanet.vasc.frontends.swt.ui.SwtLabel; -import com.idcanet.vasc.frontends.swt.ui.SwtList; -import com.idcanet.vasc.frontends.swt.ui.SwtText; -import com.idcanet.vasc.frontends.swt.ui.SwtTextArea; /** * @@ -105,7 +105,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { } /** - * @see com.idcanet.vasc.core.VascFrontend#getFrontendType() + * @see org.x4o.vasc.core.VascFrontend#getFrontendType() */ public String getFrontendType() { return "swt"; @@ -317,12 +317,12 @@ public class SwtVascFrontend extends AbstractVascFrontend { for (VascEntryField option:entry.getListOptions()) { for (int i=0;i + diff --git a/vasc-frontend-web-jsf/.project b/vasc-frontend-web-jsf/.project index fdd115d..b224e31 100644 --- a/vasc-frontend-web-jsf/.project +++ b/vasc-frontend-web-jsf/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs b/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..6d54e61 --- /dev/null +++ b/vasc-frontend-web-jsf/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:07 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-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs b/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/vasc-frontend-web-jsf/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-frontend-web-jsf/pom.xml b/vasc-frontend-web-jsf/pom.xml index a2d4beb..f754673 100644 --- a/vasc-frontend-web-jsf/pom.xml +++ b/vasc-frontend-web-jsf/pom.xml @@ -1,23 +1,23 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-frontend-web-jsf 0.3.5-SNAPSHOT vasc-frontend-web-jsf vasc-frontend-web-jsf - com.idcanet.vasc + org.x4o.vasc vasc-core ${project.version} - com.idcanet.vasc + org.x4o.vasc vasc-ejb3 ${project.version} provided diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java similarity index 92% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java index 9124ef1..be26c7c 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/AbstractJSFVascFacesController.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendControllerLocal; -import com.idcanet.vasc.core.VascBackendState; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryControllerLocal; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.entry.VascEntryBackendEventListener; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryRecordCreator; -import com.idcanet.vasc.ejb3.VascServiceManager; -import com.idcanet.vasc.impl.DefaultVascBackedEntryFinalizer; -import com.idcanet.vasc.impl.DefaultVascFactory; -import com.idcanet.vasc.impl.VascBackendProxyEventExecutor; -import com.idcanet.vasc.impl.entry.DefaultVascEntryResourceResolver; -import com.idcanet.vasc.impl.entry.SetParameterBackendListener; +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; + /** * Base faces session object for managing vasc entries. @@ -95,7 +96,7 @@ abstract public class AbstractJSFVascFacesController { return result; } public void vascEvent(VascEntry entry,Object data) { - if (data.getClass().getName().startsWith("com.idcanet.logstats.ejb.models")==false) { + if (data.getClass().getName().startsWith("some.class.models.jpa")==false) { return; // only refresh model classes } diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascEntryEventListener.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntryEventListener.java similarity index 86% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascEntryEventListener.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntryEventListener.java index 9b89f0d..0fa65d4 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascEntryEventListener.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntryEventListener.java @@ -1,7 +1,7 @@ /** * */ -package com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; +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; + /** * @author willemc @@ -28,7 +29,7 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener } /** - * @see com.idcanet.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() + * @see org.x4o.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() */ public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java similarity index 98% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java index 77121f8..4b50817 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascEntrySupportBean.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendPageNumber; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryState; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.VascLinkEntryType; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryExporter; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.impl.actions.AddRowAction; -import com.idcanet.vasc.impl.actions.DeleteRowAction; -import com.idcanet.vasc.impl.actions.EditRowAction; +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; + /** * diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java similarity index 71% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java index a4b02f0..1def24e 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascFrontendRenderer.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.AbstractVascFrontend; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.entry.VascEntryExporter; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFBoolean; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFLabel; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFList; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFText; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFTextArea; +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; + /** * Given the jsf vasc renderer its own class @@ -60,7 +61,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser // Frontend Stuff /** - * @see com.idcanet.vasc.core.VascFrontend#getFrontendType() + * @see org.x4o.vasc.core.VascFrontend#getFrontendType() */ public String getFrontendType() { return "jsf"; @@ -71,21 +72,21 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser VascFrontendData vfd = getVascEntry().getVascFrontendData(); // required UI components - vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_LABEL,JSFLabel.class.getName()); - vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_TEXT, JSFText.class.getName()); - vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_LIST, JSFList.class.getName()); - //vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_BUTTON, JSFButton.class.getName()); + 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()); // optional UI components - vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_BOOLEAN , JSFBoolean.class.getName()); - //vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_DATE , JSFDate.class.getName()); - vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_TEXTAREA , JSFTextArea.class.getName()); - //vfd.putVascUIComponent(com.idcanet.vasc.core.ui.VascUIComponent.VASC_COLOR , JSFColorChooser.class.getName()); + 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()); } /** - * @see com.idcanet.vasc.core.VascFrontend#renderDelete(java.lang.Object) + * @see org.x4o.vasc.core.VascFrontend#renderDelete(java.lang.Object) */ public void renderDelete() throws Exception { logger.finer("renderDelete"); @@ -95,7 +96,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser } /** - * @see com.idcanet.vasc.core.VascFrontend#renderEdit(java.lang.Object) + * @see org.x4o.vasc.core.VascFrontend#renderEdit(java.lang.Object) */ public void renderEdit() throws Exception { logger.finer("renderEdit"); @@ -117,7 +118,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser } /** - * @see com.idcanet.vasc.core.VascFrontend#renderExport(com.idcanet.vasc.core.entry.VascEntryExporter) + * @see org.x4o.vasc.core.VascFrontend#renderExport(org.x4o.vasc.core.entry.VascEntryExporter) */ public void renderExport(VascEntryExporter exporter) throws Exception { logger.finer("renderExport"); @@ -128,7 +129,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser } /** - * @see com.idcanet.vasc.core.VascFrontend#renderView() + * @see org.x4o.vasc.core.VascFrontend#renderView() */ public void renderView() throws Exception { logger.finer("renderView"); diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponent.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponent.java similarity index 96% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponent.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponent.java index 6398967..3542f0e 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponent.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascEntryState; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFListModel; -import com.idcanet.vasc.impl.DefaultVascFactory; +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; + /** * Renders an JSF vasc entry views. diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java similarity index 97% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java index 9eea442..a6927a8 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponentRenderer.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.VascLinkEntryType; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.ui.VascOptionValueModelListener; -import com.idcanet.vasc.core.ui.VascUIComponent; -import com.idcanet.vasc.core.ui.VascValueModel; -import com.idcanet.vasc.impl.actions.AddRowAction; +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; + /** * Renders an JSF vasc entry views. @@ -134,7 +135,7 @@ public class JSFVascUIComponentRenderer extends Renderer { String injectTableColumnsId = (String)comp.getAttributes().get(JSFVascUIComponent.INJECT_TABLE_COLUMNS_ID); UIComponent injectEditFieldsComponent = JSFVascUIComponent.findComponentById(comp.getFacet("editView"),injectEditFieldsId); - UIComponent injectTableOptionsComponent = JSFVascUIComponent.findComponentById(comp.getFacet("listView"),injectTableOptionsId,comp); + UIComponent injectTableOptionsComponent = JSFVascUIComponent.findComponentById(comp.getFacet("listView"),injectTableOptionsId); UIComponent injectTableColumnsComponent = JSFVascUIComponent.findComponentById(comp.getFacet("listView"),injectTableColumnsId); if (injectEditFieldsComponent==null) { throw new NullPointerException("Could not find injectEditFieldsId: "+injectEditFieldsId); @@ -155,7 +156,7 @@ public class JSFVascUIComponentRenderer extends Renderer { logger.finer("Injection of all dynamic JSF components."); try { addEditFields(context, injectEditFieldsComponent); - addTableOptions(context, injectTableOptionsComponent); + addTableOptions(context, injectTableOptionsComponent,comp); addColumns(context,comp,injectTableColumnsComponent ); } catch (Exception e) { throw new RuntimeException("Error while injecting; "+e.getMessage(),e); @@ -286,7 +287,7 @@ public class JSFVascUIComponentRenderer extends Renderer { //Application application = fc.getApplication(); //UIViewRoot viewRoot = fc.getViewRoot(); - JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(grid); + //JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(grid); VascEntry entry = comp.getVascEntry(); for (VascEntryField option:entry.getListOptions()) { diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponentTag.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentTag.java similarity index 99% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponentTag.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascUIComponentTag.java index e5ceabd..967e0af 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascUIComponentTag.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.web.jsf; +package org.x4o.vasc.frontends.web.jsf; import javax.el.ValueExpression; diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java similarity index 94% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java index 4df464b..ca9a7d0 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/JSFVascValidatePhaseListener.java @@ -1,7 +1,7 @@ /** * */ -package com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.frontends.web.jsf.JSFVascUIComponentRenderer.VascJSFInputValidator2; +import org.x4o.vasc.core.VascEntry; +import org.x4o.vasc.frontends.web.jsf.JSFVascUIComponentRenderer.VascJSFInputValidator2; + /** diff --git a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/OldVascUIComponent.java b/vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/OldVascUIComponent.java similarity index 95% rename from vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/OldVascUIComponent.java rename to vasc-frontend-web-jsf/src/main/java/org/x4o/vasc/frontends/web/jsf/OldVascUIComponent.java index a428813..694a933 100644 --- a/vasc-frontend-web-jsf/src/main/java/com/idcanet/vasc/frontends/web/jsf/OldVascUIComponent.java +++ b/vasc-frontend-web-jsf/src/main/java/org/x4o/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 com.idcanet.vasc.frontends.web.jsf; +package org.x4o.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 com.idcanet.vasc.core.AbstractVascFrontend; -import com.idcanet.vasc.core.VascBackend; -import com.idcanet.vasc.core.VascBackendFilter; -import com.idcanet.vasc.core.VascController; -import com.idcanet.vasc.core.VascEntry; -import com.idcanet.vasc.core.VascEntryField; -import com.idcanet.vasc.core.VascException; -import com.idcanet.vasc.core.VascFrontendData; -import com.idcanet.vasc.core.VascLinkEntry; -import com.idcanet.vasc.core.actions.GlobalVascAction; -import com.idcanet.vasc.core.actions.RowVascAction; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener; -import com.idcanet.vasc.core.entry.VascEntryExporter; -import com.idcanet.vasc.core.entry.VascEntryFieldValue; -import com.idcanet.vasc.core.entry.VascEntryFrontendEventListener.VascFrontendEventType; -import com.idcanet.vasc.core.ui.VascOptionValueModelListener; -import com.idcanet.vasc.core.ui.VascValueModel; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFBoolean; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFLabel; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFList; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFText; -import com.idcanet.vasc.frontends.web.jsf.ui.JSFTextArea; -import com.idcanet.vasc.impl.VascBackendProxyFilter; -import com.idcanet.vasc.impl.VascBackendProxyPaged; -import com.idcanet.vasc.impl.VascBackendProxySearch; -import com.idcanet.vasc.impl.VascBackendProxySort; +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; + /** * Only here for archive a bit, does not work anymore. @@ -102,7 +103,7 @@ import com.idcanet.vasc.impl.VascBackendProxySort; */ public class OldVascUIComponent extends UIComponentBase { - public static final String COMPONENT_TYPE = "com.idcanet.vasc.frontends.web.jsf.VascUIComponent"; + public static final String COMPONENT_TYPE = "org.x4o.vasc.frontends.web.jsf.VascUIComponent"; private Object[] state = null; private ValueExpression vascController = null; private ValueExpression vascFrontendData = null; @@ -821,12 +822,12 @@ public class OldVascUIComponent extends UIComponentBase { for (int i=0;i Vasc JSF Component vasc.jsf.component - com.idcanet.vasc.frontends.web.jsf.JSFVascUIComponent + org.x4o.vasc.frontends.web.jsf.JSFVascUIComponent vasc.jsf.component.renderer @@ -16,13 +16,13 @@ vasc.jsf.component.family vasc.jsf.component.renderer - com.idcanet.vasc.frontends.web.jsf.JSFVascUIComponentRenderer + org.x4o.vasc.frontends.web.jsf.JSFVascUIComponentRenderer - com.idcanet.vasc.frontends.web.jsf.VascViewHandler + org.x4o.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 3d31f98..27ac099 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 - com.idcanet.vasc.frontends.web.jsf.JSFVascUIComponentTag + org.x4o.vasc.frontends.web.jsf.JSFVascUIComponentTag JSP id @@ -33,7 +33,7 @@ vascController true - com.idcanet.vasc.core.VascController + org.x4o.vasc.core.VascController @@ -47,7 +47,7 @@ vascFrontendData true - com.idcanet.vasc.core.VascFrontendData + org.x4o.vasc.core.VascFrontendData diff --git a/vasc-xpql-ejb3/.classpath b/vasc-xpql-ejb3/.classpath index f42fb64..7106942 100644 --- a/vasc-xpql-ejb3/.classpath +++ b/vasc-xpql-ejb3/.classpath @@ -5,6 +5,7 @@ + diff --git a/vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs b/vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..6d54e61 --- /dev/null +++ b/vasc-xpql-ejb3/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:07 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-xpql-ejb3/.settings/org.eclipse.m2e.core.prefs b/vasc-xpql-ejb3/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/vasc-xpql-ejb3/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-xpql-ejb3/pom.xml b/vasc-xpql-ejb3/pom.xml index f853364..6b1d0c4 100644 --- a/vasc-xpql-ejb3/pom.xml +++ b/vasc-xpql-ejb3/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-xpql-ejb3 0.3.5-SNAPSHOT vasc-xpql-ejb3 xpql parsing service for ejb3 - com.idcanet.vasc + org.x4o.vasc vasc-xpql 0.3.5-SNAPSHOT diff --git a/vasc-xpql-ejb3/src/main/java/com/idcanet/vasc/xpql/ejb3/XpqlQueryManager.java b/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManager.java similarity index 90% rename from vasc-xpql-ejb3/src/main/java/com/idcanet/vasc/xpql/ejb3/XpqlQueryManager.java rename to vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManager.java index 20cccab..683a262 100644 --- a/vasc-xpql-ejb3/src/main/java/com/idcanet/vasc/xpql/ejb3/XpqlQueryManager.java +++ b/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManager.java @@ -1,5 +1,5 @@ -package com.idcanet.vasc.xpql.ejb3; +package org.x4o.vasc.xpql.ejb3; import java.util.List; import java.util.Map; @@ -7,7 +7,8 @@ import java.util.Map; import javax.ejb.Local; import javax.ejb.Remote; -import com.idcanet.vasc.xpql.query.Query; +import org.x4o.vasc.xpql.query.Query; + /** * diff --git a/vasc-xpql-ejb3/src/main/java/com/idcanet/vasc/xpql/ejb3/XpqlQueryManagerImpl.java b/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManagerImpl.java similarity index 96% rename from vasc-xpql-ejb3/src/main/java/com/idcanet/vasc/xpql/ejb3/XpqlQueryManagerImpl.java rename to vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManagerImpl.java index 8dc8d30..319916c 100644 --- a/vasc-xpql-ejb3/src/main/java/com/idcanet/vasc/xpql/ejb3/XpqlQueryManagerImpl.java +++ b/vasc-xpql-ejb3/src/main/java/org/x4o/vasc/xpql/ejb3/XpqlQueryManagerImpl.java @@ -1,5 +1,5 @@ -package com.idcanet.vasc.xpql.ejb3; +package org.x4o.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 com.idcanet.vasc.xpql.QueryStore; -import com.idcanet.vasc.xpql.XPQLParser; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryParameterValue; +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; + /** * @@ -307,9 +308,6 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa throw new IllegalStateException("unknow query type"); } - /** - * @see com.idcanet.showplanner.ejb.services.XtesManagerLocal#executeUpdate(java.lang.String, java.lang.String, java.util.Map) - */ public Integer executeUpdate(String name,Map parameters) { Query query = getQuery(name); for (String key:parameters.keySet()) { diff --git a/vasc-xpql/.classpath b/vasc-xpql/.classpath index f42fb64..7106942 100644 --- a/vasc-xpql/.classpath +++ b/vasc-xpql/.classpath @@ -5,6 +5,7 @@ + diff --git a/vasc-xpql/.settings/org.eclipse.core.resources.prefs b/vasc-xpql/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..155f2f0 --- /dev/null +++ b/vasc-xpql/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +#Sun Dec 25 17:29:06 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-xpql/.settings/org.eclipse.m2e.core.prefs b/vasc-xpql/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f91215d --- /dev/null +++ b/vasc-xpql/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,5 @@ +#Sun Dec 25 17:29:03 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vasc-xpql/pom.xml b/vasc-xpql/pom.xml index 996d170..a30c922 100644 --- a/vasc-xpql/pom.xml +++ b/vasc-xpql/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - vasc-base - com.idcanet.vasc + vasc + org.x4o.vasc 0.3.5-SNAPSHOT - com.idcanet.vasc + org.x4o.vasc vasc-xpql 0.3.5-SNAPSHOT vasc-xpql vasc xpql parser for queries. - com.idcanet.x4o + org.x4o x4o-core ${x4o-core.version} @@ -23,14 +23,5 @@ 2.1 provided - \ No newline at end of file diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/QueryStore.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/QueryStore.java similarity index 96% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/QueryStore.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/QueryStore.java index 3ea4c58..3c1aabd 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/QueryStore.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/QueryStore.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql; +package org.x4o.vasc.xpql; import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.idcanet.vasc.xpql.query.Query; +import org.x4o.vasc.xpql.query.Query; + /** * Holds all the queries. diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/XPQLParser.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/XPQLParser.java similarity index 95% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/XPQLParser.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/XPQLParser.java index 63e244a..f04dc04 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/XPQLParser.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/XPQLParser.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql; +package org.x4o.vasc.xpql; import javax.el.ValueExpression; -import com.idcanet.x4o.core.X4OParser; -import com.idcanet.x4o.element.ElementContext; +import org.x4o.xml.core.X4OParser; +import org.x4o.xml.element.ElementContext; /** * Parse an xpql file/resource diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/DefaultQuery.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQuery.java similarity index 90% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/DefaultQuery.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQuery.java index fe9a7f0..0e2e626 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/DefaultQuery.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQuery.java @@ -24,12 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl; +package org.x4o.vasc.xpql.impl; -import com.idcanet.vasc.xpql.query.AbstractQuery; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryParameterValue; -import com.idcanet.vasc.xpql.query.QueryPart; +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; /** * This class defines an executable SQL query. @@ -48,7 +48,7 @@ public class DefaultQuery extends AbstractQuery { // ========= QueryPart interface /** - * @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toEdit() + * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toEdit() */ @Override public String toEdit(Query query) { @@ -60,7 +60,7 @@ public class DefaultQuery extends AbstractQuery { } /** - * @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toPreparedSQL() + * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toPreparedSQL() */ @Override public String toPreparedSQL(Query query) { @@ -73,7 +73,7 @@ public class DefaultQuery extends AbstractQuery { } /** - * @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toSQL() + * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toSQL() */ @Override public String toSQL(Query query) { @@ -85,7 +85,7 @@ public class DefaultQuery extends AbstractQuery { } /** - * @see com.idcanet.xtes.xpql.query.AbstractQueryPart#toXML() + * @see org.x4o.vasc.xpql.query.AbstractQueryPart#toXML() */ @Override public String toXML(Query query) { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/DefaultQueryParameterValue.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQueryParameterValue.java similarity index 92% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/DefaultQueryParameterValue.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQueryParameterValue.java index 5a285c5..b2b3b0d 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/DefaultQueryParameterValue.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/DefaultQueryParameterValue.java @@ -24,10 +24,10 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl; +package org.x4o.vasc.xpql.impl; -import com.idcanet.vasc.xpql.query.AbstractQueryParameterValue; -import com.idcanet.vasc.xpql.query.QueryParameterValue; +import org.x4o.vasc.xpql.query.AbstractQueryParameterValue; +import org.x4o.vasc.xpql.query.QueryParameterValue; /** * diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryInclude.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryInclude.java similarity index 93% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryInclude.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryInclude.java index eafd263..65b9fa1 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryInclude.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryInclude.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl; +package org.x4o.vasc.xpql.impl; + +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; -import com.idcanet.vasc.xpql.XPQLParser; -import com.idcanet.vasc.xpql.query.AbstractQueryPart; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryPart; /** * Handled included query parts diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryParameter.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryParameter.java similarity index 96% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryParameter.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryParameter.java index 3140ae8..e3d0b6c 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryParameter.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryParameter.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl; +package org.x4o.vasc.xpql.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.idcanet.vasc.xpql.query.AbstractQueryPart; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryParameterValue; -import com.idcanet.vasc.xpql.query.QueryPart; +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; + /** * diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryText.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryText.java similarity index 92% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryText.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryText.java index a73d3f0..58f2e56 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/QueryText.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/QueryText.java @@ -24,11 +24,11 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl; +package org.x4o.vasc.xpql.impl; -import com.idcanet.vasc.xpql.query.AbstractQueryPart; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryPart; +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/com/idcanet/vasc/xpql/impl/x4o/CommentElement.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/CommentElement.java similarity index 85% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/CommentElement.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/CommentElement.java index 7f68ce9..f69f96c 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/CommentElement.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/CommentElement.java @@ -24,11 +24,12 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +import org.x4o.vasc.xpql.query.Query; +import org.x4o.xml.element.AbstractElement; +import org.x4o.xml.element.ElementException; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; -import com.idcanet.vasc.xpql.query.Query; /** * @@ -45,7 +46,7 @@ public class CommentElement extends AbstractElement { } /** - * @see com.idcanet.x4o.element.AbstractElement#doCharacters(java.lang.String) + * @see org.x4o.xml.element.AbstractElement#doCharacters(java.lang.String) */ @Override public void doCharacters(String arg0) { @@ -53,7 +54,7 @@ public class CommentElement extends AbstractElement { } /** - * @see com.idcanet.x4o.element.AbstractElement#doComment(java.lang.String) + * @see org.x4o.xml.element.AbstractElement#doComment(java.lang.String) */ @Override public void doComment(String arg0) { @@ -61,7 +62,7 @@ public class CommentElement extends AbstractElement { } /** - * @see com.idcanet.x4o.element.AbstractElement#doElementEnd() + * @see org.x4o.xml.element.AbstractElement#doElementEnd() */ @Override public void doElementEnd() throws ElementException { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java similarity index 82% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java index 527d41e..a7b0fdf 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/ParameterTypeAttributeConverter.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +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; -import com.idcanet.x4o.element.AbstractElementAttributeConverter; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementAttributeConverterException; -import com.idcanet.vasc.xpql.query.QueryParameterValue.QueryParameterType; /** * @@ -39,7 +40,7 @@ import com.idcanet.vasc.xpql.query.QueryParameterValue.QueryParameterType; public class ParameterTypeAttributeConverter extends AbstractElementAttributeConverter { /** - * @see com.idcanet.x4o.element.AbstractElementClassParameterConverter#doConvertAttribute(com.idcanet.x4o.element.Element, java.lang.Object) + * @see org.x4o.xml.element.AbstractElementClassParameterConverter#doConvertAttribute(org.x4o.xml.element.Element, java.lang.Object) */ public Object doConvertAttribute(Element arg0, Object value) throws ElementAttributeConverterException { try { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryBindingHandler.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryBindingHandler.java similarity index 87% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryBindingHandler.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryBindingHandler.java index fcd0744..796c54b 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryBindingHandler.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryBindingHandler.java @@ -24,16 +24,17 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +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; -import com.idcanet.x4o.element.AbstractElementBindingHandler; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementBindingHandlerException; -import com.idcanet.vasc.xpql.impl.QueryInclude; -import com.idcanet.vasc.xpql.impl.QueryParameter; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryParameterValue; -import com.idcanet.vasc.xpql.query.QueryPart; /** * diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryElementConfigurator.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryElementConfigurator.java similarity index 83% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryElementConfigurator.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryElementConfigurator.java index 1ba933b..b8b242e 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryElementConfigurator.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryElementConfigurator.java @@ -24,14 +24,15 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +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; -import com.idcanet.x4o.element.AbstractElementConfigurator; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementConfiguratorException; -import com.idcanet.vasc.xpql.QueryStore; -import com.idcanet.vasc.xpql.XPQLParser; -import com.idcanet.vasc.xpql.query.Query; /** * @@ -41,7 +42,7 @@ import com.idcanet.vasc.xpql.query.Query; public class QueryElementConfigurator extends AbstractElementConfigurator { /** - * @see com.idcanet.x4o.element.ElementConfigurator#doConfigElement(com.idcanet.x4o.element.Element) + * @see org.x4o.xml.element.ElementConfigurator#doConfigElement(org.x4o.xml.element.Element) */ public void doConfigElement(Element element) throws ElementConfiguratorException { if ((element.getElementObject() instanceof Query)==false) { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryIncludeElement.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryIncludeElement.java similarity index 88% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryIncludeElement.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryIncludeElement.java index 95dba0a..1d20310 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryIncludeElement.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryIncludeElement.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +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; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryPart; /** * Inserts the query inlude element direct on start-tag @@ -40,7 +41,7 @@ import com.idcanet.vasc.xpql.query.QueryPart; public class QueryIncludeElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementEnd() + * @see org.x4o.xml.element.AbstractElement#doElementEnd() */ @Override public void doElementStart() throws ElementException { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryParameterElement.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryParameterElement.java similarity index 88% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryParameterElement.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryParameterElement.java index c0352a1..d9fc9e5 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryParameterElement.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryParameterElement.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +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; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; -import com.idcanet.vasc.xpql.query.Query; -import com.idcanet.vasc.xpql.query.QueryPart; /** * Inserts the query element direct on start-tag @@ -40,7 +41,7 @@ import com.idcanet.vasc.xpql.query.QueryPart; public class QueryParameterElement extends AbstractElement { /** - * @see com.idcanet.x4o.element.AbstractElement#doElementEnd() + * @see org.x4o.xml.element.AbstractElement#doElementEnd() */ @Override public void doElementStart() throws ElementException { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java similarity index 83% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java index 5583243..2cbf8cd 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/QueryTypeAttributeConverter.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +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; -import com.idcanet.x4o.element.AbstractElementAttributeConverter; -import com.idcanet.x4o.element.Element; -import com.idcanet.x4o.element.ElementAttributeConverterException; -import com.idcanet.vasc.xpql.query.Query.QueryType; /** * @@ -39,7 +40,7 @@ import com.idcanet.vasc.xpql.query.Query.QueryType; public class QueryTypeAttributeConverter extends AbstractElementAttributeConverter { /** - * @see com.idcanet.x4o.element.AbstractElementClassParameterConverter#doConvertAttribute(com.idcanet.x4o.element.Element, java.lang.Object) + * @see org.x4o.xml.element.AbstractElementClassParameterConverter#doConvertAttribute(org.vasc.x4o.element.Element, java.lang.Object) */ public Object doConvertAttribute(Element arg0, Object value) throws ElementAttributeConverterException { try { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/SQLElement.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/SQLElement.java similarity index 84% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/SQLElement.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/SQLElement.java index f7b63a8..7085384 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/impl/x4o/SQLElement.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/impl/x4o/SQLElement.java @@ -24,12 +24,13 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.impl.x4o; +package org.x4o.vasc.xpql.impl.x4o; + +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; -import com.idcanet.x4o.element.AbstractElement; -import com.idcanet.x4o.element.ElementException; -import com.idcanet.vasc.xpql.impl.QueryText; -import com.idcanet.vasc.xpql.query.Query; /** * @@ -46,7 +47,7 @@ public class SQLElement extends AbstractElement { } /** - * @see com.idcanet.x4o.element.AbstractElement#doCharacters(java.lang.String) + * @see org.x4o.xml.element.AbstractElement#doCharacters(java.lang.String) */ @Override public void doCharacters(String text) throws ElementException { @@ -62,7 +63,7 @@ public class SQLElement extends AbstractElement { } /** - * @see com.idcanet.x4o.element.AbstractElement#doComment(java.lang.String) + * @see org.x4o.xml.element.AbstractElement#doComment(java.lang.String) */ @Override public void doComment(String arg0) { @@ -70,7 +71,7 @@ public class SQLElement extends AbstractElement { } /** - * @see com.idcanet.x4o.element.AbstractElement#getElementObject() + * @see org.x4o.xml.element.AbstractElement#getElementObject() */ @Override public Object getElementObject() { diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQuery.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQuery.java similarity index 75% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQuery.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQuery.java index 8727889..ae67e06 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQuery.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQuery.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.query; +package org.x4o.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 com.idcanet.vasc.xpql.QueryStore; -import com.idcanet.vasc.xpql.impl.DefaultQueryParameterValue; +import org.x4o.vasc.xpql.QueryStore; +import org.x4o.vasc.xpql.impl.DefaultQueryParameterValue; + /** * @@ -66,133 +67,133 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { } /** - * @see com.idcanet.xtes.xpql.query.Query#getName() + * @see org.x4o.vasc.xpql.query.Query#getName() */ public String getName() { return name; } /** - * @see com.idcanet.xtes.xpql.query.Query#setName(java.lang.String) + * @see org.x4o.vasc.xpql.query.Query#setName(java.lang.String) */ public void setName(String name) { this.name=name; } /** - * @see com.idcanet.xtes.xpql.query.Query#addQueryComment(java.lang.String) + * @see org.x4o.vasc.xpql.query.Query#addQueryComment(java.lang.String) */ public void addQueryComment(String comment) { queryComments.add(comment); } /** - * @see com.idcanet.xtes.xpql.query.Query#addQueryParameterValue(com.idcanet.xtes.xpql.query.QueryParameterValue) + * @see org.x4o.vasc.xpql.query.Query#addQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue) */ public void addQueryParameterValue(QueryParameterValue value) { queryParameterValues.put(value.getName(), value); } /** - * @see com.idcanet.xtes.xpql.query.Query#addLocalQueryParameterValue(com.idcanet.xtes.xpql.query.QueryParameterValue) + * @see org.x4o.vasc.xpql.query.Query#addLocalQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue) */ public void addLocalQueryParameterValue(QueryParameterValue value) { localQueryParameterValues.put(value.getName(), value); } /** - * @see com.idcanet.xtes.xpql.query.Query#addOrderQueryParameterValue(com.idcanet.xtes.xpql.query.QueryParameterValue) + * @see org.x4o.vasc.xpql.query.Query#addOrderQueryParameterValue(org.x4o.vasc.xpql.query.QueryParameterValue) */ public void addOrderQueryParameterValue(QueryParameterValue value) { orderQueryParameterValues.add(value); } /** - * @see com.idcanet.xtes.xpql.query.Query#addQueryPart(com.idcanet.xtes.xpql.query.QueryPart) + * @see org.x4o.vasc.xpql.query.Query#addQueryPart(org.x4o.vasc.xpql.query.QueryPart) */ public void addQueryPart(QueryPart queryPart) { queryParts.add(queryPart); } /** - * @see com.idcanet.xtes.xpql.query.Query#getProperty(java.lang.String) + * @see org.x4o.vasc.xpql.query.Query#getProperty(java.lang.String) */ public Object getProperty(String name) { return properties.get(name); } /** - * @see com.idcanet.xtes.xpql.query.Query#getPropertyString(java.lang.String) + * @see org.x4o.vasc.xpql.query.Query#getPropertyString(java.lang.String) */ public String getPropertyString(String name) { return getProperty(name).toString(); } /** - * @see com.idcanet.xtes.xpql.query.Query#getQueryComments() + * @see org.x4o.vasc.xpql.query.Query#getQueryComments() */ public List getQueryComments() { return queryComments; } /** - * @see com.idcanet.xtes.xpql.query.Query#getQueryParameterValue(java.lang.String) + * @see org.x4o.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String) */ public QueryParameterValue getQueryParameterValue(String name) { return queryParameterValues.get(name); } /** - * @see com.idcanet.xtes.xpql.query.Query#getQueryParts() + * @see org.x4o.vasc.xpql.query.Query#getQueryParts() */ public List getQueryParts() { return queryParts; } /** - * @see com.idcanet.xtes.xpql.query.Query#setProperty(java.lang.String, java.lang.Object) + * @see org.x4o.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object) */ public void setProperty(String name, Object value) { properties.put(name,value); } /** - * @see com.idcanet.xtes.xpql.query.Query#getPropertyKeys() + * @see org.x4o.vasc.xpql.query.Query#getPropertyKeys() */ public Collection getPropertyKeys() { return properties.keySet(); } /** - * @see com.idcanet.xtes.xpql.query.Query#getQueryParameters() + * @see org.x4o.vasc.xpql.query.Query#getQueryParameters() */ public List getQueryParameters() { return null; } /** - * @see com.idcanet.xtes.xpql.query.Query#getQueryParameterValues() + * @see org.x4o.vasc.xpql.query.Query#getQueryParameterValues() */ public Collection getQueryParameterValues() { return queryParameterValues.values(); } /** - * @see com.idcanet.xtes.xpql.query.Query#getLocalQueryParameterValues() + * @see org.x4o.vasc.xpql.query.Query#getLocalQueryParameterValues() */ public Collection getLocalQueryParameterValues() { return localQueryParameterValues.values(); } /** - * @see com.idcanet.xtes.xpql.query.Query#getOrderQueryParameterValues() + * @see org.x4o.vasc.xpql.query.Query#getOrderQueryParameterValues() */ public List getOrderQueryParameterValues() { return orderQueryParameterValues; } /** - * @see com.idcanet.xtes.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object) + * @see org.x4o.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object) */ public void setQueryParameter(String name, Object value) { if (name==null) { @@ -228,28 +229,28 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { } /** - * @see com.idcanet.xtes.xpql.query.Query#getType() + * @see org.x4o.vasc.xpql.query.Query#getType() */ public QueryType getType() { return type; } /** - * @see com.idcanet.xtes.xpql.query.Query#setType(com.idcanet.xtes.xpql.query.Query.QueryType) + * @see org.x4o.vasc.xpql.query.Query#setType(org.x4o.vasc.xpql.query.Query.QueryType) */ public void setType(QueryType type) { this.type=type; } /** - * @see com.idcanet.xtes.xpql.query.Query#getQueryStore() + * @see org.x4o.vasc.xpql.query.Query#getQueryStore() */ public QueryStore getQueryStore() { return queryStore; } /** - * @see com.idcanet.xtes.xpql.query.Query#setQueryStore(com.idcanet.xtes.xpql.QueryStore) + * @see org.x4o.vasc.xpql.query.Query#setQueryStore(org.x4o.vasc.xpql.query.QueryStore) */ public void setQueryStore(QueryStore store) { this.queryStore=store; diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQueryParameterValue.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryParameterValue.java similarity index 79% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQueryParameterValue.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryParameterValue.java index 37372d0..35f9ceb 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQueryParameterValue.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryParameterValue.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.query; +package org.x4o.vasc.xpql.query; /** * @@ -40,56 +40,56 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue private Class valueType = null; /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#getName() + * @see org.x4o.vasc.xpql.query.QueryParameterValue#getName() */ public String getName() { return name; } /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#setName(java.lang.String) + * @see org.x4o.vasc.xpql.query.QueryParameterValue#setName(java.lang.String) */ public void setName(String name) { this.name=name; } /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#getDefaultValue() + * @see org.x4o.vasc.xpql.query.QueryParameterValue#getDefaultValue() */ public Object getDefaultValue() { return defaultValue; } /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object) + * @see org.x4o.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object) */ public void setDefaultValue(Object defaultValue) { this.defaultValue=defaultValue; } /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#getValue() + * @see org.x4o.vasc.xpql.query.QueryParameterValue#getValue() */ public Object getValue() { return value; } /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#setType(com.idcanet.xtes.xpql.query.QueryParameterValue.QueryParameterType) + * @see org.x4o.vasc.xpql.query.QueryParameterValue#setType(org.x4o.vasc.xpql.query.QueryParameterValue.QueryParameterType) */ public void setType(QueryParameterType type) { this.type=type; } /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#getType() + * @see org.x4o.vasc.xpql.query.QueryParameterValue#getType() */ public QueryParameterType getType() { return type; } /** - * @see com.idcanet.xtes.xpql.query.QueryParameterValue#setValue(java.lang.Object) + * @see org.x4o.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object) */ public void setValue(Object value) { this.value=value; diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQueryPart.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryPart.java similarity index 90% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQueryPart.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryPart.java index 9aa2b2c..ac097f5 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/AbstractQueryPart.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/AbstractQueryPart.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.query; +package org.x4o.vasc.xpql.query; /** * @@ -34,13 +34,13 @@ package com.idcanet.vasc.xpql.query; abstract public class AbstractQueryPart implements QueryPart { /** - * @see com.idcanet.xtes.xpql.query.QueryPart#toSQL() + * @see org.x4o.vasc.xpql.query.QueryPart#toSQL() */ abstract public String toSQL(Query query); /** * Returns the toSQL() retult. - * @see com.idcanet.xtes.xpql.query.QueryPart#toPreparedSQL() + * @see org.x4o.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 com.idcanet.xtes.xpql.query.QueryPart#toXML() + * @see org.x4o.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 com.idcanet.xtes.xpql.query.QueryPart#toEdit() + * @see org.x4o.vasc.xpql.query.QueryPart#toEdit() */ public String toEdit(Query query) { return toSQL(query); diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/Query.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/Query.java similarity index 97% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/Query.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/Query.java index c96cdd4..fcd588e 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/Query.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/Query.java @@ -24,13 +24,14 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.query; +package org.x4o.vasc.xpql.query; import java.util.Collection; import java.util.List; import java.util.Map; -import com.idcanet.vasc.xpql.QueryStore; +import org.x4o.vasc.xpql.QueryStore; + /** * TODO: add clonale support diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/QueryParameterValue.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryParameterValue.java similarity index 98% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/QueryParameterValue.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryParameterValue.java index fb1ea87..27c683f 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/QueryParameterValue.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryParameterValue.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.query; +package org.x4o.vasc.xpql.query; /** * A QueryParameterValue diff --git a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/QueryPart.java b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryPart.java similarity index 98% rename from vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/QueryPart.java rename to vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryPart.java index 3a296f3..455e8b6 100644 --- a/vasc-xpql/src/main/java/com/idcanet/vasc/xpql/query/QueryPart.java +++ b/vasc-xpql/src/main/java/org/x4o/vasc/xpql/query/QueryPart.java @@ -24,7 +24,7 @@ * should not be interpreted as representing official policies, either expressed or implied, of IDCA. */ -package com.idcanet.vasc.xpql.query; +package org.x4o.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 670b0e4..4804cc5 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 @@ -25,27 +25,27 @@ should not be interpreted as representing official policies, either expressed or implied, of IDCA. - elementClassName="com.idcanet.vasc.xpql.impl.x4o.QueryElement" + 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 d29c852..3f67fa2 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 -com.idcanet.x4o = ALL +org.x4o = ALL # Java 6 has internal logging on many builtin libs sun.level=OFF