From: Roland Haeder Date: Thu, 10 Sep 2015 20:13:41 +0000 (+0200) Subject: updated jars + added install.sql from war project + updated translation keys X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b41e81929c24fc6ee440b8542962ee0ec3206fd7;p=pizzaservice.git updated jars + added install.sql from war project + updated translation keys Signed-off-by:Roland Häder --- diff --git a/PizzaService-ejb/lib/jcore-ee-logger.jar b/PizzaService-ejb/lib/jcore-ee-logger.jar index c652122..6160458 100644 Binary files a/PizzaService-ejb/lib/jcore-ee-logger.jar and b/PizzaService-ejb/lib/jcore-ee-logger.jar differ diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar index de27ca6..00e90e1 100644 Binary files a/PizzaService-ejb/lib/jcore.jar and b/PizzaService-ejb/lib/jcore.jar differ diff --git a/PizzaService-ejb/lib/jcoreee.jar b/PizzaService-ejb/lib/jcoreee.jar index 935a2c9..3186bb6 100644 Binary files a/PizzaService-ejb/lib/jcoreee.jar and b/PizzaService-ejb/lib/jcoreee.jar differ diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar index 4b07e19..1b9d6e3 100644 Binary files a/PizzaService-ejb/lib/jshop-core.jar and b/PizzaService-ejb/lib/jshop-core.jar differ diff --git a/PizzaService-ejb/lib/jshop-ee-lib.jar b/PizzaService-ejb/lib/jshop-ee-lib.jar index f077244..268d352 100644 Binary files a/PizzaService-ejb/lib/jshop-ee-lib.jar and b/PizzaService-ejb/lib/jshop-ee-lib.jar differ diff --git a/install/install.sql b/install/install.sql new file mode 100644 index 0000000..e8e4009 --- /dev/null +++ b/install/install.sql @@ -0,0 +1,58 @@ +DROP TABLE IF EXISTS `category`; +CREATE TABLE IF NOT EXISTS `category` ( +`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', + `title` varchar(255) NOT NULL COMMENT 'Category title', + `parent` bigint(20) unsigned DEFAULT NULL COMMENT 'Parent category', + PRIMARY KEY (`id`), + INDEX `parent` (`parent`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Categories' ; + +DROP TABLE IF EXISTS `contacts`; +CREATE TABLE IF NOT EXISTS `contacts` ( +`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', + `own_contact` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether own contact', + `gender` varchar(10) NOT NULL DEFAULT 'UNKNOWN' COMMENT 'Gender', + `first_name` varchar(100) NOT NULL COMMENT 'First name', + `family_name` varchar(100) NOT NULL COMMENT 'Family name', + `company_name` varchar(255) DEFAULT NULL COMMENT 'Company name', + `street` varchar(255) DEFAULT NULL COMMENT 'Street name', + `house_number` smallint(5) unsigned DEFAULT NULL COMMENT 'House number', + `city` varchar(100) DEFAULT NULL COMMENT 'City name', + `zip_code` smallint(5) unsigned DEFAULT NULL COMMENT 'ZIP code', + `country_code` char(2) DEFAULT NULL COMMENT 'Country code', + `phone_number` varchar(100) DEFAULT NULL COMMENT 'Phone number', + `cellphone_number` varchar(100) DEFAULT NULL COMMENT 'Cellphone number', + `fax_number` varchar(100) DEFAULT NULL COMMENT 'Fax number', + `email_address` varchar(100) DEFAULT NULL COMMENT 'Email addres', + `birthday` date DEFAULT NULL COMMENT 'Birth day', + `comment` tinytext NOT NULL COMMENT 'Comment', + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Entry created', + `updated` timestamp NULL DEFAULT NULL COMMENT 'Entry updated', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Contacts data' ; + +DROP TABLE IF EXISTS `products`; +CREATE TABLE IF NOT EXISTS `products` ( +`id` bigint(20) unsigned NOT NULL COMMENT 'Primary key', + `category` bigint(20) unsigned DEFAULT NULL COMMENT 'Category id', + `title` varchar(255) NOT NULL COMMENT 'Title of product', + `price` decimal(20,2) unsigned NOT NULL COMMENT 'Product price', + `available` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Whether product is available', + PRIMARY KEY (`id`), + INDEX `category` (`category`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Products' ; + +ALTER TABLE `category` +MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; + +ALTER TABLE `contacts` +MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; + +ALTER TABLE `products` +MODIFY `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key'; + +ALTER TABLE `category` +ADD FOREIGN KEY (`parent`) REFERENCES `category` (`id`) ON DELETE SET NULL; + +ALTER TABLE `products` +ADD FOREIGN KEY (`category`) REFERENCES `category` (`id`) ON DELETE SET NULL; diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index f13ba23..8d0fabd 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -12,10 +12,10 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -BaseContact.gender.unknown.text=Unbekannt -BaseContact.gender.male.text=Herr -BaseContact.gender.female.text=Frau -BaseContact.gender.company.text=Firma +GENDER_UNKNOWN=Unbekannt +GENDER_MALE=Herr +GENDER_FEMALE=Frau +GENDER_COMPANY=Firma MiniBasketTag.basket_is_empty=Der Warenkorb ist leer. MiniBasketTag.last_item=Zuletzt hinzugefügt: {0} MiniBasketTag.additional_items=Es befinden sich noch {0} weitere Produkte im Warenkorb. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 1dc4212..408943a 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -12,10 +12,10 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -BaseContact.gender.unknown.text=Unknown -BaseContact.gender.male.text=Mr. -BaseContact.gender.female.text=Mrs. -BaseContact.gender.company.text=Company +GENDER_UNKNOWN=Unknown +GENDER_MALE=Mr. +GENDER_FEMALE=Mrs. +GENDER_COMPANY=Company MiniBasketTag.basket_is_empty=The basket is empty. MiniBasketTag.last_item=Last added item: {0} MiniBasketTag.additional_items=There are {0} items in the basket.