Author: bbrossaud Date: 2010-07-21 11:52:53 +0200 (Wed, 21 Jul 2010) New Revision: 111 Url: http://chorem.org/repositories/revision/bonzoms/111 Log: changed interface and removed errors Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/index.zul trunk/bonzoms-ui-zk/transaction.log Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java 2010-07-21 09:52:53 UTC (rev 111) @@ -5,6 +5,7 @@ import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.EmploymentContractImpl; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; @@ -20,16 +21,32 @@ protected List<EmploymentContract> save = new ArrayList<EmploymentContract>(); protected Listbox contractListbox; + public final static String EVENT_ON_SAVE_CONTRACTS = "onSaveContracts"; + @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - contractsData = (ContractsData) arg.get("contractsData"); - save = new ArrayList<EmploymentContract>(contractsData.getContractsList()); + ContractsData data = (ContractsData) arg.get("contractsData"); + if (data != null) { + initContracts(data); + } else { + initDefaultContracts(); + } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } + protected void initDefaultContracts() { + EmploymentContract contract = new EmploymentContractImpl(); + contractsData.getContractsModel().addData(contract); + } + + protected void initContracts(ContractsData data) { + contractsData = data; + save = new ArrayList<EmploymentContract>(contractsData.getContractsList()); + } + /* * Events */ @@ -50,6 +67,11 @@ } } + public void onClick$save() { + Events.postEvent(EVENT_ON_SAVE_CONTRACTS, this.self, contractsData); + self.detach(); + } + /* * Getters */ @@ -60,8 +82,4 @@ public void onClose() { contractsData.setContractsList(save); } - - public void onClick$save() { - self.detach(); - } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java 2010-07-21 09:52:53 UTC (rev 111) @@ -13,6 +13,14 @@ protected ContractsModel contractsModel = new ContractsModel(); protected List<String> removedContracts = new ArrayList<String>(); + public ContractsData() {} + + public ContractsData(List<EmploymentContract> contracts) { + if (contracts != null) { + contractsModel.setContracts(contracts); + } + } + /* * Setters */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-21 09:52:53 UTC (rev 111) @@ -70,11 +70,14 @@ public void createEmployeeDataList(List<Employee> employees) { for (Employee employee : employees) { Address address = _model.retrieveAddressById(employee.getAddress()); + EmployeeData data = new EmployeeData(employee, address); + Person person = _model.retrievePersonById(employee.getPerson()); - List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(person.getAddress())); - EmployeeData data = new EmployeeData(employee, address); - data.getPersonData().setAddresses(addresses); - data.getPersonData().setPerson(person); + if (person != null) { + List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(person.getAddress())); + PersonData personData = new PersonData(person, addresses); + data.setPersonData(personData); + } _employeeModel.addData(data); } } @@ -119,10 +122,17 @@ item.setValue(data); final EmployeeData employeeData = (EmployeeData) data; - Listcell firstNameCell = new Listcell(employeeData.getPerson().getFirstName()); - Listcell lastNameCell = new Listcell(employeeData.getPerson().getLastName()); + String firstName = ""; + String lastName = ""; + if (employeeData.getPersonData() != null) { + firstName = employeeData.getPerson().getFirstName(); + lastName = employeeData.getPerson().getLastName(); + } + Listcell firstNameCell = new Listcell(firstName); + Listcell lastNameCell = new Listcell(lastName); Listcell emailCell = new Listcell(employeeData.getEmployee().getWorkingEmail()); Listcell phoneCell = new Listcell(employeeData.getEmployee().getWorkingPhone()); + Listcell detailsCell = new Listcell(); Button details = new Button("details"); detailsCell.appendChild(details); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java 2010-07-21 09:52:53 UTC (rev 111) @@ -41,10 +41,10 @@ protected Employee employee = new EmployeeImpl(); protected Address workingAddress = new AddressImpl(); - protected PersonData personData = new PersonData(); - protected ServiceData serviceData = new ServiceData(); + protected PersonData personData = null; + protected ServiceData serviceData = null; - protected ContractsData contractsData = new ContractsData(); + protected ContractsData contractsData = null; public EmployeeData() { } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-21 09:52:53 UTC (rev 111) @@ -27,16 +27,18 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Employee; import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.EmploymentContractImpl; -import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.Service; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.SuspendNotAllowedException; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; @@ -71,45 +73,37 @@ } protected void init(EmployeeData employeeData) { - if (employeeData == null) { - initDefaultEmployee(); - } else { + if (employeeData != null) { initEmployee(employeeData); } } - protected void initDefaultEmployee() { - Address address = new AddressImpl(); - _employeeData.getPersonAddressesModel().addData(address); - - Phone phone = new Phone(); - _employeeData.getPersonPhonesModel().addData(phone); - - Email email = new Email(); - _employeeData.getPersonEmailsModel().addData(email); - - EmploymentContract contract = new EmploymentContractImpl(); - _employeeData.getContractsModel().addData(contract); - } - protected void initPerson() { - List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(_employeeData.getPerson().getAddress())); - _employeeData.setPersonAddresses(addresses); - _employeeData.setPersonEmailsModelList(_employeeData.getPerson().getEmails()); - _employeeData.setPersonPhonesModelList(_employeeData.getPerson().getPhones()); + if (_employeeData.getPersonData() != null) { + List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(_employeeData.getPerson().getAddress())); + _employeeData.setPersonAddresses(addresses); + _employeeData.setPersonEmailsModelList(_employeeData.getPerson().getEmails()); + _employeeData.setPersonPhonesModelList(_employeeData.getPerson().getPhones()); + } } protected void initService() { - Service service = _model.retrieveServiceById(_employeeData.getEmployee().getService()); - Address address = _model.retrieveAddressById(service.getAddress()); - _employeeData.setService(service); - _employeeData.setServiceAddress(address); + if (_employeeData.getServiceData() != null) { + Service service = _model.retrieveServiceById(_employeeData.getEmployee().getService()); + Address address = _model.retrieveAddressById(service.getAddress()); + _employeeData.setService(service); + _employeeData.setServiceAddress(address); + } } protected void initContracts() { - List<String> ids = new ArrayList<String>(_employeeData.getEmployee().getEmploymentContract()); - List<EmploymentContract> contracts = _model.retrieveContractsByIds(ids); - _employeeData.setContractsList(contracts); + Set<String> contractIds = _employeeData.getEmployee().getEmploymentContract(); + if (contractIds != null && !contractIds.isEmpty()) { + List<String> ids = new ArrayList<String>(contractIds); + List<EmploymentContract> contracts = _model.retrieveContractsByIds(ids); + ContractsData contractsData = new ContractsData(contracts); + _employeeData.setContractsData(contractsData); + } } protected void initEmployee(EmployeeData employee) { @@ -139,109 +133,28 @@ } protected void saveEmployeeContracts() { - List<EmploymentContract> contracts = _model.createContracts(_employeeData.getContractsList()); - if (!_employeeData.getRemovedContracts().isEmpty()) { - _model.deleteContractsByIds(_employeeData.getRemovedContracts()); - removeEmployeeContracts(); + if (_employeeData.getContractsData() != null) { + List<EmploymentContract> contracts = _model.createContracts(_employeeData.getContractsList()); + if (!_employeeData.getRemovedContracts().isEmpty()) { + _model.deleteContractsByIds(_employeeData.getRemovedContracts()); + removeEmployeeContracts(); + } + for (EmploymentContract contract : contracts) { + _employeeData.getEmployee().addEmploymentContract(contract.getWikittyId()); + } } - for (EmploymentContract contract : contracts) { - _employeeData.getEmployee().addEmploymentContract(contract.getWikittyId()); - } } - protected void saveEmployeeService() { - Address serviceAddress = _model.createAddress(_employeeData.getServiceAddress()); - _employeeData.getService().setAddress(serviceAddress.getWikittyId()); - Service service = _model.updateService(_employeeData.getService()); - _employeeData.getEmployee().setService(service.getWikittyId()); - } - - protected void savePersonAddresses() { - List<Address> addresses = _model.createAddresses(_employeeData.getPersonAddresses()); - if (!_employeeData.getPersonRemovedAddresses().isEmpty()) { - _model.deleteAddressesByIds(_employeeData.getPersonRemovedAddresses()); - removePersonAddresses(); - } - for (Address address : addresses) { - _employeeData.getPerson().addAddress(address.getWikittyId()); - } - } - - protected void savePersonEmails() { - String emails = _employeeData.getPersonEmailsModelAsString(); - _employeeData.getPerson().setEmails(emails); - } - - protected void savePersonPhones() { - String phones = _employeeData.getPersonPhonesModelAsString(); - _employeeData.getPerson().setPhones(phones); - } - - protected void saveEmployeePerson() { - savePersonAddresses(); - savePersonPhones(); - savePersonEmails(); - Person person = _model.createPerson(_employeeData.getPerson()); - _employeeData.setPerson(person); - _employeeData.getEmployee().setPerson(person.getWikittyId()); - } - /* * Events */ - public void onClick$addAddress() { - Address address = new AddressImpl(); - _employeeData.getPersonAddressesModel().addData(address); - } - public void onClick$deleteAddress() { - int size = addressListbox.getItemCount(); - if (size > 1) { - Address address = (Address) _employeeData.getPersonAddressesModel().getElementAt(size -1); - _employeeData.getPersonAddressesModel().removeData(address); - String id = address.getWikittyId(); - if (!id.isEmpty()) { - _employeeData.getPersonRemovedAddresses().add(id); - } - } - } - - public void onClick$addPhone() { - Phone phone = new Phone(); - _employeeData.getPersonPhonesModel().addData(phone); - } - - public void onClick$deletePhone() { - int size = phoneListbox.getItemCount(); - if (size > 1) { - Phone phone = (Phone) _employeeData.getPersonPhonesModel().getElementAt(size -1); - _employeeData.getPersonPhonesModel().removeData(phone); - } - } - - public void onClick$addEmail() { - Email email = new Email(); - _employeeData.getPersonEmailsModel().addData(email); - } - - public void onClick$deleteEmail() { - int size = emailListbox.getItemCount(); - if (size > 1) { - Email email = (Email) _employeeData.getPersonEmailsModel().getElementAt(size -1); - _employeeData.getPersonEmailsModel().removeData(email); - } - } - public void onClick$saveEmployee() { - saveEmployeePerson(); - saveEmployeeContracts(); - saveEmployeeService(); Address workingAddress = _model.updateAddress(_employeeData.getWorkingAddress()); - _employeeData.getEmployee().setAddress(workingAddress.getWikittyId()); + _employeeData.getEmployee().setAddress(workingAddress.getWikittyId()); - Service service = _model.updateService(_employeeData.getService()); - _employeeData.getEmployee().setService(service.getWikittyId()); + saveEmployeeContracts(); Employee employee = _model.createEmployee(_employeeData.getEmployee()); _employeeData.setEmployee(employee); @@ -251,10 +164,47 @@ this.self.detach(); } + public void onClick$editPerson() throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (_employeeData.getPersonData() != null) { + map.put("personData", _employeeData.getPersonData()); + } + Window win = (Window) Executions.createComponents("personFormPage.zul", null, map); + + win.addEventListener(PersonFormController.EVENT_ON_SAVE_PERSON, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + PersonData data = (PersonData) event.getData(); + if (data != null) { + _employeeData.setPersonData(data); + } + } + }); + + win.setPage(page); + win.setPosition("center"); + win.doModal(); + } + public void onClick$editContracts() throws SuspendNotAllowedException, InterruptedException { Map<String, Object> map = new HashMap<String, Object>(); - map.put("contractsData", _employeeData.getContractsData()); + if (_employeeData.getContractsData() != null) { + map.put("contractsData", _employeeData.getContractsData()); + } Window win = (Window) Executions.createComponents("contractFormPage.zul", null, map); + + win.addEventListener(ContractFormController.EVENT_ON_SAVE_CONTRACTS, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + ContractsData data = (ContractsData) event.getData(); + if (data != null) { + _employeeData.setContractsData(data); + } + } + }); + win.setPage(page); win.setPosition("center"); win.doModal(); @@ -262,8 +212,22 @@ public void onClick$editService() throws SuspendNotAllowedException, InterruptedException { Map<String, Object> map = new HashMap<String, Object>(); - map.put("serviceData", _employeeData.getServiceData()); + if (_employeeData.getServiceData() != null){ + map.put("serviceData", _employeeData.getServiceData()); + } Window win = (Window) Executions.createComponents("serviceFormPage.zul", null, map); + + win.addEventListener(ServiceFormController.EVENT_ON_SAVE_SERVICE, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + ServiceData data = (ServiceData) event.getData(); + if (data != null) { + _employeeData.setServiceData(data); + } + } + }); + win.setPage(page); win.setPosition("center"); win.doModal(); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-21 09:52:53 UTC (rev 111) @@ -43,6 +43,7 @@ public final static String COMPANY_WINDOW_ID = "company"; public final static String EMPLOYEE_WINDOW_ID ="employee"; public final static String PERSON_WINDOW_ID = "person"; + public final static String SERVICE_WINDOW_ID = "service"; @Override public void doAfterCompose(Component comp) throws Exception { @@ -68,6 +69,12 @@ content.appendChild(newContent); } + protected void createServicesPage(Map<String, Object> map) { + removeAllContentPage(); + Component newContent = Executions.createComponents("servicePage.zul", null, map); + content.appendChild(newContent); + } + protected void removeAllContentPage() { content.getLastChild().detach(); } @@ -94,6 +101,8 @@ createCompaniesPage(map); } else if (id.equals(PERSON_WINDOW_ID)) { createPersonsPage(map); + } else if (id.equals(SERVICE_WINDOW_ID)) { + createServicesPage(map); } } @@ -112,4 +121,8 @@ public void onClick$companies() { createCompaniesPage(new HashMap<String, Object>()); } + + public void onClick$services() { + createServicesPage(new HashMap<String, Object>()); + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-21 09:52:53 UTC (rev 111) @@ -87,7 +87,17 @@ return employees; } + public List<Service> retrieveAllServices() { + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Service.EXT_SERVICE).criteria(); + List<Service> services = proxy.findAllByCriteria(Service.class, criteria).getAll(); + services = new ArrayList<Service>(services); + return services; + } + public Person retrievePersonById(String id) { + if (id == null) { + return null; + } return proxy.restore(Person.class, id); } @@ -99,6 +109,9 @@ } public Address retrieveAddressById(String id) { + if (id == null || id.isEmpty()) { + return null; + } return proxy.restore(Address.class, id); } @@ -132,6 +145,12 @@ public List<Person> retrievePersonsBySearch(String search) { Criteria criteria = Search.query().keyword(search).criteria(); +// List<Address> addresses = proxy.findAllByCriteria(Address.class, criteria).getAll(); +// List<String> id = new ArrayList<String>(); +// for (Address address : addresses) { +// id.add(address.getWikittyId()); +// } +// criteria = Search.query().keyword(search).or().eq(Person.FQ_FIELD_ADDRESS, id).criteria(); List<Person> persons = proxy.findAllByCriteria(Person.class, criteria).getAll(); persons = new ArrayList<Person>(persons); return persons; @@ -144,6 +163,13 @@ return companies; } + public List<Service> retrieveServicesBySearch(String search) { + Criteria criteria = Search.query().keyword(search).criteria(); + List<Service> services = proxy.findAllByCriteria(Service.class, criteria).getAll(); + services = new ArrayList<Service>(services); + return services; + } + /* * Update */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-07-21 09:52:53 UTC (rev 111) @@ -81,6 +81,23 @@ map.put("personData", personData); } Window win = (Window) Executions.createComponents("personFormPage.zul", null, map); + + win.addEventListener(PersonFormController.EVENT_ON_SAVE_PERSON, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + PersonData data = (PersonData) event.getData(); + if (data != null) { + int rowIndex = personModel.indexOf(data); + if (rowIndex == -1) { + personModel.addData(data); + } else { + personModel.reloadContent(rowIndex); + } + } + } + }); + win.setPage(page); // win.doHighlighted(); win.setPosition("center"); @@ -88,7 +105,7 @@ win.doModal(); } - /* + /* * Events */ public void onClick$newPerson() throws SuspendNotAllowedException, InterruptedException { Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java 2010-07-21 09:52:53 UTC (rev 111) @@ -11,6 +11,7 @@ import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Person; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; @@ -30,7 +31,7 @@ protected Listbox phoneListbox; protected Listbox emailListbox; - public final static String EVENT_ON_SAVE_ = "onWhatever"; + public final static String EVENT_ON_SAVE_PERSON = "onSavePerson"; @Override public void doAfterCompose(Component comp) throws Exception { @@ -106,8 +107,53 @@ saveEmails(); Person person = model.createPerson(personData.getPerson()); personData.setPerson(person); + Events.postEvent(EVENT_ON_SAVE_PERSON, this.self, personData); + self.detach(); } + public void onClick$addAddress() { + Address address = new AddressImpl(); + personData.getAddressesModel().addData(address); + } + + public void onClick$deleteAddress() { + int size = addressListbox.getItemCount(); + if (size > 1) { + Address address = (Address) personData.getAddressesModel().getElementAt(size -1); + personData.getAddressesModel().removeData(address); + String id = address.getWikittyId(); + if (!id.isEmpty()) { + personData.getRemovedAddresses().add(id); + } + } + } + + public void onClick$addPhone() { + Phone phone = new Phone(); + personData.getPhonesModel().addData(phone); + } + + public void onClick$deletePhone() { + int size = phoneListbox.getItemCount(); + if (size > 1) { + Phone phone = (Phone) personData.getPhonesModel().getElementAt(size -1); + personData.getPhonesModel().removeData(phone); + } + } + + public void onClick$addEmail() { + Email email = new Email(); + personData.getEmailsModel().addData(email); + } + + public void onClick$deleteEmail() { + int size = emailListbox.getItemCount(); + if (size > 1) { + Email email = (Email) personData.getEmailsModel().getElementAt(size -1); + personData.getEmailsModel().removeData(email); + } + } + /* * Getters */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java 2010-07-21 09:52:53 UTC (rev 111) @@ -37,6 +37,17 @@ protected Service service = new ServiceImpl(); protected Address address = new AddressImpl(); + public ServiceData() {} + + public ServiceData(Service service, Address address) { + if (service != null) { + this.service = service; + } + if (address != null) { + this.address = address; + } + } + /* * Setters */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java 2010-07-21 09:52:53 UTC (rev 111) @@ -1,6 +1,9 @@ package org.chorem.bonzoms.ui; +import org.chorem.data.bonzoms.Address; +import org.chorem.data.bonzoms.Service; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; @@ -11,7 +14,11 @@ */ public class ServiceFormController extends GenericForwardComposer { + protected Model model = new Model(); + protected ServiceData serviceData = new ServiceData(); + + public final static String EVENT_ON_SAVE_SERVICE = "onSaveService"; @Override public void doAfterCompose(Component comp) throws Exception { @@ -26,6 +33,13 @@ * Events */ public void onClick$saveService() { + Address address = model.createAddress(serviceData.getAddress()); + serviceData.getService().setAddress(address.getWikittyId()); + Service service = model.updateService(serviceData.getService()); + serviceData.setService(service); + + Events.postEvent(EVENT_ON_SAVE_SERVICE, this.self, serviceData); + self.detach(); } Modified: trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-21 09:52:53 UTC (rev 111) @@ -1,13 +1,15 @@ <?page id="employeeForm" title="Employee form" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<window closable="true" maximizable="true" sizable="true" height="500px" width="400" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.EmployeeFormController"> +<window closable="true" maximizable="true" sizable="true" height="340px" width="400" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.EmployeeFormController"> <caption label="Employee"/> <groupbox> <caption label="Employee informations" /> <hbox> + <vbox> + <label value="email" /> <textbox value="@{composer.employeeData.employee.workingEmail, save-when='saveEmployee.onClick'}" constraint="/.+@.+\.[a-z]+/" /> <label value="Phone number" /> @@ -16,8 +18,11 @@ <toolbarbutton id="editContracts" label="Edit contracts" /> <separator /> <toolbarbutton id="editService" label="Edit service" /> + <separator /> + <toolbarbutton id="editPerson" label="Edit person" /> </vbox> + <groupbox> <caption label="Working address" /> <vbox> @@ -37,120 +42,8 @@ <textbox value="@{composer.employeeData.workingAddress.country, save-when='saveEmployee.onClick'}" /> </vbox> </groupbox> - </hbox> - </groupbox> - <separator /> - - <groupbox> - <caption label="Personnal informations" /> - <hbox> - <vbox> - <label value="First name" /> - <textbox value="@{composer.employeeData.person.firstName, save-when='saveEmployee.onClick'}" /> - <label value="Last name" /> - <textbox value="@{composer.employeeData.person.lastName, save-when='saveEmployee.onClick'}" /> - <label value="Birthday" /> - <datebox format="yyyy/MM/dd" value="@{composer.employeeData.person.birthDay, save-when='saveEmployee.onClick'}" /> - </vbox> - - <space /> - - <vbox> - <listbox id="addressListbox" model="@{composer.employeeData.personAddressesModel}" width="200px"> - <listitem self="@{each='address'}"> - <listcell> - <groupbox> - <caption label="@{address.name}" /> - <vbox> - - <label value="Name" /> - <textbox value="@{address.name, save-when='saveEmployee.onClick'}" /> - - <label value="Adress1" /> - <textbox value="@{address.address1, save-when='saveEmployee.onClick'}" /> - - <label value="Adress2" /> - <textbox value="@{address.address2, save-when='saveEmployee.onClick'}" /> - - <label value="Zip code" /> - <textbox value="@{address.zipCode, save-when='saveEmployee.onClick'}" /> - - <label value="City" /> - <textbox value="@{address.city, save-when='saveEmployee.onClick'}" /> - - <label value="Country" /> - <textbox value="@{address.country, save-when='saveEmployee.onClick'}" /> - - </vbox> - </groupbox> - </listcell> - </listitem> - </listbox> - <hbox> - <button label="Add address " id="addAddress" /> - <button label="Delete address" id="deleteAddress" /> - </hbox> - </vbox> - </hbox> - - <separator/> - - <vbox> - <groupbox width="330px"> - - <caption label="Phones" /> - - <listbox id="phoneListbox" model="@{composer.employeeData.personPhonesModel}" width="310px"> - <listhead sizable="true"> - <listheader label="Name" /> - <listheader label="Phone Number" /> - </listhead> - <listitem self="@{each='phone'}"> - <listcell> - <textbox value="@{phone.name, save-when='saveEmployee.onClick'}" /> - </listcell> - <listcell> - <textbox value="@{phone.phone, save-when='saveEmployee.onClick'}" /> - </listcell> - </listitem> - </listbox> - - <separator/> - - <button label="Add phone " id="addPhone" /> <button label="Delete phone" id="deletePhone" /> - - </groupbox> - - <separator/> - - <groupbox width="330px"> - - <caption label="Emails" /> - - <listbox id="emailListbox" model="@{composer.employeeData.personEmailsModel}" width="310px"> - <listhead sizable="true"> - <listheader label="Name" /> - <listheader label="Email" /> - </listhead> - <listitem self="@{each='mail'}"> - <listcell> - <textbox value="@{mail.name, save-when='saveEmployee.onClick'}" /> - </listcell> - <listcell> - <textbox value="@{mail.email, save-when='saveEmployee.onClick'}" /> - </listcell> - </listitem> - </listbox> - - <separator/> - - <button label="Add email " id="addEmail" /> <button label="Delete email" id="deleteEmail" /> - - </groupbox> - </vbox> - </groupbox> <button id="saveEmployee" label="Save" /> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/index.zul 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/src/main/webapp/index.zul 2010-07-21 09:52:53 UTC (rev 111) @@ -10,6 +10,7 @@ <toolbarbutton id="persons" label="Persons" /> <toolbarbutton id="employees" label="Employees" /> <toolbarbutton id="companies" label="Companies" /> + <toolbarbutton id="services" label="Services" /> </vbox> </groupbox> <vbox id="content" > Modified: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-20 13:26:47 UTC (rev 110) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-21 09:52:53 UTC (rev 111) @@ -519,3 +519,69 @@ 2010-07-20 15:20:43,440 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 55108 2010-07-20 15:20:43,442 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 55 108 2010-07-20 15:20:43,507 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55108 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 17:32:17,750 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 41187 +2010-07-20 17:32:17,752 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 41 187 +2010-07-20 17:32:17,815 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41187 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 17:36:02,778 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 54003 +2010-07-20 17:36:02,780 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 54 003 +2010-07-20 17:36:02,847 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54003 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 17:40:39,635 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 45465 +2010-07-20 17:40:39,637 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 45 465 +2010-07-20 17:40:39,692 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 45465 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 17:45:22,737 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 34949 +2010-07-20 17:45:22,739 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 34 949 +2010-07-20 17:45:22,798 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34949 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 17:47:58,060 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 38820 +2010-07-20 17:47:58,062 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 38 820 +2010-07-20 17:47:58,125 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38820 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 17:52:06,177 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 48913 +2010-07-20 17:52:06,179 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 48 913 +2010-07-20 17:52:06,248 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48913 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 17:56:52,338 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 34577 +2010-07-20 17:56:52,340 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 34 577 +2010-07-20 17:56:52,421 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34577 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 18:25:15,996 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 56443 +2010-07-20 18:25:15,999 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 56 443 +2010-07-20 18:25:16,066 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56443 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-20 18:30:16,633 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 37889 +2010-07-20 18:30:16,635 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 37 889 +2010-07-20 18:30:16,706 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 37889 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:21:51,798 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 41002 +2010-07-21 10:21:51,832 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 41 002 +2010-07-21 10:21:51,911 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41002 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:29:12,043 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 35279 +2010-07-21 10:29:12,046 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 35 279 +2010-07-21 10:29:12,114 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35279 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:35:03,697 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 57156 +2010-07-21 10:35:03,699 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 57 156 +2010-07-21 10:35:03,774 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 57156 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:36:41,244 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 38637 +2010-07-21 10:36:41,247 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 38 637 +2010-07-21 10:36:41,339 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38637 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:48:44,977 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 34817 +2010-07-21 10:48:44,979 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 34 817 +2010-07-21 10:48:45,064 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34817 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:49:50,410 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 39996 +2010-07-21 10:49:50,413 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 39 996 +2010-07-21 10:49:50,504 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39996 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:51:21,846 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 51104 +2010-07-21 10:51:21,848 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 51 104 +2010-07-21 10:51:21,926 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 51104 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:54:17,430 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 34368 +2010-07-21 10:54:17,431 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 34 368 +2010-07-21 10:54:17,539 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34368 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 10:55:19,275 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 44879 +2010-07-21 10:55:19,277 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 44 879 +2010-07-21 10:55:19,348 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44879 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 11:25:52,174 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 54507 +2010-07-21 11:25:52,177 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 54 507 +2010-07-21 11:25:52,260 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54507 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 11:41:31,946 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 46702 +2010-07-21 11:41:31,948 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 46 702 +2010-07-21 11:41:32,037 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 46702 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 11:49:08,087 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 42806 +2010-07-21 11:49:08,089 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 42 806 +2010-07-21 11:49:08,142 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42806 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 11:51:38,357 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 39987 +2010-07-21 11:51:38,360 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 39 987 +2010-07-21 11:51:38,414 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39987 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService