- Bonzoms-commits - mailman.cloud.codelutin.com

r122 - in trunk/bonzoms-ui-zk/src/main: java/org/chorem/bonzoms/ui webapp
by bbrossaud＠users.chorem.org Aug. 5, 2010

Aug. 5, 2010

Author: bbrossaud Date: 2010-08-05 14:51:10 +0200 (Thu, 05 Aug 2010) New Revision: 122 Url: http://chorem.org/repositories/revision/bonzoms/122 Log: addition pagination and bandbox Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.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/EmployeeModel.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/PersonModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -2,6 +2,7 @@ import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Events; @@ -16,7 +17,7 @@ */ public class AddressFormController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Address address = new AddressImpl(); @@ -34,7 +35,7 @@ addressId = (String) arg.get("addressId"); } if (addressId != null) { - address = model.retrieveAddressById(addressId); + address = proxy.restore(Address.class, addressId); } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); @@ -49,7 +50,7 @@ } public void onClick$saveAddress() { - address = model.createAddress(address); + address = proxy.store(address); Events.postEvent(EVENT_ON_SAVE_ADDRESS, this.self, address); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -30,6 +30,7 @@ import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Company; import org.chorem.data.bonzoms.CompanyImpl; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; @@ -45,10 +46,10 @@ */ public class CompanyFormController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Company company = new CompanyImpl(); - protected AddressesModel addressesModel = new AddressesModel(); + protected AddressModel addressesModel = new AddressModel(); protected PhonesModel phonesModel = new PhonesModel(); protected EmailsModel emailsModel = new EmailsModel(); @@ -97,8 +98,9 @@ } protected void initCompany(String companyId) { - this.company = model.retrieveCompanyById(companyId); - List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress())); + this.company = proxy.restore(Company.class, companyId); + List<Address> addresses = proxy.restore(Address.class, new ArrayList<String>(company.getAddress())); + addresses = new ArrayList<Address>(addresses); addressesModel.setAddresses(addresses); emailsModel.setEmails(company.getEmails()); phonesModel.setPhones(company.getPhones()); @@ -111,9 +113,9 @@ } protected void saveAddresses() { - List<Address> addresses = model.createAddresses(addressesModel.getAddresses()); + List<Address> addresses = proxy.store(addressesModel.getAddresses()); if (!removedAddresses.isEmpty()) { - model.deleteAddressesByIds(removedAddresses); + proxy.delete(removedAddresses); removeCompanyAddresses(); } for (Address address : addresses) { @@ -186,7 +188,7 @@ saveEmails(); saveAddresses(); - company = model.updateCompany(company); + company = proxy.store(company); Events.postEvent(EVENT_ON_SAVE_COMPANY, this.self, company); @@ -200,7 +202,7 @@ return company; } - public AddressesModel getAddressesModel() { + public AddressModel getAddressesModel() { return addressesModel; } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-08-05 12:51:10 UTC (rev 122) @@ -43,13 +43,11 @@ protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Criteria criteria = null; protected int itemsByPage = 1; - protected int size = 0; protected int currentPage = 0; protected List<Company> companies = new ArrayList<Company>(); public CompanyModel(int itemsByPage) { this.itemsByPage = itemsByPage; - size = getSize(); createList(); } @@ -86,14 +84,21 @@ } public void addData(Company newData) { - size = getSize(); + int listSize = companies.size(); + if (listSize < (itemsByPage)) { + companies.add(newData); + } + int size = getSize(); fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } public void removeData(Company data) { - int interval = companies.indexOf(data) + (itemsByPage * currentPage); - proxy.delete(data.getWikittyId()); - fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + int index = companies.indexOf(data); + if (index != -1) { + companies.remove(index); + int interval = index + (itemsByPage * currentPage); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } } public void reloadContent(int rowIndex) { @@ -105,7 +110,6 @@ public void reload() { createList(); - size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } 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-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -2,6 +2,7 @@ import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.EmploymentContractImpl; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Events; @@ -16,7 +17,7 @@ */ public class ContractFormController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected EmploymentContract contract = new EmploymentContractImpl(); public static final String EVENT_ON_SAVE_CONTRACT = "onSaveContract"; @@ -33,7 +34,7 @@ contractId = (String) arg.get("contractId"); } if (contractId != null) { - contract = model.retrieveContractById(contractId); + contract = proxy.restore(EmploymentContract.class, contractId); } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); @@ -48,7 +49,7 @@ } public void onClick$saveContract() { - contract = model.createContract(contract); + contract = proxy.store(contract); Events.postEvent(EVENT_ON_SAVE_CONTRACT, this.self, contract); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java 2010-08-05 12:51:10 UTC (rev 122) @@ -85,21 +85,22 @@ return index; } - public void addData(EmploymentContract newData, boolean store) { - if (store == true) { - proxy.store(newData); - } - size = getSize(); + public void addData(EmploymentContract newData) { + int listSize = contracts.size(); + if (listSize < (itemsByPage)) { + contracts.add(newData); + } + int size = getSize(); fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } - public void removeData(EmploymentContract data, boolean delete) { - int interval = contracts.indexOf(data) + (itemsByPage * currentPage); - if (delete == true) { - proxy.delete(data.getWikittyId()); - } - createList(); - fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + public void removeData(EmploymentContract data) { + int index = contracts.indexOf(data); + if (index != -1) { + contracts.remove(index); + int interval = index + (itemsByPage * currentPage); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } } public void reloadContent(int rowIndex) { Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -59,7 +59,7 @@ protected void initDefaultContracts() { EmploymentContract contract = new EmploymentContractImpl(); contract.setEmployee(employeeId); - contractModel.addData(contract, false); + contractModel.addData(contract); } protected void initContracts() { @@ -75,7 +75,7 @@ public void onClick$addContract() { EmploymentContract contract = new EmploymentContractImpl(); contract.setEmployee(employeeId); - contractModel.addData(contract, false); + contractModel.addData(contract); } public void onClick$deleteContract() { 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-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -120,6 +120,7 @@ Service service = proxy.restore(Service.class, serviceId); serviceBandbox.setValue(service.getType()); } + serviceBandbox.close(); } protected void initCompanyModel() { @@ -129,6 +130,7 @@ Company company = proxy.restore(Company.class, companyId); companyBandbox.setValue(company.getName()); } + companyBandbox.close(); } protected void initPersonModel() { @@ -139,6 +141,7 @@ String name = person.getFirstName() + " " + person.getLastName(); personBandbox.setValue(name); } + personBandbox.close(); } /* @@ -355,6 +358,10 @@ public CompanyModel getCompanyModel() { return companyModel; } + + public PersonModel getPersonModel() { + return personModel; + } public ServiceModel getServiceModel() { return serviceModel; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-08-05 12:51:10 UTC (rev 122) @@ -43,13 +43,11 @@ protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Criteria criteria = null; protected int itemsByPage = 1; - protected int size = 0; protected int currentPage = 0; protected List<Employee> employees = new ArrayList<Employee>(); public EmployeeModel(int itemsByPage) { this.itemsByPage = itemsByPage; - size = getSize(); createList(); } @@ -87,14 +85,21 @@ } public void addData(Employee newData) { - size = getSize(); + int listSize = employees.size(); + if (listSize < (itemsByPage)) { + employees.add(newData); + } + int size = getSize(); fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } public void removeData(Employee data) { - int interval = employees.indexOf(data) + (itemsByPage * currentPage); - proxy.delete(data.getWikittyId()); - fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + int index = employees.indexOf(data); + if (index != -1) { + employees.remove(index); + int interval = index + (itemsByPage * currentPage); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } } public void reloadContent(int rowIndex) { @@ -106,7 +111,6 @@ public void reload() { createList(); - size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } 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-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -31,6 +31,7 @@ import org.chorem.data.bonzoms.Person; import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; import org.zkoss.zk.ui.Component; @@ -51,7 +52,7 @@ */ public class PersonController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected PersonModel personModel = new PersonModel(20); 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-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -6,14 +6,22 @@ import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.PersonImpl; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; +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; import org.zkoss.zkplus.databind.DataBinder; +import org.zkoss.zul.Caption; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.Window; +import org.zkoss.zul.api.Textbox; /** * @@ -21,13 +29,14 @@ */ public class PersonFormController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Person person = new PersonImpl(); - protected AddressesModel addressesModel = new AddressesModel(); + protected AddressModel addressModel = new AddressModel(); + protected Address selectedAddress = null; protected EmailsModel emailsModel = new EmailsModel(); protected PhonesModel phonesModel = new PhonesModel(); - List<String> removedAddresses = new ArrayList<String>(); + protected List<String> removedAddresses = new ArrayList<String>(); protected Listbox addressListbox; protected Listbox phoneListbox; @@ -62,7 +71,9 @@ protected void initDefaultPerson() { Address address = new AddressImpl(); - addressesModel.addData(address); + address.setName("New address"); + addressModel.addData(address); + selectedAddress = address; Phone phone = new Phone(); phonesModel.addData(phone); @@ -72,9 +83,11 @@ } protected void initPerson(String personId) { - person = model.retrievePersonById(personId); - List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(person.getAddress())); - addressesModel.setAddresses(addresses); + person = proxy.restore(Person.class, personId); + List<Address> addresses = proxy.restore(Address.class, new ArrayList<String>(person.getAddress())); + addresses = new ArrayList<Address>(addresses); + selectedAddress = addresses.get(0); + addressModel.setAddresses(addresses); emailsModel.setEmails(person.getEmails()); phonesModel.setPhones(person.getPhones()); } @@ -86,9 +99,9 @@ } protected void saveAddresses() { - List<Address> addresses = model.createAddresses(addressesModel.getAddresses()); + List<Address> addresses = proxy.store(addressModel.getAddresses()); if (!removedAddresses.isEmpty()) { - model.deleteAddressesByIds(removedAddresses); + proxy.delete(removedAddresses); removeAddresses(); } for (Address address : addresses) { @@ -105,37 +118,92 @@ String phones = phonesModel.getPhonesAsString(); person.setPhones(phones); } - /* + * Renderers + */ + public ListitemRenderer getAddressRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + final Address address = (Address) data; + Listcell name = new Listcell(address.getName()); + item.appendChild(name); + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + selectedAddress = address; + setAddressBox(); + } + }); + } + }; + } + + protected void setAddressBox() { + Caption caption = (Caption) self.getFellow("captionName"); + caption.setLabel(selectedAddress.getName()); + Textbox box = (Textbox) self.getFellow("name"); + box.setValue(selectedAddress.getName()); + box = (Textbox) self.getFellow("address1"); + box.setValue(selectedAddress.getAddress1()); + box = (Textbox) self.getFellow("address2"); + box.setValue(selectedAddress.getAddress2()); + box = (Textbox) self.getFellow("zipcode"); + box.setValue(selectedAddress.getZipCode()); + box = (Textbox) self.getFellow("city"); + box.setValue(selectedAddress.getCity()); + box = (Textbox) self.getFellow("country"); + box.setValue(selectedAddress.getCountry()); + } + + /* * Events */ public void onClose() { Events.postEvent(EVENT_ON_CLOSE_PERSON, this.self, null); } + public void onClick$saveAddress() { + int rowIndex = addressModel.indexOf(selectedAddress); + Caption caption = (Caption) self.getFellow("captionName"); + caption.setLabel(selectedAddress.getName()); + addressModel.reloadContent(rowIndex); + } + public void onClick$savePerson() { saveAddresses(); savePhones(); saveEmails(); - person = model.createPerson(person); + person = proxy.store(person); Events.postEvent(EVENT_ON_SAVE_PERSON, this.self, person); self.detach(); } public void onClick$addAddress() { Address address = new AddressImpl(); - addressesModel.addData(address); + address.setName("New address"); + selectedAddress = address; + setAddressBox(); + addressModel.addData(address); } public void onClick$deleteAddress() { - int size = addressListbox.getItemCount(); - if (size > 1) { - Address address = (Address) addressesModel.getElementAt(size -1); - addressesModel.removeData(address); - String id = address.getWikittyId(); - if (!id.isEmpty()) { - removedAddresses.add(id); - } + Listitem item = addressListbox.getSelectedItem(); + if (item != null) { + Address address = (Address) item.getValue(); + if (address != null) { + addressModel.removeData(address); + String id = address.getWikittyId(); + if (id != null && !id.isEmpty()) { + removedAddresses.add(id); + } + selectedAddress = (Address) addressModel.getElementAt(0); + setAddressBox(); + addressListbox.setSelectedIndex(0); + } } } @@ -172,8 +240,8 @@ return person; } - public AddressesModel getAddressesModel() { - return addressesModel; + public AddressModel getAddressModel() { + return addressModel; } public PhonesModel getPhonesModel() { @@ -183,4 +251,8 @@ public EmailsModel getEmailsModel() { return emailsModel; } + + public Address getSelectedAddress() { + return selectedAddress; + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java 2010-08-05 12:51:10 UTC (rev 122) @@ -20,13 +20,11 @@ protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Criteria criteria = null; protected int itemsByPage = 1; - protected int size = 0; protected int currentPage = 0; protected List<Person> persons = new ArrayList<Person>(); public PersonModel(int itemsByPage) { this.itemsByPage = itemsByPage; - size = getSize(); createList(); } @@ -63,14 +61,21 @@ } public void addData(Person newData) { - size = getSize(); + int listSize = persons.size(); + if (listSize < (itemsByPage)) { + persons.add(newData); + } + int size = getSize(); fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } public void removeData(Person data) { - int interval = persons.indexOf(data) + (itemsByPage * currentPage); - proxy.delete(data.getWikittyId()); - fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + int index = persons.indexOf(data); + if (index != -1) { + persons.remove(index); + int interval = index + (itemsByPage * currentPage); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } } public void reloadContent(int rowIndex) { @@ -82,7 +87,6 @@ public void reload() { createList(); - size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -5,6 +5,7 @@ import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.Service; import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; import org.zkoss.zk.ui.Component; @@ -26,7 +27,7 @@ */ public class ServiceController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected ServiceModel serviceModel = new ServiceModel(20); @@ -53,7 +54,7 @@ } protected Listcell addressesRenderer(Service service) { - Address address = model.retrieveAddressById(service.getAddress()); + Address address = proxy.restore(Address.class, service.getAddress()); String render = address.getName() + " (" + address.getCountry() + ") :\n"; render += address.getAddress1() + " " + address.getAddress2() + "\n"; render += address.getZipCode() + " " + address.getCity() + "\n"; 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-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java 2010-08-05 12:51:10 UTC (rev 122) @@ -4,6 +4,7 @@ import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Service; import org.chorem.data.bonzoms.ServiceImpl; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Events; @@ -18,7 +19,7 @@ */ public class ServiceFormController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Service service = new ServiceImpl(); protected Address address = new AddressImpl(); @@ -45,8 +46,8 @@ } protected void initService(String id) { - service = model.retrieveServiceById(id); - address = model.retrieveAddressById(service.getAddress()); + service = proxy.restore(Service.class, id); + address = proxy.restore(Address.class, service.getAddress()); } /* @@ -58,10 +59,10 @@ } public void onClick$saveService() { - address = model.createAddress(address); + address = proxy.store(address); service.setAddress(address.getWikittyId()); - service = model.updateService(service); + service = proxy.store(service); Events.postEvent(EVENT_ON_SAVE_SERVICE, this.self, service); System.out.println(this.self.getParent()); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java 2010-08-05 12:51:10 UTC (rev 122) @@ -20,13 +20,11 @@ protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Criteria criteria = null; protected int itemsByPage = 1; - protected int size = 0; protected int currentPage = 0; protected List<Service> services = new ArrayList<Service>(); public ServiceModel(int itemsByPage) { this.itemsByPage = itemsByPage; - size = getSize(); createList(); } @@ -63,14 +61,21 @@ } public void addData(Service newData) { - size = getSize(); + int listSize = services.size(); + if (listSize < (itemsByPage)) { + services.add(newData); + } + int size = getSize(); fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } public void removeData(Service data) { - int interval = services.indexOf(data) + (itemsByPage * currentPage); - proxy.delete(data.getWikittyId()); - fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + int index = services.indexOf(data); + if (index != -1) { + services.remove(index); + int interval = index + (itemsByPage * currentPage); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } } public void reloadContent(int rowIndex) { @@ -82,7 +87,6 @@ public void reload() { createList(); - size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java 2010-08-05 12:51:10 UTC (rev 122) @@ -21,13 +21,11 @@ protected WikittyProxy proxy = BonzomsProxy.getInstance(); protected Criteria criteria = null; protected int itemsByPage = 1; - protected int size = 0; protected int currentPage = 0; protected List<Wikitty> wikitties = new ArrayList<Wikitty>(); public WikittyModel(int itemsByPage) { this.itemsByPage = itemsByPage; - size = getSize(); createList(); } @@ -66,14 +64,21 @@ } public void addData(Wikitty newData) { - size = getSize(); + int listSize = wikitties.size(); + if (listSize < (itemsByPage)) { + wikitties.add(newData); + } + int size = getSize(); fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } public void removeData(Wikitty data) { - int interval = wikitties.indexOf(data) + (itemsByPage * currentPage); - proxy.delete(data.getId()); - fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + int index = wikitties.indexOf(data); + if (index != -1) { + wikitties.remove(index); + int interval = index + (itemsByPage * currentPage); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } } public void reloadContent(int rowIndex) { @@ -87,7 +92,6 @@ public void reload() { createList(); - size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } Modified: trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-08-05 12:51:10 UTC (rev 122) @@ -24,7 +24,9 @@ <bandpopup> <vbox> <listbox width="200px" id="serviceListbox" model="@{composer.serviceModel}" itemRenderer="@{composer.serviceRenderer}"> - + <listhead> + <listheader label="Name"/> + </listhead> </listbox> </vbox> </bandpopup> Modified: trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) +++ trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul 2010-08-05 12:51:10 UTC (rev 122) @@ -10,45 +10,51 @@ <textbox value="@{composer.person.lastName, save-when='savePerson.onClick'}" /> <label value="Birthday" /> <datebox format="yyyy/MM/dd" value="@{composer.person.birthDay, save-when='savePerson.onClick'}" /> - </vbox> - <space /> + <separator /> - <vbox> - <listbox id="addressListbox" model="@{composer.addressesModel}" width="200px"> - <listitem self="@{each='address'}"> - <listcell> - <groupbox> - <caption label="@{address.name}" /> - <vbox> + <listbox id="addressListbox" mold="paging" rows="5" model="@{composer.addressModel}" width="170px" itemRenderer="@{composer.addressRenderer}"> + <listhead> + <listheader label="Address name" /> + </listhead> + </listbox> - <label value="Name" /> - <textbox value="@{address.name, save-when='savePerson.onClick'}" /> + <hbox> + <button label="Add" id="addAddress" /> + <button label="Delete" id="deleteAddress" /> + </hbox> - <label value="Adress1" /> - <textbox value="@{address.address1, save-when='savePerson.onClick'}" /> + </vbox> - <label value="Adress2" /> - <textbox value="@{address.address2, save-when='savePerson.onClick'}" /> + <space /> - <label value="Zip code" /> - <textbox value="@{address.zipCode, save-when='savePerson.onClick'}" /> - - <label value="City" /> - <textbox value="@{address.city, save-when='savePerson.onClick'}" /> - - <label value="Country" /> - <textbox value="@{address.country, save-when='savePerson.onClick'}" /> - - </vbox> - </groupbox> - </listcell> - </listitem> - </listbox> - <hbox> - <button label="Add address " id="addAddress" /> - <button label="Delete address" id="deleteAddress" /> - </hbox> + <vbox> + <groupbox> + <caption id="captionName" label="@{composer.selectedAddress.name}" /> + <vbox> + + <label value="Name" /> + <textbox id="name" value="@{composer.selectedAddress.name, save-when='saveAddress.onClick'}" /> + + <label value="Adress1" /> + <textbox id="address1" value="@{composer.selectedAddress.address1, save-when='saveAddress.onClick'}" /> + + <label value="Adress2" /> + <textbox id="address2" value="@{composer.selectedAddress.address2, save-when='saveAddress.onClick'}" /> + + <label value="Zip code" /> + <textbox id="zipcode" value="@{composer.selectedAddress.zipCode, save-when='saveAddress.onClick'}" /> + + <label value="City" /> + <textbox id="city" value="@{composer.selectedAddress.city, save-when='saveAddress.onClick'}" /> + + <label value="Country" /> + <textbox id="country" value="@{composer.selectedAddress.country, save-when='saveAddress.onClick'}" /> + + <button id="saveAddress" label="Save" /> + + </vbox> + </groupbox> </vbox> </hbox>

1 0

r121 - in trunk/bonzoms-ui-zk/src/main: java/org/chorem/bonzoms/ui resources webapp
by bbrossaud＠users.chorem.org Aug. 4, 2010

Aug. 4, 2010

Author: bbrossaud Date: 2010-08-04 18:27:57 +0200 (Wed, 04 Aug 2010) New Revision: 121 Url: http://chorem.org/repositories/revision/bonzoms/121 Log: removed *data and change paging mold Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java Removed: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.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/ContractsModel.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/PersonData.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.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/EmployeeFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.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/PersonModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java trunk/bonzoms-ui-zk/src/main/resources/wikitty-jdbc-config.properties trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/employeePage.zul trunk/bonzoms-ui-zk/src/main/webapp/index.zul trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul trunk/bonzoms-ui-zk/src/main/webapp/serviceFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/servicePage.zul Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -3,10 +3,12 @@ import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; 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; +import org.zkoss.zul.Window; /** * @@ -18,15 +20,22 @@ protected Address address = new AddressImpl(); - public final static String EVENT_ON_SAVE_ADDRESS = "onSaveAddress"; + public static final String EVENT_ON_SAVE_ADDRESS = "onSaveAddress"; + public static final String EVENT_ON_CLOSE_ADDRESS = "onCloseAddress"; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - Address data = (Address) arg.get("address"); - if (data != null) { - this.address = data; + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String addressId = Executions.getCurrent().getParameter("addressId"); + if (addressId == null) { + addressId = (String) arg.get("addressId"); } + if (addressId != null) { + address = model.retrieveAddressById(addressId); + } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); @@ -35,6 +44,10 @@ /* * Events */ + public void onClose() { + Events.postEvent(EVENT_ON_CLOSE_ADDRESS, this.self, null); + } + public void onClick$saveAddress() { address = model.createAddress(address); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/BonzomsConfig.java 2010-08-04 16:27:57 UTC (rev 121) @@ -108,7 +108,7 @@ APPLICATION_VERSION("application.version", _("bonzoms.config.application.version.description"), null, String.class, true, true), DATA_DIR("solr.data.dir", _("bonzoms.config.data.dir.description"), - System.getProperty("user.home") + "/.bonzoms/solr", String.class, false, false); + System.getProperty("user.home") + "/.chorem-data/solr", String.class, false, false); public final String key; public final String description; public final String defaultValue; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -27,16 +27,21 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.Company; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; 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.zul.Button; import org.zkoss.zul.Label; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; @@ -48,59 +53,30 @@ * @author sherkhan */ public class CompanyController extends GenericForwardComposer { - protected Model model = new Model(); - protected CompanyModel companyDataModel = new CompanyModel(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected CompanyModel companyModel = new CompanyModel(20); @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - String search = (String) arg.get("search"); - List<Company> companies; - if (search != null && !search.isEmpty()) { - companies = model.retrieveCompaniesBySearch(search); - } else { - companies = model.retrieveAllCompanies(); - } - createCompaniesData(companies); + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY).criteria(); + companyModel.setCriteria(criteria); } - public void createCompaniesData(List<Company> companies) { - for (Company company: companies) { - List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress())); - CompanyData data = new CompanyData(company, addresses); - companyDataModel.addData(data); - } - } - - public void createWindowCompanyForm(CompanyData companyData) throws SuspendNotAllowedException, InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (companyData != null) { - map.put("companyData", companyData); - } - Window win = (Window) Executions.createComponents("companyFormPage.zul", null, map); - + public void createWindowCompanyForm(String id) throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("companyId", id); + } + Window win = (Window) Executions.createComponents("companyFormPage.zul", null, map); win.addEventListener(CompanyFormController.EVENT_ON_SAVE_COMPANY, new EventListener() { @Override public void onEvent(Event event) throws Exception { - CompanyData data = (CompanyData) event.getData(); - if (data != null) { - int rowIndex = companyDataModel.indexOf(data); - if (rowIndex == -1) { - companyDataModel.addData(data); - } else { - companyDataModel.reloadContent(rowIndex); - } - } + companyModel.reload(); } }); - - win.setPage(page); -// win.doHighlighted(); - win.setPosition("center"); -// win.doOverlapped(); - win.doModal(); } /* @@ -109,12 +85,13 @@ public void onClick$newCompany() throws SuspendNotAllowedException, InterruptedException { createWindowCompanyForm(null); } + /* * Renderers */ - protected Listcell phonesFaxRenderer(CompanyData company) { - String render = "Fax: " + company.getCompany().getFax() + "\n"; - String str = company.getCompany().getPhones(); + protected Listcell phonesFaxRenderer(Company company) { + String render = "Fax: " + company.getFax() + "\n"; + String str = company.getPhones(); String[] phones = StringUtil.split(str, ";"); for (String phone : phones) { String[] values = StringUtil.split(phone, ":"); @@ -131,9 +108,9 @@ return listcell; } - protected Listcell emailsRenderer(CompanyData company) { + protected Listcell emailsRenderer(Company company) { String render = ""; - String str = company.getCompany().getEmails(); + String str = company.getEmails(); String[] emails = StringUtil.split(str, ";"); for (String email : emails) { String[] values = StringUtil.split(email, ":"); @@ -150,8 +127,9 @@ return listcell; } - protected Listcell addressesRenderer(CompanyData company) { - List<Address> addresses = company.getAddresses(); + protected Listcell addressesRenderer(Company company) { + List<String> ids = new ArrayList<String>(company.getAddress()); + List<Address> addresses = proxy.restore(Address.class, ids); String render = ""; for (Address address : addresses) { render += address.getName() + " (" + address.getCountry() + ") :\n"; @@ -165,28 +143,25 @@ return listcell; } - public ListitemRenderer getCompanyDataRenderer() { + public ListitemRenderer getCompanyRenderer() { return new ListitemRenderer() { @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - final CompanyData companyData = (CompanyData) data; + final Company company = (Company) data; - Listcell nameCell = new Listcell(companyData.getCompany().getName()); - Listcell webSiteCell = new Listcell(companyData.getCompany().getWebSite()); - Listcell phoneFaxCell = phonesFaxRenderer(companyData); - Listcell emailCell = emailsRenderer(companyData); - Listcell addressCell = addressesRenderer(companyData); - Listcell typeCell = new Listcell(companyData.getCompany().getType()); - Listcell detailsCell = new Listcell(); - Button details = new Button("details"); - detailsCell.appendChild(details); - details.addEventListener("onClick", new EventListener() { + Listcell nameCell = new Listcell(company.getName()); + Listcell webSiteCell = new Listcell(company.getWebSite()); + Listcell phoneFaxCell = phonesFaxRenderer(company); + Listcell emailCell = emailsRenderer(company); + Listcell addressCell = addressesRenderer(company); + Listcell typeCell = new Listcell(company.getType()); + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { @Override public void onEvent(Event event) throws Exception { - createWindowCompanyForm(companyData); + createWindowCompanyForm(company.getWikittyId()); } }); @@ -196,7 +171,6 @@ item.appendChild(emailCell); item.appendChild(addressCell); item.appendChild(typeCell); - item.appendChild(detailsCell); } }; } @@ -209,6 +183,6 @@ * Getters */ public CompanyModel getCompanyModel() { - return companyDataModel; + return companyModel; } } Deleted: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyData.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,144 +0,0 @@ -/* - * #%L - * Bonzoms : bonzoms-zk - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.bonzoms.ui; - -import java.util.ArrayList; -import java.util.List; -import org.chorem.data.bonzoms.Address; -import org.chorem.data.bonzoms.Company; -import org.chorem.data.bonzoms.CompanyImpl; - -/** - * - * @author sherkhan - */ -public class CompanyData { - - protected Company company = new CompanyImpl(); - - protected PhonesModel phonesModel = new PhonesModel(); - protected EmailsModel emailsModel = new EmailsModel(); - - protected AddressesModel addressesModel = new AddressesModel(); - protected List<String> removedAddresses = new ArrayList<String>(); - - public CompanyData() {} - - public CompanyData(Company obj, List<Address> addr) { - setCompany(obj); - setAddresses(addr); - } - - /* - * Getters - */ - public Company getCompany() { - return company; - } - - public List<Address> getAddresses() { - return addressesModel.getAddresses(); - } - - public List<String> getRemovedAddresses() { - return removedAddresses; - } - - public AddressesModel getAddressesModel() { - return addressesModel; - } - - public EmailsModel getEmailsModel() { - return emailsModel; - } - - public List<Email> getEmails() { - return emailsModel.getEmails(); - } - - public PhonesModel getPhonesModel() { - return phonesModel; - } - - public List<Phone> getPhones() { - return phonesModel.getPhones(); - } - - public String getEmailsModelAsString() { - return emailsModel.getEmailsAsString(); - } - - public String getPhonesModelAsString() { - return phonesModel.getPhonesAsString(); - } - - /* - * Setters - */ - public void setCompany(Company obj) { - if (obj != null) { - company = obj; - } - } - - public void setAddresses(List<Address> list) { - if (list != null) { - addressesModel.setAddresses(list); - } - } - - public void setRemovedAddresses(List<String> list) { - if (list != null) { - removedAddresses = list; - } - } - - public void setAddressesModel(AddressesModel addr) { - addressesModel = addr; - } - - public void setEmailsModel(EmailsModel emailsModel) { - this.emailsModel = emailsModel; - } - - public void setPhonesModel(PhonesModel phonesModel) { - this.phonesModel = phonesModel; - } - - public void setPhones(List<Phone> phones) { - phonesModel.setPhones(phones); - } - - public void setEmails(List<Email> emails) { - emailsModel.setEmails(emails); - } - - public void setEmailsModelList(String str) { - emailsModel.setEmails(str); - } - - public void setPhonesModelList(String str) { - phonesModel.setPhones(str); - } -} Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -25,15 +25,19 @@ import java.util.ArrayList; import java.util.List; + import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Company; +import org.chorem.data.bonzoms.CompanyImpl; 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; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Window; +import org.zkoss.zk.ui.Executions; /** * @@ -43,122 +47,137 @@ protected Model model = new Model(); - protected CompanyData companyData = new CompanyData(); + protected Company company = new CompanyImpl(); + protected AddressesModel addressesModel = new AddressesModel(); + protected PhonesModel phonesModel = new PhonesModel(); + protected EmailsModel emailsModel = new EmailsModel(); + + protected List<String> removedAddresses = new ArrayList<String>(); protected Listbox addressListbox; protected Listbox phoneListbox; protected Listbox emailListbox; - public final static String EVENT_ON_SAVE_COMPANY = "onSaveCompany"; + public static final String EVENT_ON_SAVE_COMPANY = "onSaveCompany"; + public static final String EVENT_ON_CLOSE_COMPANY = "onCloseCompany"; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - CompanyData company = (CompanyData) arg.get("companyData"); - init(company); + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String companyId = Executions.getCurrent().getParameter("companyId"); + if (companyId == null) { + companyId = (String) arg.get("companyId"); + } + init(companyId); DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } - protected void init(CompanyData company) { - if (company == null) { + protected void init(String companyId) { + if (companyId == null || companyId.isEmpty()) { initDefaultCompany(); } else { - initCompany(company); + initCompany(companyId); } } protected void initDefaultCompany() { Address address = new AddressImpl(); - companyData.getAddressesModel().addData(address); + addressesModel.addData(address); Phone phone = new Phone(); - companyData.getPhonesModel().addData(phone); + phonesModel.addData(phone); Email email = new Email(); - companyData.getEmailsModel().addData(email); + emailsModel.addData(email); } - protected void initCompany(CompanyData companyData) { - this.companyData = companyData; - List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(companyData.getCompany().getAddress())); - companyData.setAddresses(addresses); - companyData.setEmailsModelList(companyData.getCompany().getEmails()); - companyData.setPhonesModelList(companyData.getCompany().getPhones()); + protected void initCompany(String companyId) { + this.company = model.retrieveCompanyById(companyId); + List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress())); + addressesModel.setAddresses(addresses); + emailsModel.setEmails(company.getEmails()); + phonesModel.setPhones(company.getPhones()); } protected void removeCompanyAddresses() { - List<String> ids = companyData.getRemovedAddresses(); - for (String id : ids) { - companyData.getCompany().removeAddress(id); + for (String id : removedAddresses) { + company.removeAddress(id); } } protected void saveAddresses() { - List<Address> addresses = model.createAddresses(companyData.getAddressesModel().getAddresses()); - if (!companyData.getRemovedAddresses().isEmpty()) { - model.deleteAddressesByIds(companyData.getRemovedAddresses()); + List<Address> addresses = model.createAddresses(addressesModel.getAddresses()); + if (!removedAddresses.isEmpty()) { + model.deleteAddressesByIds(removedAddresses); removeCompanyAddresses(); } for (Address address : addresses) { - companyData.getCompany().addAddress(address.getWikittyId()); + company.addAddress(address.getWikittyId()); } } protected void saveEmails() { - String emails = companyData.getEmailsModelAsString(); - companyData.getCompany().setEmails(emails); + String emails = emailsModel.getEmailsAsString(); + company.setEmails(emails); } protected void savePhones() { - String phones = companyData.getPhonesModelAsString(); - companyData.getCompany().setPhones(phones); + String phones = phonesModel.getPhonesAsString(); + company.setPhones(phones); } /* * Events */ + public void onClose() { + Events.postEvent(EVENT_ON_CLOSE_COMPANY, this.self, null); + } + public void onClick$addAddress() { Address address = new AddressImpl(); - companyData.getAddressesModel().addData(address); + addressesModel.addData(address); } public void onClick$deleteAddress() { int size = addressListbox.getItemCount(); if (size > 1) { - Address address = (Address) companyData.getAddressesModel().getElementAt(size -1); - companyData.getAddressesModel().removeData(address); + Address address = (Address) addressesModel.getElementAt(size -1); + addressesModel.removeData(address); String id = address.getWikittyId(); if (!id.isEmpty()) { - companyData.getRemovedAddresses().add(id); + removedAddresses.add(id); } } } public void onClick$addPhone() { Phone phone = new Phone(); - companyData.getPhonesModel().addData(phone); + phonesModel.addData(phone); } public void onClick$deletePhone() { int size = phoneListbox.getItemCount(); if (size > 1) { - Phone phone = (Phone) companyData.getPhonesModel().getElementAt(size -1); - companyData.getPhonesModel().removeData(phone); + Phone phone = (Phone) phonesModel.getElementAt(size -1); + phonesModel.removeData(phone); } } public void onClick$addEmail() { Email email = new Email(); - companyData.getEmailsModel().addData(email); + emailsModel.addData(email); } public void onClick$deleteEmail() { int size = emailListbox.getItemCount(); if (size > 1) { - Email email = (Email) companyData.getEmailsModel().getElementAt(size - 1); - companyData.getEmailsModel().removeData(email); + Email email = (Email) emailsModel.getElementAt(size - 1); + emailsModel.removeData(email); } } @@ -167,11 +186,9 @@ saveEmails(); saveAddresses(); - Company company = model.updateCompany(companyData.getCompany()); - - companyData.setCompany(company); + company = model.updateCompany(company); - Events.postEvent(EVENT_ON_SAVE_COMPANY, this.self, companyData); + Events.postEvent(EVENT_ON_SAVE_COMPANY, this.self, company); this.self.detach(); } @@ -179,7 +196,19 @@ /* * Getters */ - public CompanyData getCompanyData() { - return companyData; + public Company getCompany() { + return company; } + + public AddressesModel getAddressesModel() { + return addressesModel; + } + + public PhonesModel getPhonesModel() { + return phonesModel; + } + + public EmailsModel getEmailsModel() { + return emailsModel; + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-08-04 16:27:57 UTC (rev 121) @@ -25,57 +25,117 @@ import java.util.ArrayList; import java.util.List; + +import org.chorem.data.bonzoms.Company; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zul.AbstractListModel; import org.zkoss.zul.event.ListDataEvent; /** * - * @author sherkhan + * @author bbrossaud */ public class CompanyModel extends AbstractListModel implements BindingListModel { - protected List<CompanyData> companies = new ArrayList<CompanyData>(); - + + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected Criteria criteria = null; + protected int itemsByPage = 1; + protected int size = 0; + protected int currentPage = 0; + protected List<Company> companies = new ArrayList<Company>(); + + public CompanyModel(int itemsByPage) { + this.itemsByPage = itemsByPage; + size = getSize(); + createList(); + } + @Override public Object getElementAt(int index) { - return companies.get(index); + pageChange(index); + int indexList = index % itemsByPage; + Company Company = companies.get(indexList); + return Company; } @Override public int getSize() { - return companies.size(); + if (criteria == null) { + return 0; + } + Criteria criteria = this.criteria.setFirstIndex(0).setEndIndex(0); + PagedResult<Company> result = proxy.findAllByCriteria(Company.class, criteria); + return result.getNumFound(); } - - @Override - public int indexOf(Object obj) { - return companies.indexOf(obj); + + @Override + public int indexOf(Object obj) { + int index = 0; + String id = ((Company) obj).getWikittyId(); + for (Company data : companies) { + String dataId = data.getWikittyId(); + if (id.equals(dataId)) { + index = companies.indexOf(data) + (itemsByPage * currentPage); + break; + } + } + return index; + } + + public void addData(Company newData) { + size = getSize(); + fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } - public void setCompanies(List<CompanyData> companies) { - this.companies = companies; - fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); - } - - public void addData(CompanyData newData) { - companies.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, companies.size() - 1, companies.size() - 1); - } - - public void removeData(CompanyData data) { - int interval = companies.indexOf(data); - companies.remove(data); + public void removeData(Company data) { + int interval = companies.indexOf(data) + (itemsByPage * currentPage); + proxy.delete(data.getWikittyId()); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } public void reloadContent(int rowIndex) { + int indexList = rowIndex % itemsByPage; + Company Company = companies.get(indexList); + Company = proxy.restore(Company.class, Company.getWikittyId()); fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); } public void reload() { + createList(); + size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } - - public List<CompanyData> getCompanies() { - return companies; + + public Criteria getCriteria() { + return criteria; } + + public void setCriteria(Criteria criteria) { + if (criteria != null) { + this.criteria = criteria; + reload(); + } + } + + public void pageChange(int index) { + int item = index; + int page = item / itemsByPage; + if (page != currentPage ) { + currentPage = page; + createList(); + } + } + + protected void createList() { + if (criteria != null) { + int first = currentPage * itemsByPage; + int end = first + (itemsByPage - 1); + Criteria criteria = this.criteria.setFirstIndex(first).setEndIndex(end); + List<Company> Companies = proxy.findAllByCriteria(Company.class, criteria).getAll(); + this.companies = new ArrayList<Company>(Companies); + } + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,16 +1,19 @@ package org.chorem.bonzoms.ui; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.chorem.data.bonzoms.EmploymentContract; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; 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.zul.Button; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -22,44 +25,29 @@ */ public class ContractController extends GenericForwardComposer { - protected Model model = new Model(); - protected ContractsModel contractsModel = new ContractsModel(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected ContractModel contractModel = new ContractModel(20); @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - List<EmploymentContract> contracts = model.retrieveAllContracts(); - if (contracts != null) { - contractsModel.setContracts(contracts); - } + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT).criteria(); + contractModel.setCriteria(criteria); } - protected void createWindowContractForm(EmploymentContract contract) throws InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (contract != null) { - map.put("contract", contract); - } - Window win = (Window) Executions.createComponents("contractFormPage.zul", null, map); - + protected void createWindowContractForm(String id) throws InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("contractId", id); + } + Window win = (Window) Executions.createComponents("contractFormPage.zul", null, map); win.addEventListener(ContractFormController.EVENT_ON_SAVE_CONTRACT, new EventListener() { @Override public void onEvent(Event event) throws Exception { - EmploymentContract data = (EmploymentContract) event.getData(); - if (data != null) { - int rowIndex = contractsModel.indexOf(data); - if (rowIndex == -1) { - contractsModel.addData(data); - } else { - contractsModel.reloadContent(rowIndex); - } - } + contractModel.reload(); } }); - - win.setPage(page); - win.setPosition("center"); - win.doModal(); } /* @@ -79,14 +67,11 @@ Listcell advantages = new Listcell(contract.getAdvantages()); Listcell description = new Listcell(contract.getDescription()); - Listcell details = new Listcell(); - Button button = new Button("details"); - details.appendChild(button); - button.addEventListener("onClick", new EventListener() { + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { @Override public void onEvent(Event event) throws Exception { - createWindowContractForm(contract); + createWindowContractForm(contract.getWikittyId()); } }); @@ -95,7 +80,6 @@ item.appendChild(workingTime); item.appendChild(advantages); item.appendChild(description); - item.appendChild(details); } }; } @@ -114,8 +98,8 @@ /* * Getters */ - public ContractsModel getContractsModel() { - return contractsModel; + public ContractModel getContractModel() { + return contractModel; } /* 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -3,10 +3,12 @@ import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.EmploymentContractImpl; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; 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; +import org.zkoss.zul.Window; /** * @@ -16,15 +18,23 @@ protected Model model = new Model(); protected EmploymentContract contract = new EmploymentContractImpl(); - public final static String EVENT_ON_SAVE_CONTRACT = "onSaveContract"; + + public static final String EVENT_ON_SAVE_CONTRACT = "onSaveContract"; + public static final String EVENT_ON_CLOSE_CONTRACT = "onCloseContract"; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - EmploymentContract data = (EmploymentContract) arg.get("contract"); - if (data != null) { - this.contract = data; + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String contractId = Executions.getCurrent().getParameter("contractId"); + if (contractId == null) { + contractId = (String) arg.get("contractId"); } + if (contractId != null) { + contract = model.retrieveContractById(contractId); + } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); @@ -33,6 +43,10 @@ /* * Events */ + public void onClose() { + Events.postEvent(EVENT_ON_CLOSE_CONTRACT, this.self, null); + } + public void onClick$saveContract() { contract = model.createContract(contract); Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractModel.java 2010-08-04 16:27:57 UTC (rev 121) @@ -0,0 +1,147 @@ +/* + * #%L + * Bonzoms : bonzoms-zk + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.bonzoms.ui; + +import java.util.ArrayList; +import java.util.List; + +import org.chorem.data.bonzoms.EmploymentContract; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.WikittyProxy; +import org.zkoss.zkplus.databind.BindingListModel; +import org.zkoss.zul.AbstractListModel; +import org.zkoss.zul.event.ListDataEvent; + +/** + * + * @author sherkhan + */ +public class ContractModel extends AbstractListModel implements BindingListModel { + + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected Criteria criteria = null; + protected int itemsByPage = 1; + protected int size = 0; + protected int currentPage = 0; + protected List<EmploymentContract> contracts = new ArrayList<EmploymentContract>(); + + public ContractModel(int itemsByPage) { + this.itemsByPage = itemsByPage; + size = getSize(); + createList(); + } + + @Override + public Object getElementAt(int index) { + pageChange(index); + int indexList = index % itemsByPage; + EmploymentContract contract = contracts.get(indexList); + return contract; + } + + @Override + public int getSize() { + if (criteria == null) { + return 0; + } + Criteria criteria = this.criteria.setFirstIndex(0).setEndIndex(0); + PagedResult<EmploymentContract> result = proxy.findAllByCriteria(EmploymentContract.class, criteria); + return result.getNumFound(); + } + + @Override + public int indexOf(Object obj) { + int index = 0; + String id = ((EmploymentContract) obj).getWikittyId(); + for (EmploymentContract data : contracts) { + String dataId = data.getWikittyId(); + if (id.equals(dataId)) { + index = contracts.indexOf(data) + (itemsByPage * currentPage); + break; + } + } + return index; + } + + public void addData(EmploymentContract newData, boolean store) { + if (store == true) { + proxy.store(newData); + } + size = getSize(); + fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); + } + + public void removeData(EmploymentContract data, boolean delete) { + int interval = contracts.indexOf(data) + (itemsByPage * currentPage); + if (delete == true) { + proxy.delete(data.getWikittyId()); + } + createList(); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } + + public void reloadContent(int rowIndex) { + int indexList = rowIndex % itemsByPage; + EmploymentContract contract = contracts.get(indexList); + contract = proxy.restore(EmploymentContract.class, contract.getWikittyId()); + fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); + } + + public void reload() { + createList(); + size = getSize(); + fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); + } + + public Criteria getCriteria() { + return criteria; + } + + public void setCriteria(Criteria criteria) { + if (criteria != null) { + this.criteria = criteria; + reload(); + } + } + + public void pageChange(int index) { + int item = index; + int page = item / itemsByPage; + if (page != currentPage ) { + currentPage = page; + createList(); + } + } + + protected void createList() { + if (criteria != null) { + int first = currentPage * itemsByPage; + int end = first + (itemsByPage - 1); + Criteria criteria = this.criteria.setFirstIndex(first).setEndIndex(end); + List<EmploymentContract> contracts = proxy.findAllByCriteria(EmploymentContract.class, criteria).getAll(); + this.contracts = new ArrayList<EmploymentContract>(contracts); + } + } +} Deleted: 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsData.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,47 +0,0 @@ -package org.chorem.bonzoms.ui; - -import java.util.ArrayList; -import java.util.List; -import org.chorem.data.bonzoms.EmploymentContract; - -/** - * - * @author sherkhan - */ -public class ContractsData { - - 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 - */ - - public void setContractsList(List<EmploymentContract> contracts) { - contractsModel.setContracts(contracts); - } - - /* - * Getters - */ - - public ContractsModel getContractsModel() { - return contractsModel; - } - - public List<EmploymentContract> getContractsList() { - return contractsModel.getContracts(); - } - - public List<String> getRemovedContracts() { - return removedContracts; - } -} Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -4,12 +4,17 @@ import java.util.List; import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.EmploymentContractImpl; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Search; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; 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; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Window; /** * @@ -17,69 +22,84 @@ */ public class ContractsFormController extends GenericForwardComposer { - protected ContractsData contractsData = new ContractsData(); - protected List<EmploymentContract> save = new ArrayList<EmploymentContract>(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + + protected ContractModel contractModel = new ContractModel(20); + protected List<String> removedContracts = new ArrayList<String>(); + protected String employeeId = null; + protected Listbox contractListbox; - public final static String EVENT_ON_SAVE_CONTRACTS = "onSaveContracts"; + public final static String EVENT_ON_SAVE_CONTRACTS = "onSaveContracts"; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - ContractsData data = (ContractsData) arg.get("contractsData"); - if (data != null) { - initContracts(data); - } else { - initDefaultContracts(); + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String employeeId = Executions.getCurrent().getParameter("employeeId"); + if (employeeId == null) { + employeeId = (String) arg.get("employeeId"); } + this.employeeId = employeeId; DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } + protected void init() { + if (employeeId != null) { + initContracts(); + } else { + initDefaultContracts(); + } + } + protected void initDefaultContracts() { EmploymentContract contract = new EmploymentContractImpl(); - contractsData.getContractsModel().addData(contract); + contract.setEmployee(employeeId); + contractModel.addData(contract, false); } - protected void initContracts(ContractsData data) { - contractsData = data; - save = new ArrayList<EmploymentContract>(contractsData.getContractsList()); + protected void initContracts() { + if (employeeId != null) { + Criteria criteria = Search.query().eq(EmploymentContract.FQ_FIELD_EMPLOYEE, employeeId).criteria(); + contractModel.setCriteria(criteria); + } } - + /* * Events */ public void onClick$addContract() { EmploymentContract contract = new EmploymentContractImpl(); - contractsData.getContractsModel().addData(contract); + contract.setEmployee(employeeId); + contractModel.addData(contract, false); } public void onClick$deleteContract() { - int size = contractListbox.getItemCount(); - if (size > 1) { - EmploymentContract contract = (EmploymentContract) contractsData.getContractsModel().getElementAt(size -1); - contractsData.getContractsModel().removeData(contract); - String id = contract.getWikittyId(); - if (!id.isEmpty()) { - contractsData.getRemovedContracts().add(id); - } - } +// int size = contractListbox.getItemCount(); +// if (size > 1) { +// EmploymentContract contract = (EmploymentContract) contractModel.getElementAt(size -1); +// contractModel.removeData(contract); +// String id = contract.getWikittyId(); +// if (!id.isEmpty()) { +// removedContracts.add(id); +// } +// } } public void onClick$saveContracts() { - Events.postEvent(EVENT_ON_SAVE_CONTRACTS, this.self, contractsData); + proxy.delete(removedContracts); + Events.postEvent(EVENT_ON_SAVE_CONTRACTS, this.self, null); self.detach(); } - public void onClose() { - contractsData.setContractsList(save); - } - /* * Getters */ - public ContractsModel getContractsModel() { - return contractsData.getContractsModel(); + public ContractModel getContractModel() { + return contractModel; } } Deleted: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,83 +0,0 @@ -/* - * #%L - * Bonzoms : bonzoms-zk - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.bonzoms.ui; - -import java.util.ArrayList; -import java.util.List; -import org.chorem.data.bonzoms.EmploymentContract; -import org.zkoss.zkplus.databind.BindingListModel; -import org.zkoss.zul.AbstractListModel; -import org.zkoss.zul.event.ListDataEvent; - -/** - * - * @author sherkhan - */ -public class ContractsModel extends AbstractListModel implements BindingListModel { - - List<EmploymentContract> contracts = new ArrayList<EmploymentContract>(); - - @Override - public Object getElementAt(int index) { - return contracts.get(index); - } - - @Override - public int getSize() { - return contracts.size(); - } - - @Override - public int indexOf(Object obj) { - return contracts.indexOf(obj); - } - - public void setContracts(List<EmploymentContract> contracts) { - this.contracts = contracts; - fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); - } - - public void addData(EmploymentContract newData) { - contracts.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, contracts.size() - 1, contracts.size() - 1); - } - - public void removeData(EmploymentContract data) { - int interval = contracts.indexOf(data); - contracts.remove(data); - fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); - } - - public void reloadContent(int rowIndex) { - fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); - } - - public void reload() { - fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); - } - - public List<EmploymentContract> getContracts() { - return contracts; - } -} 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -24,20 +24,21 @@ package org.chorem.bonzoms.ui; import java.util.HashMap; -import java.util.List; import java.util.Map; -import org.chorem.data.bonzoms.Address; + import org.chorem.data.bonzoms.Employee; import org.chorem.data.bonzoms.Person; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.SuspendNotAllowedException; -import org.zkoss.zk.ui.event.CreateEvent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zk.ui.event.ForwardEvent; +import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; -import org.zkoss.zul.Button; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -45,61 +46,33 @@ /** * - * @author sherkhan + * @author bbrossaud */ public class EmployeeController extends GenericForwardComposer { - protected Model model = new Model(); - protected EmployeeModel employeeModel = new EmployeeModel(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected EmployeeModel employeeModel = new EmployeeModel(20); @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - List<Employee> employees = model.retrieveAllEmployees(); - createEmployeeDataList(employees); + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE).criteria(); + employeeModel.setCriteria(criteria); } - 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()); - if (person != null) { - PersonData personData = new PersonData(person, null); - data.setPersonData(personData); - } - employeeModel.addData(data); - } - } - - public void createWindowEmployeeForm(final EmployeeData employeeData) throws SuspendNotAllowedException, InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (employeeData != null) { - map.put("employeeData", employeeData); - } - Window win = (Window) Executions.createComponents("employeeFormPage.zul", null, map); - + public void createWindowEmployeeForm(String id) throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("employeeId", id); + } + Window win = (Window) Executions.createComponents("employeeFormPage.zul", null, map); win.addEventListener(EmployeeFormController.EVENT_ON_SAVE_EMPLOYEE, new EventListener() { @Override public void onEvent(Event event) throws Exception { - EmployeeData data = (EmployeeData) event.getData(); - if (data != null) { - int rowIndex = employeeModel.indexOf(data); - if (rowIndex == -1) { - employeeModel.addData(data); - } else { - employeeModel.reloadContent(rowIndex); - } - } + employeeModel.reload(); } }); - - win.setPage(page); - win.setPosition("center"); -// win.doOverlapped(); - win.doModal(); } /* @@ -111,27 +84,28 @@ @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - final EmployeeData employeeData = (EmployeeData) data; + final Employee employee = (Employee) data; String firstName = ""; String lastName = ""; - if (employeeData.getPersonData() != null) { - firstName = employeeData.getPerson().getFirstName(); - lastName = employeeData.getPerson().getLastName(); + String personId = employee.getPerson(); + if (personId != null) { + Person person = proxy.restore(Person.class, employee.getPerson()); + if (person != null) { + firstName = person.getFirstName(); + lastName = person.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 emailCell = new Listcell(employee.getWorkingEmail()); + Listcell phoneCell = new Listcell(employee.getWorkingPhone()); - Listcell detailsCell = new Listcell(); - Button details = new Button("details"); - detailsCell.appendChild(details); - details.addEventListener("onClick", new EventListener() { + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { @Override public void onEvent(Event event) throws Exception { - createWindowEmployeeForm(employeeData); + createWindowEmployeeForm(employee.getWikittyId()); } }); @@ -139,7 +113,6 @@ item.appendChild(lastNameCell); item.appendChild(emailCell); item.appendChild(phoneCell); - item.appendChild(detailsCell); } }; } Deleted: 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,199 +0,0 @@ -/* - * #%L - * Bonzoms : bonzoms-zk - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.bonzoms.ui; - -import java.util.List; -import org.chorem.data.bonzoms.Address; -import org.chorem.data.bonzoms.AddressImpl; -import org.chorem.data.bonzoms.Employee; -import org.chorem.data.bonzoms.EmployeeImpl; -import org.chorem.data.bonzoms.EmploymentContract; -import org.chorem.data.bonzoms.Person; -import org.chorem.data.bonzoms.Service; - -/** - * - * @author sherkhan - */ -public class EmployeeData { - - protected Employee employee = new EmployeeImpl(); - protected Address workingAddress = new AddressImpl(); - - protected PersonData personData = null; - protected ServiceData serviceData = null; - - protected CompanyData companyData = null; - - protected ContractsData contractsData = null; - public EmployeeData() { - } - - public EmployeeData(Employee employee, Address address) { - this.employee = employee; - this.workingAddress = address; - } - - /* - * Setters - */ - public void setEmployee(Employee employee) { - this.employee = employee; - } - - public void setPersonData(PersonData personData) { - this.personData = personData; - } - - public void setWorkingAddress(Address address) { - this.workingAddress = address; - } - - public void setContractsList(List<EmploymentContract> contracts) { - contractsData.getContractsModel().setContracts(contracts); - } - - public void setPersonPhonesModelList(String phones) { - personData.setPhones(phones); - } - - public void setPersonEmailsModelList(String emails) { - personData.setEmails(emails); - } - - public void setPerson(Person person) { - personData.setPerson(person); - } - - public void setPersonAddresses(List<Address> addresses) { - personData.setAddresses(addresses); - } - - public void setService(Service service) { - serviceData.setService(service); - } - - public void setServiceAddress(Address address) { - serviceData.setAddress(address); - } - - public void setContractsData(ContractsData contractsData) { - this.contractsData = contractsData; - } - - public void setServiceData(ServiceData serviceData) { - this.serviceData = serviceData; - } - - public void setCompanyData(CompanyData companyData) { - this.companyData = companyData; - } - - /* - * Getters - */ - public Employee getEmployee() { - return employee; - } - - public PersonData getPersonData() { - return personData; - } - - public Address getWorkingAddress() { - return workingAddress; - } - - public ContractsModel getContractsModel() { - return contractsData.getContractsModel(); - } - - public List<EmploymentContract> getContractsList() { - return contractsData.getContractsList(); - } - - public List<String> getRemovedContracts() { - return contractsData.getRemovedContracts(); - } - - public Person getPerson() { - return personData.getPerson(); - } - - public AddressesModel getPersonAddressesModel() { - return personData.getAddressesModel(); - } - - public List<Address> getPersonAddresses() { - return personData.getAddresses(); - } - - public PhonesModel getPersonPhonesModel() { - return personData.getPhonesModel(); - } - - public List<Phone> getPersonPhones() { - return personData.getPhones(); - } - - public EmailsModel getPersonEmailsModel() { - return personData.getEmailsModel(); - } - - public List<Email> getPersonEmails() { - return personData.getEmails(); - } - - public List<String> getPersonRemovedAddresses() { - return personData.getRemovedAddresses(); - } - - public ServiceData getServiceData() { - return serviceData; - } - - public Service getService() { - return serviceData.getService(); - } - - public Address getServiceAddress() { - return serviceData.getAddress(); - } - - public ContractsData getContractsData() { - return contractsData; - } - - public String getPersonPhonesModelAsString() { - return personData.getPhonesAsString(); - } - - public String getPersonEmailsModelAsString() { - return personData.getEmailsAsString(); - } - - public CompanyData getCompanyData() { - return companyData; - } -} 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -23,19 +23,20 @@ */ package org.chorem.bonzoms.ui; -import java.util.ArrayList; 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.Company; -import org.chorem.data.bonzoms.CompanyImpl; import org.chorem.data.bonzoms.Employee; -import org.chorem.data.bonzoms.EmploymentContract; +import org.chorem.data.bonzoms.EmployeeImpl; import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.Service; -import org.chorem.data.bonzoms.ServiceImpl; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.SuspendNotAllowedException; @@ -45,7 +46,9 @@ import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; +import org.zkoss.zul.Bandbox; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.Window; @@ -56,313 +59,297 @@ */ public class EmployeeFormController extends GenericForwardComposer { - protected Model model = new Model(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); - protected EmployeeData employeeData = new EmployeeData(); + protected Employee employee = new EmployeeImpl(); + protected Address workingAddress = new AddressImpl(); + + protected CompanyModel companyModel = new CompanyModel(5); + protected ServiceModel serviceModel = new ServiceModel(5); + protected PersonModel personModel = new PersonModel(5); - protected CompanyModel companyModel = new CompanyModel(); - protected ServiceModel serviceModel = new ServiceModel(); - + protected Bandbox companyBandbox; + protected Bandbox serviceBandbox; + protected Bandbox personBandbox; + protected Listbox companyListbox; protected Listbox serviceListbox; + protected Listbox personListbox; - public final static String EVENT_ON_SAVE_EMPLOYEE = "onSaveEmployee"; + public static final String EVENT_ON_SAVE_EMPLOYEE = "onSaveEmployee"; + public static final String EVENT_ON_CLOSE_EMPLOYEE = "onCloseEmployee"; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - EmployeeData data = (EmployeeData) arg.get("employeeData"); - initCompanyModel(); - initServiceModel(); - if (data != null) { - initEmployee(data); + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String employeeId = Executions.getCurrent().getParameter("employeeId"); + if (employeeId == null) { + employeeId = (String) arg.get("employeeId"); } + init(employeeId); DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } - protected void initCompanyModel() { - Company newCompany = new CompanyImpl(); - newCompany.setName("New company"); - companyModel.addData(new CompanyData(newCompany, null)); - List<Company> companies = model.retrieveAllCompanies(); - for (Company company : companies) { - CompanyData data = new CompanyData(company, null); - companyModel.addData(data); + protected void init(String employeeId) { + if (employeeId != null && !employeeId.isEmpty()) { + initEmployee(employeeId); } + if (employeeId == null || employeeId.isEmpty()) { + Component comp = self.getFellowIfAny("editContracts", false); + comp.setVisible(false); + } + initServiceModel(); + initCompanyModel(); + initPersonModel(); } + + protected void initEmployee(String employeeId) { + employee = proxy.restore(Employee.class, employeeId); + workingAddress = proxy.restore(Address.class, employee.getAddress()); + } protected void initServiceModel() { - Service newService = new ServiceImpl(); - newService.setType("New service"); - serviceModel.addData(new ServiceData(newService, null)); - List<Service> services = model.retrieveAllServices(); - for (Service service : services) { - ServiceData data = new ServiceData(service, null); - serviceModel.addData(data); - } + onOK$serviceBandbox(); + String serviceId = employee.getService(); + if (serviceId != null && !serviceId.isEmpty()) { + Service service = proxy.restore(Service.class, serviceId); + serviceBandbox.setValue(service.getType()); + } } - - protected void initPerson() { - Person person = model.retrievePersonById(employeeData.getEmployee().getPerson()); - if (person != null) { - PersonData personData = new PersonData(person, null); - employeeData.setPersonData(personData); - } + + protected void initCompanyModel() { + onOK$companyBandbox(); + String companyId = employee.getCompany(); + if (companyId != null && !companyId.isEmpty()) { + Company company = proxy.restore(Company.class, companyId); + companyBandbox.setValue(company.getName()); + } } - - protected void initService() { - Service service = model.retrieveServiceById(employeeData.getEmployee().getService()); - if (service != null) { - ServiceData serviceData = new ServiceData(service, null); - employeeData.setServiceData(serviceData); - } + + protected void initPersonModel() { + onOK$personBandbox(); + String personId = employee.getPerson(); + if (personId != null && !personId.isEmpty()) { + Person person = proxy.restore(Person.class, personId); + String name = person.getFirstName() + " " + person.getLastName(); + personBandbox.setValue(name); + } } - - protected void initContracts() { - 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) { - employeeData = employee; - Address workingAddress = model.retrieveAddressById(employee.getEmployee().getAddress()); - employeeData.setWorkingAddress(workingAddress); - - initPerson(); - - initService(); - - initContracts(); - - } - - protected void removePersonAddresses() { - List<String> ids = employeeData.getPersonRemovedAddresses(); - for (String id : ids) { - employeeData.getPerson().removeAddress(id); - } - } - - protected void removeEmployeeContracts() { - List<String> ids = employeeData.getRemovedContracts(); - for (String id : ids) { - employeeData.getEmployee().removeEmploymentContract(id); - } - } - - protected void saveEmployeeContracts() { - 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()); - } - } - } - + /* * Renderers */ - - public ListitemRenderer getCompanyDataRenderer() { + public ListitemRenderer getCompanyRenderer() { return new ListitemRenderer() { @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - CompanyData companyData = (CompanyData) data; - String id = employeeData.getEmployee().getCompany(); - String companyId = companyData.getCompany().getWikittyId(); - item.setLabel(companyData.getCompany().getName()); - if (id != null && id.equals(companyId)) { - companyListbox.setSelectedItem(item); - employeeData.setCompanyData(companyData); - } + final Company company = (Company) data; + Listcell name = new Listcell(company.getName()); + Listcell type = new Listcell(company.getType()); + item.appendChild(name); + item.appendChild(type); + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + employee.setCompany(company.getWikittyId()); + companyBandbox.setValue(company.getName()); + companyBandbox.close(); + } + }); } }; } - public ListitemRenderer getServiceDataRenderer() { + public ListitemRenderer getServiceRenderer() { return new ListitemRenderer() { @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - ServiceData serviceData = (ServiceData) data; - String id = employeeData.getEmployee().getService(); - String serviceId = serviceData.getService().getWikittyId(); - item.setLabel(serviceData.getService().getType()); - if (id != null && id.equals(serviceId)) { - serviceListbox.setSelectedItem(item); - employeeData.setServiceData(serviceData); - } + final Service service = (Service) data; + Listcell name = new Listcell(service.getType()); + item.appendChild(name); + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + employee.setService(service.getWikittyId()); + serviceBandbox.setValue(service.getType()); + serviceBandbox.close(); + } + }); } }; } + public ListitemRenderer getPersonRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + final Person person = (Person) data; + Listcell firstName = new Listcell(person.getFirstName()); + Listcell lastName = new Listcell(person.getLastName()); + item.appendChild(firstName); + item.appendChild(lastName); + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + employee.setPerson(person.getWikittyId()); + String name = person.getFirstName() + " " + person.getLastName(); + personBandbox.setValue(name); + personBandbox.close(); + } + }); + } + }; + } + /* * Events */ + public void onOK$companyBandbox() { + String search = companyBandbox.getValue(); + Search query = Search.query().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY); + if (search != null && !search.isEmpty()) { + query = query.keyword(search); + } + Criteria criteria = query.criteria(); + companyModel.setCriteria(criteria); + companyBandbox.open(); + } + + public void onOK$serviceBandbox() { + String search = serviceBandbox.getValue(); + Search query = Search.query().eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); + if (search != null && !search.isEmpty()) { + query = query.keyword(search); + } + Criteria criteria = query.criteria(); + serviceModel.setCriteria(criteria); + serviceBandbox.open(); + } + + public void onOK$personBandbox() { + String search = personBandbox.getValue(); + Search query = Search.query().eq(Element.ELT_EXTENSION, Person.EXT_PERSON); + if (search != null && !search.isEmpty()) { + query = query.keyword(search); + } + Criteria criteria = query.criteria(); + personModel.setCriteria(criteria); + personBandbox.open(); + } + + public void onClose() { + Events.postEvent(EVENT_ON_CLOSE_EMPLOYEE, this.self, null); + } + public void onClick$saveEmployee() { - Address workingAddress = model.updateAddress(employeeData.getWorkingAddress()); - employeeData.getEmployee().setAddress(workingAddress.getWikittyId()); + workingAddress = proxy.store(workingAddress); + employee.setAddress(workingAddress.getWikittyId()); - saveEmployeeContracts(); + employee = proxy.store(employee); - Employee employee = model.createEmployee(employeeData.getEmployee()); - employeeData.setEmployee(employee); - - Events.postEvent(EVENT_ON_SAVE_EMPLOYEE, this.self, employeeData); + Events.postEvent(EVENT_ON_SAVE_EMPLOYEE, this.self, null); this.self.detach(); } - public void onSelect$companyListbox() { - int index = companyListbox.getSelectedIndex(); - if (index != -1) { - if (index == 0) { - employeeData.setCompanyData(null); - } else { - CompanyData data = (CompanyData) companyModel.getElementAt(index); - employeeData.setCompanyData(data); - employeeData.getEmployee().setCompany(data.getCompany().getWikittyId()); - } - } - } - - - public void onSelect$serviceListbox() { - int index = serviceListbox.getSelectedIndex(); - if (index != -1) { - if (index == 0) { - employeeData.setServiceData(null); - } else { - ServiceData data = (ServiceData) serviceModel.getElementAt(index); - employeeData.setServiceData(data); - employeeData.getEmployee().setService(data.getService().getWikittyId()); - } - } - } - 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); - + Map<String, Object> map = new HashMap<String, Object>(); + String id = employee.getPerson(); + if (id != null && !id.isEmpty()) { + map.put("personId", id); + } + 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); - employeeData.getEmployee().setPerson(data.getPerson().getWikittyId()); + Person person = (Person) event.getData(); + if (person != null) { + employee.setPerson(person.getWikittyId()); + String name = person.getFirstName() + " " + person.getLastName(); + personBandbox.setValue(name); } + personModel.reload(); } }); - - win.setPage(page); - win.setPosition("center"); - win.doModal(); } public void onClick$editCompany() throws InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (employeeData.getCompanyData() != null){ - map.put("companyData", employeeData.getCompanyData()); - } - Window win = (Window) Executions.createComponents("companyFormPage.zul", null, map); - + if (companyBandbox.getValue().isEmpty()) { + employee.setCompany(null); + } + Map<String, Object> map = new HashMap<String, Object>(); + String id = employee.getCompany(); + if (id != null && !id.isEmpty()) { + map.put("companyId", id); + } + Window win = (Window) Executions.createComponents("companyFormPage.zul", null, map); win.addEventListener(CompanyFormController.EVENT_ON_SAVE_COMPANY, new EventListener() { @Override public void onEvent(Event event) throws Exception { - CompanyData data = (CompanyData) event.getData(); - if (data != null) { - if (employeeData.getCompanyData() == null) { - companyModel.addData(data); - int index = companyModel.indexOf(data); - companyListbox.setSelectedIndex(index); - } - employeeData.setCompanyData(data); - employeeData.getEmployee().setCompany(data.getCompany().getWikittyId()); - } + Company company = (Company) event.getData(); + if (company != null) { + employee.setCompany(company.getWikittyId()); + companyBandbox.setValue(company.getName()); + } + companyModel.reload(); } }); - - win.setPage(page); - win.setPosition("center"); - win.doModal(); } - public void onClick$editContracts() throws SuspendNotAllowedException, InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (employeeData.getContractsData() != null) { - map.put("contractsData", employeeData.getContractsData()); - } - Window win = (Window) Executions.createComponents("contractsFormPage.zul", null, map); - - win.addEventListener(ContractsFormController.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(); - } - public void onClick$editService() throws SuspendNotAllowedException, InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (employeeData.getServiceData() != null){ - map.put("serviceData", employeeData.getServiceData()); - } - Window win = (Window) Executions.createComponents("serviceFormPage.zul", null, map); - + if (serviceBandbox.getValue().isEmpty()) { + employee.setService(null); + } + Map<String, Object> map = new HashMap<String, Object>(); + String id = employee.getService(); + if (id != null && !id.isEmpty()) { + map.put("serviceId", id); + } + 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) { - if (employeeData.getServiceData() == null) { - serviceModel.addData(data); - int index = serviceModel.indexOf(data); - serviceListbox.setSelectedIndex(index); - } - employeeData.setServiceData(data); - employeeData.getEmployee().setService(data.getService().getWikittyId()); + Service service = (Service) event.getData(); + if (service != null) { + employee.setService(service.getWikittyId()); + serviceBandbox.setValue(service.getType()); } + serviceModel.reload(); } }); - win.setPage(page); - win.setPosition("center"); - win.doModal(); } + public void onClick$editContracts() throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + String id = employee.getWikittyId(); + if (id != null && !id.isEmpty()) { + map.put("employeeId", id); + } + Executions.createComponents("contractsFormPage.zul", null, map); + } + /* * Getters */ - public EmployeeData getEmployeeData() { - return employeeData; + public Employee getEmployee() { + return employee; } public CompanyModel getCompanyModel() { @@ -372,4 +359,8 @@ public ServiceModel getServiceModel() { return serviceModel; } + + public Address getWorkingAddress() { + return workingAddress; + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-08-04 16:27:57 UTC (rev 121) @@ -25,6 +25,11 @@ import java.util.ArrayList; import java.util.List; + +import org.chorem.data.bonzoms.Employee; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zul.AbstractListModel; import org.zkoss.zul.event.ListDataEvent; @@ -34,44 +39,104 @@ * @author sherkhan */ public class EmployeeModel extends AbstractListModel implements BindingListModel { - protected List<EmployeeData> employees = new ArrayList<EmployeeData>(); - + + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected Criteria criteria = null; + protected int itemsByPage = 1; + protected int size = 0; + protected int currentPage = 0; + protected List<Employee> employees = new ArrayList<Employee>(); + + public EmployeeModel(int itemsByPage) { + this.itemsByPage = itemsByPage; + size = getSize(); + createList(); + } + @Override public Object getElementAt(int index) { - return employees.get(index); + pageChange(index); + int indexList = index % itemsByPage; + Employee employee = employees.get(indexList); + return employee; } @Override public int getSize() { - return employees.size(); + if (criteria == null) { + return 0; + } + Criteria criteria = this.criteria.setFirstIndex(0).setEndIndex(0); + PagedResult<Employee> result = proxy.findAllByCriteria(Employee.class, criteria); + return result.getNumFound(); } - - @Override - public int indexOf(Object obj) { - return employees.indexOf(obj); + + @Override + public int indexOf(Object obj) { + int index = 0; + Employee employee = (Employee) obj; + String id = employee.getWikittyId(); + for (Employee data : employees) { + String dataId = data.getWikittyId(); + if (id.equals(dataId)) { + index = employees.indexOf(data) + (itemsByPage * currentPage); + break; + } + } + return index; + } + + public void addData(Employee newData) { + size = getSize(); + fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } - public void setEmployees(List<EmployeeData> employees) { - this.employees = employees; - fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); - } - - public void addData(EmployeeData newData) { - employees.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, employees.size() - 1, employees.size() - 1); - } - - public void removeData(EmployeeData data) { - int interval = employees.indexOf(data); - employees.remove(data); + public void removeData(Employee data) { + int interval = employees.indexOf(data) + (itemsByPage * currentPage); + proxy.delete(data.getWikittyId()); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } public void reloadContent(int rowIndex) { + int indexList = rowIndex % itemsByPage; + Employee employee = employees.get(indexList); + employee = proxy.restore(Employee.class, employee.getWikittyId()); fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); } public void reload() { + createList(); + size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } + + public Criteria getCriteria() { + return criteria; + } + + public void setCriteria(Criteria criteria) { + if (criteria != null) { + this.criteria = criteria; + reload(); + } + } + + public void pageChange(int index) { + int item = index; + int page = item / itemsByPage; + if (page != currentPage ) { + currentPage = page; + createList(); + } + } + + protected void createList() { + if (criteria != null) { + int first = currentPage * itemsByPage; + int end = first + (itemsByPage - 1); + Criteria criteria = this.criteria.setFirstIndex(first).setEndIndex(end); + List<Employee> employees = proxy.findAllByCriteria(Employee.class, criteria).getAll(); + this.employees = new ArrayList<Employee>(employees); + } + } } 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -23,13 +23,9 @@ */ package org.chorem.bonzoms.ui; -import java.util.HashMap; -import java.util.Map; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Textbox; -import org.zkoss.zul.Vbox; +import org.zkoss.zul.Include; /** * @@ -37,82 +33,14 @@ */ public class MainController extends GenericForwardComposer { - protected Vbox content; protected Textbox searchBox; - - 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 { - super.doAfterCompose(comp); -// createEmployeesPage(); - } - - protected void createEmployeesPage() { - removeAllContentPage(); - Component newContent = Executions.createComponents("employeePage.zul", null, null); - content.appendChild(newContent); - } - - protected void createPersonsPage() { - removeAllContentPage(); - Component newContent = Executions.createComponents("personPage.zul", null, null); - content.appendChild(newContent); - } - - protected void createCompaniesPage() { - removeAllContentPage(); - Component newContent = Executions.createComponents("companyPage.zul", null, null); - content.appendChild(newContent); - } - - protected void createServicesPage() { - removeAllContentPage(); - Component newContent = Executions.createComponents("servicePage.zul", null, null); - content.appendChild(newContent); - } - - protected void createContractsPage() { - removeAllContentPage(); - Component newContent = Executions.createComponents("contractPage.zul", null, null); - content.appendChild(newContent); - } - - protected void removeAllContentPage() { - content.getLastChild().detach(); - } - - protected Map<String, Object> initMap() { - String search = searchBox.getValue(); - Map<String, Object> map = new HashMap<String, Object>(); - if (search != null && !search.isEmpty()) { - map.put("search", searchBox.getValue()); - } - return map; - } - + protected Include include; /* * Events */ public void onOK$searchBox() { -// Component win = content.getLastChild(); -// String id = win.getId(); -// Map<String, Object> map = initMap(); -// if (id.equals(EMPLOYEE_WINDOW_ID)) { -// createEmployeesPage(map); -// } else if (id.equals(COMPANY_WINDOW_ID)) { -// createCompaniesPage(map); -// } else if (id.equals(PERSON_WINDOW_ID)) { -// createPersonsPage(map); -// } else if (id.equals(SERVICE_WINDOW_ID)) { -// createServicesPage(map); -// } - removeAllContentPage(); - Component newContent = Executions.createComponents("resultPage.zul", null, initMap()); - content.appendChild(newContent); + String search = searchBox.getValue(); + include.setSrc("resultPage.zul?search=" + search); } public void onClick$searchButton() { @@ -120,22 +48,22 @@ } public void onClick$employees() { - createEmployeesPage(); + include.setSrc("employeePage.zul"); } public void onClick$persons() { - createPersonsPage(); + include.setSrc("personPage.zul"); } public void onClick$companies() { - createCompaniesPage(); + include.setSrc("companyPage.zul"); } public void onClick$services() { - createServicesPage(); + include.setSrc("servicePage.zul"); } public void onClick$contracts() { - createContractsPage(); + include.setSrc("contractPage.zul"); } } 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-08-04 16:27:57 UTC (rev 121) @@ -115,6 +115,13 @@ return services; } + public List<EmploymentContract> retrieveContractsByEmployeeId(String id) { + Criteria criteria = Search.query().eq(EmploymentContract.FQ_FIELD_EMPLOYEE, id).criteria(); + List<EmploymentContract> contracts = proxy.findAllByCriteria(EmploymentContract.class, criteria).getAll(); + contracts = new ArrayList<EmploymentContract>(contracts); + return contracts; + } + public Person retrievePersonById(String id) { if (id == null) { return null; @@ -202,10 +209,12 @@ } Criteria criteria = search.criteria(); + WikittyService service = proxy.getWikittyService(); - PagedResult result = service.findAllByCriteria(null, criteria); + String securityToken = proxy.getSecurityToken(); + PagedResult<?> result = service.findAllByCriteria(securityToken, criteria); if (result != null) { - wikitties = result.cast(null, proxy.getWikittyService()).getAll(); + wikitties = result.cast(securityToken, service).getAll(); wikitties = new ArrayList<Wikitty>(wikitties); } return wikitties; 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -25,20 +25,21 @@ package org.chorem.bonzoms.ui; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; -import org.chorem.data.bonzoms.Address; + import org.chorem.data.bonzoms.Person; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; 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.zul.Button; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -52,51 +53,28 @@ protected Model model = new Model(); - protected PersonModel personModel = new PersonModel(); + protected PersonModel personModel = new PersonModel(20); @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - List<Person> persons = model.retrieveAllPersons(); - createPersonsData(persons); + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Person.EXT_PERSON).criteria(); + personModel.setCriteria(criteria); } - - public void createPersonsData(List<Person> persons) { - for (Person person : persons) { - List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(person.getAddress())); - PersonData data = new PersonData(person, addresses); - personModel.addData(data); - } - } - - public void createWindowPersonForm(PersonData personData) throws SuspendNotAllowedException, InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (personData != null) { - map.put("personData", personData); - } - Window win = (Window) Executions.createComponents("personFormPage.zul", null, map); - + + public void createWindowPersonForm(String id) throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("personId", id); + } + 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); - } - } + personModel.reload(); } }); - - win.setPage(page); -// win.doHighlighted(); - win.setPosition("center"); -// win.doOverlapped(); - win.doModal(); } /* @@ -115,32 +93,28 @@ @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - final PersonData personData = (PersonData) data; + final Person person = (Person) data; SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - Listcell firstNameCell = new Listcell(personData.getPerson().getFirstName()); - Listcell lastNameCell = new Listcell(personData.getPerson().getLastName()); + Listcell firstNameCell = new Listcell(person.getFirstName()); + Listcell lastNameCell = new Listcell(person.getLastName()); String birthday = ""; - Date date = personData.getPerson().getBirthDay(); + Date date = person.getBirthDay(); if (date != null) { birthday = sdf.format(date); } Listcell dateCell = new Listcell(birthday); - Listcell detailsCell = new Listcell(); - Button details = new Button("details"); - detailsCell.appendChild(details); - details.addEventListener("onClick", new EventListener() { + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { @Override public void onEvent(Event event) throws Exception { - createWindowPersonForm(personData); + createWindowPersonForm(person.getWikittyId()); } }); item.appendChild(firstNameCell); item.appendChild(lastNameCell); item.appendChild(dateCell); - item.appendChild(detailsCell); } }; } Deleted: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonData.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonData.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonData.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,143 +0,0 @@ -/* - * #%L - * Bonzoms : bonzoms-zk - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.bonzoms.ui; - -import java.util.ArrayList; -import java.util.List; -import org.chorem.data.bonzoms.Address; -import org.chorem.data.bonzoms.Person; -import org.chorem.data.bonzoms.PersonImpl; - -/** - * - * @author sherkhan - */ -public class PersonData { - - protected Person person = new PersonImpl(); - protected PhonesModel phonesModel = new PhonesModel(); - protected EmailsModel emailsModel = new EmailsModel(); - protected AddressesModel addressesModel = new AddressesModel(); - protected List<String> removedAddresses = new ArrayList<String>(); - - public PersonData() { - } - - public PersonData(Person person, List<Address> addresses) { - setPerson(person); - setAddresses(addresses); - } - - /* - * Getters - */ - public Person getPerson() { - return person; - } - - public List<Address> getAddresses() { - return addressesModel.getAddresses(); - } - - public List<Phone> getPhones() { - return phonesModel.getPhones(); - } - - public List<Email> getEmails() { - return emailsModel.getEmails(); - } - - public EmailsModel getEmailsModel() { - return emailsModel; - } - - public PhonesModel getPhonesModel() { - return phonesModel; - } - - public List<String> getRemovedAddresses() { - return removedAddresses; - } - - public AddressesModel getAddressesModel() { - return addressesModel; - } - - public String getEmailsAsString() { - return emailsModel.getEmailsAsString(); - } - - public String getPhonesAsString() { - return phonesModel.getPhonesAsString(); - } - - /* - * Setters - */ - public void setPerson(Person obj) { - if (obj != null) { - person = obj; - } - } - - public void setAddresses(List<Address> list) { - if (list != null) { - addressesModel.setAddresses(list); - } - } - - public void setEmails(String str) { - if (str != null) { - emailsModel.setEmails(str); - } - } - - public void setEmails(List<Email> emails) { - if (emails != null) { - emailsModel.setEmails(emails); - } - } - - public void setPhones(List<Phone> phones) { - if (phones != null) { - phonesModel.setPhones(phones); - } - } - - public void setPhones(String str) { - if (str != null) { - phonesModel.setPhones(str); - } - } - - public void setRemovedAddresses(List<String> list) { - if (list != null) { - removedAddresses = list; - } - } - - public void setAddressesModel(AddressesModel addr) { - addressesModel = addr; - } -} 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -5,12 +5,15 @@ import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Person; +import org.chorem.data.bonzoms.PersonImpl; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; 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; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Window; /** * @@ -20,139 +23,164 @@ protected Model model = new Model(); - protected PersonData personData = new PersonData(); + protected Person person = new PersonImpl(); + protected AddressesModel addressesModel = new AddressesModel(); + protected EmailsModel emailsModel = new EmailsModel(); + protected PhonesModel phonesModel = new PhonesModel(); + List<String> removedAddresses = new ArrayList<String>(); protected Listbox addressListbox; protected Listbox phoneListbox; protected Listbox emailListbox; - public final static String EVENT_ON_SAVE_PERSON = "onSavePerson"; + public static final String EVENT_ON_SAVE_PERSON = "onSavePerson"; + public static final String EVENT_ON_CLOSE_PERSON = "onClosePerson"; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - PersonData person = (PersonData) arg.get("personData"); - init(person); + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String personId = Executions.getCurrent().getParameter("personId"); + if (personId == null) { + personId = (String) arg.get("personId"); + } + init(personId); DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } - protected void init(PersonData personData) { - if (personData == null) { + protected void init(String personId) { + if (personId == null) { initDefaultPerson(); } else { - initPerson(personData); + initPerson(personId); } } protected void initDefaultPerson() { Address address = new AddressImpl(); - personData.getAddressesModel().addData(address); + addressesModel.addData(address); Phone phone = new Phone(); - personData.getPhonesModel().addData(phone); + phonesModel.addData(phone); Email email = new Email(); - personData.getEmailsModel().addData(email); + emailsModel.addData(email); } - protected void initPerson(PersonData personData) { - this.personData = personData; - List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(personData.getPerson().getAddress())); - this.personData.setAddresses(addresses); - this.personData.setEmails(personData.getPerson().getEmails()); - this.personData.setPhones(personData.getPerson().getPhones()); + protected void initPerson(String personId) { + person = model.retrievePersonById(personId); + List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(person.getAddress())); + addressesModel.setAddresses(addresses); + emailsModel.setEmails(person.getEmails()); + phonesModel.setPhones(person.getPhones()); } protected void removeAddresses() { - List<String> ids = personData.getRemovedAddresses(); - for (String id : ids) { - personData.getPerson().removeAddress(id); + for (String id : removedAddresses) { + person.removeAddress(id); } } protected void saveAddresses() { - List<Address> addresses = model.createAddresses(personData.getAddresses()); - if (!personData.getRemovedAddresses().isEmpty()) { - model.deleteAddressesByIds(personData.getRemovedAddresses()); + List<Address> addresses = model.createAddresses(addressesModel.getAddresses()); + if (!removedAddresses.isEmpty()) { + model.deleteAddressesByIds(removedAddresses); removeAddresses(); } for (Address address : addresses) { - personData.getPerson().addAddress(address.getWikittyId()); + person.addAddress(address.getWikittyId()); } } protected void saveEmails() { - String emails = personData.getEmailsAsString(); - personData.getPerson().setEmails(emails); + String emails = emailsModel.getEmailsAsString(); + person.setEmails(emails); } protected void savePhones() { - String phones = personData.getPhonesAsString(); - personData.getPerson().setPhones(phones); + String phones = phonesModel.getPhonesAsString(); + person.setPhones(phones); } /* * Events */ + public void onClose() { + Events.postEvent(EVENT_ON_CLOSE_PERSON, this.self, null); + } + public void onClick$savePerson() { saveAddresses(); savePhones(); saveEmails(); - Person person = model.createPerson(personData.getPerson()); - personData.setPerson(person); - Events.postEvent(EVENT_ON_SAVE_PERSON, this.self, personData); + person = model.createPerson(person); + Events.postEvent(EVENT_ON_SAVE_PERSON, this.self, person); self.detach(); } public void onClick$addAddress() { Address address = new AddressImpl(); - personData.getAddressesModel().addData(address); + addressesModel.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); + Address address = (Address) addressesModel.getElementAt(size -1); + addressesModel.removeData(address); String id = address.getWikittyId(); if (!id.isEmpty()) { - personData.getRemovedAddresses().add(id); + removedAddresses.add(id); } } } public void onClick$addPhone() { Phone phone = new Phone(); - personData.getPhonesModel().addData(phone); + phonesModel.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); + Phone phone = (Phone) phonesModel.getElementAt(size -1); + phonesModel.removeData(phone); } } public void onClick$addEmail() { Email email = new Email(); - personData.getEmailsModel().addData(email); + emailsModel.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); + Email email = (Email) emailsModel.getElementAt(size -1); + emailsModel.removeData(email); } } /* * Getters */ - public PersonData getPersonData() { - return personData; + public Person getPerson() { + return person; } + + public AddressesModel getAddressesModel() { + return addressesModel; + } + + public PhonesModel getPhonesModel() { + return phonesModel; + } + + public EmailsModel getEmailsModel() { + return emailsModel; + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonModel.java 2010-08-04 16:27:57 UTC (rev 121) @@ -2,6 +2,11 @@ import java.util.ArrayList; import java.util.List; + +import org.chorem.data.bonzoms.Person; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zul.AbstractListModel; import org.zkoss.zul.event.ListDataEvent; @@ -12,42 +17,102 @@ */ public class PersonModel extends AbstractListModel implements BindingListModel { - protected List<PersonData> persons = new ArrayList<PersonData>(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected Criteria criteria = null; + protected int itemsByPage = 1; + protected int size = 0; + protected int currentPage = 0; + protected List<Person> persons = new ArrayList<Person>(); + + public PersonModel(int itemsByPage) { + this.itemsByPage = itemsByPage; + size = getSize(); + createList(); + } + @Override public Object getElementAt(int index) { - return persons.get(index); + pageChange(index); + int indexList = index % itemsByPage; + Person Person = persons.get(indexList); + return Person; } @Override public int getSize() { - return persons.size(); + if (criteria == null) { + return 0; + } + Criteria criteria = this.criteria.setFirstIndex(0).setEndIndex(0); + PagedResult<Person> result = proxy.findAllByCriteria(Person.class, criteria); + return result.getNumFound(); } - - @Override - public int indexOf(Object obj) { - return persons.indexOf(obj); + + @Override + public int indexOf(Object obj) { + int index = 0; + String id = ((Person) obj).getWikittyId(); + for (Person data : persons) { + String dataId = data.getWikittyId(); + if (id.equals(dataId)) { + index = persons.indexOf(data) + (itemsByPage * currentPage); + break; + } + } + return index; + } + + public void addData(Person newData) { + size = getSize(); + fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } - public void setPersons(List<PersonData> persons) { - this.persons = persons; - fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); - } - - public void addData(PersonData newData) { - persons.add(newData); - } - - public void removeData(PersonData data) { - int interval = persons.indexOf(data); - persons.remove(data); + public void removeData(Person data) { + int interval = persons.indexOf(data) + (itemsByPage * currentPage); + proxy.delete(data.getWikittyId()); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } public void reloadContent(int rowIndex) { + int indexList = rowIndex % itemsByPage; + Person Person = persons.get(indexList); + Person = proxy.restore(Person.class, Person.getWikittyId()); fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); } public void reload() { + createList(); + size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } + + public Criteria getCriteria() { + return criteria; + } + + public void setCriteria(Criteria criteria) { + if (criteria != null) { + this.criteria = criteria; + reload(); + } + } + + public void pageChange(int index) { + int item = index; + int page = item / itemsByPage; + if (page != currentPage ) { + currentPage = page; + createList(); + } + } + + protected void createList() { + if (criteria != null) { + int first = currentPage * itemsByPage; + int end = first + (itemsByPage - 1); + Criteria criteria = this.criteria.setFirstIndex(first).setEndIndex(end); + List<Person> persons = proxy.findAllByCriteria(Person.class, criteria).getAll(); + this.persons = new ArrayList<Person>(persons); + } + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.Company; import org.chorem.data.bonzoms.Employee; @@ -35,8 +36,13 @@ import org.chorem.data.bonzoms.Service; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.FieldType.TYPE; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.SuspendNotAllowedException; @@ -49,7 +55,6 @@ import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.Toolbarbutton; -import org.zkoss.zul.Window; /** * @@ -57,73 +62,78 @@ */ public class ResultController extends GenericForwardComposer { - protected Model model = new Model(); - protected WikittyModel wikittyModel = new WikittyModel(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected WikittyModel wikittyModel = new WikittyModel(10); @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - String search = (String) arg.get("search"); - if (search == null) { - search = ""; - } - List<Wikitty> wikitties = model.retrieveAllBySearch(search); - wikittyModel.setWikitties(wikitties); + String str = Executions.getCurrent().getParameter("search"); + + Criteria criteria = getCriteriaBySearch(str); + wikittyModel.setCriteria(criteria); } - protected void createPage(Map<String, Object> map, String zulFile) - throws SuspendNotAllowedException, InterruptedException { - Window win = (Window) Executions.createComponents(zulFile, null, map); - win.setPage(page); - win.setPosition("center"); - win.doModal(); + protected Criteria getCriteriaBySearch(String str) { + Search search = Search.query().eq(Element.ELT_EXTENSION, Person.EXT_PERSON); + search = search.or().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY); + search = search.eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); + search = search.eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); + search = search.eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); + search = search.eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); + if (str != null && !str.isEmpty()) { + search = search.and().keyword(str); + } + Criteria criteria = search.criteria(); + return criteria; } - - - protected void createEmploymentContractPage(String id) throws SuspendNotAllowedException, InterruptedException { - EmploymentContract contract = model.retrieveContractById(id); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("contract", contract); - createPage(map, "contractFormPage.zul"); + + protected void createEmploymentContractPage(String id) throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("contractId", id); + } + Executions.createComponents("contractFormPage.zul", null, map); } protected void createPersonPage(String id) throws SuspendNotAllowedException, InterruptedException { - Person person = model.retrievePersonById(id); - PersonData data = new PersonData(person, null); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("personData", data); - createPage(map, "personFormPage.zul"); + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("personId", id); + } + Executions.createComponents("personFormPage.zul", null, map); } protected void createEmployeePage(String id) throws SuspendNotAllowedException, InterruptedException { - Employee employee = model.retrieveEmployeeById(id); - EmployeeData data = new EmployeeData(employee, null); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("employeeData", data); - createPage(map, "employeeFormPage.zul"); + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("employeeId", id); + } + Executions.createComponents("employeeFormPage.zul", null, map); } protected void createAddressPage(String id) throws SuspendNotAllowedException, InterruptedException { - Address address = model.retrieveAddressById(id); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("address", address); - createPage(map, "addressFormPage.zul"); + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("addressId", id); + } + Executions.createComponents("addressFormPage.zul", null, map); } protected void createServicePage(String id) throws SuspendNotAllowedException, InterruptedException { - Service service = model.retrieveServiceById(id); - ServiceData data = new ServiceData(service, null); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("serviceData", data); - createPage(map, "serviceFormPage.zul"); + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("serviceId", id); + } + Executions.createComponents("serviceFormPage.zul", null, map); } protected void createCompanyPage(String id) throws SuspendNotAllowedException, InterruptedException { - Company company = model.retrieveCompanyById(id); - CompanyData data = new CompanyData(company, null); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("companyData", data); - createPage(map, "companyFormPage.zul"); + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("companyId", id); + } + Executions.createComponents("companyFormPage.zul", null, map); } protected void createPageByWikitty(Wikitty wikitty) throws SuspendNotAllowedException, InterruptedException { @@ -169,7 +179,9 @@ @Override public void onEvent(Event event) throws Exception { - Wikitty wikitty = model.retrieveWikittyById(id); + WikittyService service = proxy.getWikittyService(); + String securityToken = proxy.getSecurityToken(); + Wikitty wikitty = service.restore(securityToken, id); createPageByWikitty(wikitty); } }); @@ -190,7 +202,9 @@ @Override public void onEvent(Event event) throws Exception { - Wikitty wikitty = model.retrieveWikittyById(id); + WikittyService service = proxy.getWikittyService(); + String securityToken = proxy.getSecurityToken(); + Wikitty wikitty = service.restore(securityToken, id); createPageByWikitty(wikitty); } }); @@ -240,7 +254,10 @@ protected Listcell dependanciesRenderer(String id) { Listcell cell = new Listcell(); - List<Wikitty> wikitties = model.retrieveAllBySearch(id); + WikittyService service = proxy.getWikittyService(); + String securityToken = proxy.getSecurityToken(); + Criteria criteria = getCriteriaBySearch(id); + List<Wikitty> wikitties = service.findAllByCriteria(securityToken, criteria).cast(securityToken, service).getAll(); for (final Wikitty wikitty : wikitties) { Collection<String> extensions = wikitty.getExtensionNames(); String str = StringUtil.join(extensions, ", ", false); Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,17 +1,19 @@ package org.chorem.bonzoms.ui; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.Service; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; 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.zul.Button; import org.zkoss.zul.Label; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; @@ -26,61 +28,32 @@ protected Model model = new Model(); - protected ServiceModel serviceModel = new ServiceModel(); + protected ServiceModel serviceModel = new ServiceModel(20); @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - String search = (String) arg.get("search"); - List<Service> services; - if (search != null && !search.isEmpty()) { - services = model.retrieveServicesBySearch(search); - } else { - services = model.retrieveAllServices(); - } - createServicesData(services); + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Service.EXT_SERVICE).criteria(); + serviceModel.setCriteria(criteria); } - public void createServicesData(List<Service> services) { - for (Service service : services) { - Address address = model.retrieveAddressById(service.getAddress()); - ServiceData data = new ServiceData(service, address); - serviceModel.addData(data); - } - } - - public void createWindowServiceForm(ServiceData serviceData) throws SuspendNotAllowedException, InterruptedException { - Map<String, Object> map = new HashMap<String, Object>(); - if (serviceData != null) { - map.put("serviceData", serviceData); - } - Window win = (Window) Executions.createComponents("serviceFormPage.zul", null, map); - + public void createWindowServiceForm(String id) throws SuspendNotAllowedException, InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (id != null) { + map.put("serviceId", id); + } + 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) { - int rowIndex = serviceModel.indexOf(data); - if (rowIndex == -1) { - serviceModel.addData(data); - } else { - serviceModel.reloadContent(rowIndex); - } - } + serviceModel.reload(); } }); - - win.setPage(page); -// win.doHighlighted(); - win.setPosition("center"); -// win.doOverlapped(); - win.doModal(); } - protected Listcell addressesRenderer(ServiceData serviceData) { - Address address = serviceData.getAddress(); + protected Listcell addressesRenderer(Service service) { + Address address = model.retrieveAddressById(service.getAddress()); String render = address.getName() + " (" + address.getCountry() + ") :\n"; render += address.getAddress1() + " " + address.getAddress2() + "\n"; render += address.getZipCode() + " " + address.getCity() + "\n"; @@ -107,27 +80,22 @@ @Override public void render(Listitem item, Object data) throws Exception { item.setValue(data); - final ServiceData serviceData = (ServiceData) data; + final Service service = (Service) data; - Listcell typeCell = new Listcell(serviceData.getService().getType()); + Listcell typeCell = new Listcell(service.getType()); - Listcell addressCell = addressesRenderer(serviceData); + Listcell addressCell = addressesRenderer(service); - Listcell detailsCell = new Listcell(); + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { - Button details = new Button("details"); - detailsCell.appendChild(details); - details.addEventListener("onClick", new EventListener() { - @Override public void onEvent(Event event) throws Exception { - createWindowServiceForm(serviceData); + createWindowServiceForm(service.getWikittyId()); } }); item.appendChild(typeCell); item.appendChild(addressCell); - item.appendChild(detailsCell); } }; } Deleted: 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceData.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,72 +0,0 @@ -/* - * #%L - * Bonzoms : bonzoms-zk - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.bonzoms.ui; - -import org.chorem.data.bonzoms.Address; -import org.chorem.data.bonzoms.AddressImpl; -import org.chorem.data.bonzoms.Service; -import org.chorem.data.bonzoms.ServiceImpl; - -/** - * - * @author sherkhan - */ -public class ServiceData { - - 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 - */ - public void setService(Service service) { - this.service = service; - } - - public void setAddress(Address address) { - this.address = address; - } - - /* - * Getters - */ - public Service getService() { - return service; - } - - public Address getAddress() { - return address; - } -} 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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java 2010-08-04 16:27:57 UTC (rev 121) @@ -1,12 +1,16 @@ package org.chorem.bonzoms.ui; import org.chorem.data.bonzoms.Address; +import org.chorem.data.bonzoms.AddressImpl; import org.chorem.data.bonzoms.Service; +import org.chorem.data.bonzoms.ServiceImpl; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; 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; +import org.zkoss.zul.Window; /** * @@ -16,51 +20,62 @@ protected Model model = new Model(); - protected ServiceData serviceData = new ServiceData(); + protected Service service = new ServiceImpl(); + protected Address address = new AddressImpl(); - public final static String EVENT_ON_SAVE_SERVICE = "onSaveService"; + public static final String EVENT_ON_SAVE_SERVICE = "onSaveService"; + public static final String EVENT_ON_CLOSE_SERVICE = "onCloseService"; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - ServiceData data = (ServiceData) arg.get("serviceData"); - if (data != null) { - initService(data); + Window win = (Window) self; + win.doModal(); + win.setPosition("center"); + String serviceId = Executions.getCurrent().getParameter("serviceId"); + if (serviceId == null) { + serviceId = (String) arg.get("serviceId"); } + if (serviceId != null) { + initService(serviceId); + } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } - protected void initService(ServiceData data) { - String id = data.getService().getAddress(); - Address address = model.retrieveAddressById(id); - if (address != null) { - data.setAddress(address); - } - serviceData = data; + protected void initService(String id) { + service = model.retrieveServiceById(id); + address = model.retrieveAddressById(service.getAddress()); } /* * Events */ + public void onClose() { + System.out.println("CLOSE"); + Events.postEvent(EVENT_ON_CLOSE_SERVICE, this.self, null); + } + public void onClick$saveService() { - Address address = model.createAddress(serviceData.getAddress()); - serviceData.getService().setAddress(address.getWikittyId()); - serviceData.setAddress(address); + address = model.createAddress(address); + service.setAddress(address.getWikittyId()); - Service service = model.updateService(serviceData.getService()); - serviceData.setService(service); + service = model.updateService(service); - Events.postEvent(EVENT_ON_SAVE_SERVICE, this.self, serviceData); - + Events.postEvent(EVENT_ON_SAVE_SERVICE, this.self, service); + System.out.println(this.self.getParent()); self.detach(); } /* * Getters */ - public ServiceData getServiceData() { - return serviceData; + public Service getService() { + return service; } + + public Address getAddress() { + return address; + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceModel.java 2010-08-04 16:27:57 UTC (rev 121) @@ -2,6 +2,11 @@ import java.util.ArrayList; import java.util.List; + +import org.chorem.data.bonzoms.Service; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.WikittyProxy; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zul.AbstractListModel; import org.zkoss.zul.event.ListDataEvent; @@ -12,42 +17,102 @@ */ public class ServiceModel extends AbstractListModel implements BindingListModel { - protected List<ServiceData> services = new ArrayList<ServiceData>(); + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected Criteria criteria = null; + protected int itemsByPage = 1; + protected int size = 0; + protected int currentPage = 0; + protected List<Service> services = new ArrayList<Service>(); + + public ServiceModel(int itemsByPage) { + this.itemsByPage = itemsByPage; + size = getSize(); + createList(); + } + @Override public Object getElementAt(int index) { - return services.get(index); + pageChange(index); + int indexList = index % itemsByPage; + Service Service = services.get(indexList); + return Service; } @Override public int getSize() { - return services.size(); + if (criteria == null) { + return 0; + } + Criteria criteria = this.criteria.setFirstIndex(0).setEndIndex(0); + PagedResult<Service> result = proxy.findAllByCriteria(Service.class, criteria); + return result.getNumFound(); } - - @Override - public int indexOf(Object obj) { - return services.indexOf(obj); + + @Override + public int indexOf(Object obj) { + int index = 0; + String id = ((Service) obj).getWikittyId(); + for (Service data : services) { + String dataId = data.getWikittyId(); + if (id.equals(dataId)) { + index = services.indexOf(data) + (itemsByPage * currentPage); + break; + } + } + return index; + } + + public void addData(Service newData) { + size = getSize(); + fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } - public void setServices(List<ServiceData> services) { - this.services = services; - fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); - } - - public void addData(ServiceData newData) { - services.add(newData); - } - - public void removeData(ServiceData data) { - int interval = services.indexOf(data); - services.remove(data); + public void removeData(Service data) { + int interval = services.indexOf(data) + (itemsByPage * currentPage); + proxy.delete(data.getWikittyId()); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } public void reloadContent(int rowIndex) { + int indexList = rowIndex % itemsByPage; + Service Service = services.get(indexList); + Service = proxy.restore(Service.class, Service.getWikittyId()); fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); } public void reload() { + createList(); + size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } + + public Criteria getCriteria() { + return criteria; + } + + public void setCriteria(Criteria criteria) { + if (criteria != null) { + this.criteria = criteria; + reload(); + } + } + + public void pageChange(int index) { + int item = index; + int page = item / itemsByPage; + if (page != currentPage ) { + currentPage = page; + createList(); + } + } + + protected void createList() { + if (criteria != null) { + int first = currentPage * itemsByPage; + int end = first + (itemsByPage - 1); + Criteria criteria = this.criteria.setFirstIndex(first).setEndIndex(end); + List<Service> Services = proxy.findAllByCriteria(Service.class, criteria).getAll(); + this.services = new ArrayList<Service>(Services); + } + } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java 2010-08-04 16:27:57 UTC (rev 121) @@ -2,7 +2,12 @@ import java.util.ArrayList; import java.util.List; + +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zul.AbstractListModel; import org.zkoss.zul.event.ListDataEvent; @@ -13,44 +18,108 @@ */ public class WikittyModel extends AbstractListModel implements BindingListModel { - protected List<Wikitty> wikitties = new ArrayList<Wikitty>(); - + protected WikittyProxy proxy = BonzomsProxy.getInstance(); + protected Criteria criteria = null; + protected int itemsByPage = 1; + protected int size = 0; + protected int currentPage = 0; + protected List<Wikitty> wikitties = new ArrayList<Wikitty>(); + + public WikittyModel(int itemsByPage) { + this.itemsByPage = itemsByPage; + size = getSize(); + createList(); + } + @Override public Object getElementAt(int index) { - return wikitties.get(index); + pageChange(index); + int indexList = index % itemsByPage; + Wikitty Wikitty = wikitties.get(indexList); + return Wikitty; } @Override public int getSize() { - return wikitties.size(); + if (criteria == null) { + return 0; + } + Criteria criteria = this.criteria.setFirstIndex(0).setEndIndex(0); + WikittyService service = proxy.getWikittyService(); + String securityToken = proxy.getSecurityToken(); + PagedResult<?> result = service.findAllByCriteria(securityToken, criteria); + return result.getNumFound(); } - - @Override - public int indexOf(Object obj) { - return wikitties.indexOf(obj); - } - - public void setWikitties(List<Wikitty> companies) { - wikitties = companies; - fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); - } - + + @Override + public int indexOf(Object obj) { + int index = 0; + String id = ((Wikitty) obj).getId(); + for (Wikitty data : wikitties) { + String dataId = data.getId(); + if (id.equals(dataId)) { + index = wikitties.indexOf(data) + (itemsByPage * currentPage); + break; + } + } + return index; + } + public void addData(Wikitty newData) { - wikitties.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, wikitties.size() - 1, wikitties.size() - 1); + size = getSize(); + fireEvent(ListDataEvent.INTERVAL_ADDED, size - 1, size - 1); } public void removeData(Wikitty data) { - int interval = wikitties.indexOf(data); - wikitties.remove(data); + int interval = wikitties.indexOf(data) + (itemsByPage * currentPage); + proxy.delete(data.getId()); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } public void reloadContent(int rowIndex) { + int indexList = rowIndex % itemsByPage; + Wikitty wikitty = wikitties.get(indexList); + WikittyService service = proxy.getWikittyService(); + String securityToken = proxy.getSecurityToken(); + wikitty = service.restore(securityToken, wikitty.getId()); fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); } public void reload() { + createList(); + size = getSize(); fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } + + public Criteria getCriteria() { + return criteria; + } + + public void setCriteria(Criteria criteria) { + if (criteria != null) { + this.criteria = criteria; + reload(); + } + } + + public void pageChange(int index) { + int item = index; + int page = item / itemsByPage; + if (page != currentPage ) { + currentPage = page; + createList(); + } + } + + protected void createList() { + if (criteria != null) { + int first = currentPage * itemsByPage; + int end = first + (itemsByPage - 1); + Criteria criteria = this.criteria.setFirstIndex(first).setEndIndex(end); + WikittyService service = proxy.getWikittyService(); + String securityToken = proxy.getSecurityToken(); + PagedResult<?> result = service.findAllByCriteria(securityToken, criteria); + this.wikitties = new ArrayList<Wikitty>(result.cast(securityToken, service).getAll()); + } + } } Modified: trunk/bonzoms-ui-zk/src/main/resources/wikitty-jdbc-config.properties =================================================================== --- trunk/bonzoms-ui-zk/src/main/resources/wikitty-jdbc-config.properties 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/resources/wikitty-jdbc-config.properties 2010-08-04 16:27:57 UTC (rev 121) @@ -1,5 +1,5 @@ #Connection parameters jdbc.con.driver=org.h2.Driver -jdbc.con.host=jdbc:h2:file:~/.bonzoms/localdb/localdb +jdbc.con.host=jdbc:h2:file:~/.chorem-data/localdb/localdb jdbc.con.userName=sa jdbc.con.password= Modified: trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/companyFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -11,23 +11,23 @@ <vbox> <label value="Name" /> - <textbox value="@{composer.companyData.company.name, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.company.name, save-when='saveCompany.onClick'}" /> <label value="Type" /> - <textbox value="@{composer.companyData.company.type, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.company.type, save-when='saveCompany.onClick'}" /> <label value="Fax" /> - <textbox value="@{composer.companyData.company.fax, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.company.fax, save-when='saveCompany.onClick'}" /> <label value="Web site" /> - <textbox value="@{composer.companyData.company.webSite, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.company.webSite, save-when='saveCompany.onClick'}" /> </vbox> <space /> <vbox> - <listbox id="addressListbox" model="@{composer.companyData.addressesModel}" width="200px"> + <listbox id="addressListbox" model="@{composer.addressesModel}" width="200px"> <listitem self="@{each='address'}"> <listcell> <groupbox> @@ -69,7 +69,7 @@ <groupbox> <caption label="Phones" /> - <listbox id="phoneListbox" model="@{composer.companyData.phonesModel}" width="310px"> + <listbox id="phoneListbox" model="@{composer.phonesModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Phone Number" /> @@ -96,7 +96,7 @@ <groupbox> <caption label="Emails" /> - <listbox id="emailListbox" model="@{composer.companyData.emailsModel}" width="310px"> + <listbox id="emailListbox" model="@{composer.emailsModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Email" /> Modified: trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/companyPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -1,11 +1,11 @@ <?page id="company" title="Company" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="company"?> +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="./company"?> <window id="company" apply="org.chorem.bonzoms.ui.CompanyController"> Companies: <toolbarbutton id="newCompany" label="Add new company" /> <listbox autopaging="true" mold="paging" id="companyListBox" rows="20" model="@{company$composer.companyModel}" - itemRenderer="@{company$composer.companyDataRenderer}"> + itemRenderer="@{company$composer.companyRenderer}"> <listhead> <listheader label="Name" /> <listheader label="Web site" /> @@ -13,7 +13,6 @@ <listheader label="Emails" /> <listheader label="Address" /> <listheader label="Type" /> - <listheader label="details" /> </listhead> </listbox> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -27,8 +27,6 @@ <space /> <vbox> - <label value="Name" /> - <textbox value="@{composer.contract.name, save-when='saveContract.onClick'}" /> <label value="Start" /> <datebox format="yyyy/MM/dd" value="@{composer.contract.start, save-when='saveContract.onClick'}" /> Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -1,9 +1,9 @@ <?page id="contract" title="Contract" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="contract"?> +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="./contract"?> <window id="contract" apply="org.chorem.bonzoms.ui.ContractController"> - Employees: <toolbarbutton id="newContract" label="Add new contract" /> + Contracts: <toolbarbutton id="newContract" label="Add new contract" /> <listbox autopaging="true" mold="paging" id="contractListBox" rows="20" model="@{contract$composer.contractsModel}" itemRenderer="@{contract$composer.contractRenderer}"> <listhead> @@ -12,7 +12,6 @@ <listheader label="Working time" /> <listheader label="Advantages" /> <listheader label="Description" /> - <listheader label="Details" /> </listhead> </listbox> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -38,8 +38,6 @@ <space /> <vbox> - <label value="Name" /> - <textbox value="@{contract.name, save-when='save.onClick'}" /> <label value="Start" /> <datebox format="yyyy/MM/dd" value="@{contract.start, save-when='save.onClick'}" /> @@ -67,5 +65,5 @@ </hbox> </groupbox> <button id="save" label="Save" /> - + <include id="openContract" /> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -14,20 +14,50 @@ <separator /> <label value="email" /> - <textbox value="@{composer.employeeData.employee.workingEmail, save-when='saveEmployee.onClick'}" constraint="/.+@.+\.[a-z]+/" /> + <textbox value="@{composer.employee.workingEmail, save-when='saveEmployee.onClick'}" constraint="/.+@.+\.[a-z]+/" /> <label value="Phone number" /> - <textbox value="@{composer.employeeData.employee.workingPhone, save-when='saveEmployee.onClick'}" /> + <textbox value="@{composer.employee.workingPhone, save-when='saveEmployee.onClick'}" /> <toolbarbutton id="editService" label="Edit service :" /> - <listbox id="serviceListbox" width="100px" model="@{composer.serviceModel}" mold="select" itemRenderer="@{composer.serviceDataRenderer}"> - </listbox> + <bandbox id="serviceBandbox" mold="rounded"> + <bandpopup> + <vbox> + <listbox width="200px" id="serviceListbox" model="@{composer.serviceModel}" itemRenderer="@{composer.serviceRenderer}"> + + </listbox> + </vbox> + </bandpopup> + </bandbox> + <toolbarbutton id="editCompany" label="Edit company :" /> - <listbox id="companyListbox" width="100px" model="@{composer.companyModel}" mold="select" itemRenderer="@{composer.companyDataRenderer}"> - </listbox> - + <bandbox id="companyBandbox" mold="rounded"> + <bandpopup> + <vbox> + <listbox id="companyListbox" width="200px" model="@{composer.companyModel}" itemRenderer="@{composer.companyRenderer}"> + <listhead> + <listheader label="Name" /> + <listheader label="Type" /> + </listhead> + </listbox> + </vbox> + </bandpopup> + </bandbox> + <toolbarbutton id="editPerson" label="Edit person" /> + <bandbox id="personBandbox" mold="rounded"> + <bandpopup> + <vbox> + <listbox id="personListbox" width="200px" model="@{composer.personModel}" itemRenderer="@{composer.personRenderer}"> + <listhead> + <listheader label="First name" /> + <listheader label="Last name" /> + </listhead> + </listbox> + </vbox> + </bandpopup> + </bandbox> <toolbarbutton id="editContracts" label="Edit contracts" /> @@ -40,19 +70,19 @@ <caption label="Working address" /> <vbox> <label value="Adress1" /> - <textbox value="@{composer.employeeData.workingAddress.address1, save-when='saveEmployee.onClick'}" /> + <textbox value="@{composer.workingAddress.address1, save-when='saveEmployee.onClick'}" /> <label value="Adress2" /> - <textbox value="@{composer.employeeData.workingAddress.address2, save-when='saveEmployee.onClick'}" /> + <textbox value="@{composer.workingAddress.address2, save-when='saveEmployee.onClick'}" /> <label value="Zip code" /> - <textbox value="@{composer.employeeData.workingAddress.zipCode, save-when='saveEmployee.onClick'}" /> + <textbox value="@{composer.workingAddress.zipCode, save-when='saveEmployee.onClick'}" /> <label value="City" /> - <textbox value="@{composer.employeeData.workingAddress.city, save-when='saveEmployee.onClick'}" /> + <textbox value="@{composer.workingAddress.city, save-when='saveEmployee.onClick'}" /> <label value="Country" /> - <textbox value="@{composer.employeeData.workingAddress.country, save-when='saveEmployee.onClick'}" /> + <textbox value="@{composer.workingAddress.country, save-when='saveEmployee.onClick'}" /> </vbox> </groupbox> Modified: trunk/bonzoms-ui-zk/src/main/webapp/employeePage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/employeePage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/employeePage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -1,17 +1,16 @@ <?page id="employee" title="Employee" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="employee"?> +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="./employee"?> <window id="employee" apply="org.chorem.bonzoms.ui.EmployeeController"> Employees: <toolbarbutton id="newEmployee" label="Add new employee" /> - <listbox autopaging="true" mold="paging" id="employeeListBox" rows="20" model="@{employee$composer.employeeModel}" + <listbox autopaging="true" mold="paging" id="employeeListbox" rows="20" model="@{employee$composer.employeeModel}" itemRenderer="@{employee$composer.employeeRenderer}"> <listhead> <listheader label="First name" /> <listheader label="Last name" /> <listheader label="email" /> <listheader label="Working phone" /> - <listheader label="Details" /> </listhead> </listbox> </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-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/index.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -17,9 +17,9 @@ <vbox id="content" > <hbox> Search: <textbox id="searchBox" /> <button label="Search" id="searchButton" /> - <include src="employeePage.zul" /> </hbox> <separator bar="true" /> + <include id="include" src="employeePage.zul" /> </vbox> </hbox> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/personFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -5,17 +5,17 @@ <hbox> <vbox> <label value="First name" /> - <textbox value="@{composer.personData.person.firstName, save-when='savePerson.onClick'}" /> + <textbox value="@{composer.person.firstName, save-when='savePerson.onClick'}" /> <label value="Last name" /> - <textbox value="@{composer.personData.person.lastName, save-when='savePerson.onClick'}" /> + <textbox value="@{composer.person.lastName, save-when='savePerson.onClick'}" /> <label value="Birthday" /> - <datebox format="yyyy/MM/dd" value="@{composer.personData.person.birthDay, save-when='savePerson.onClick'}" /> + <datebox format="yyyy/MM/dd" value="@{composer.person.birthDay, save-when='savePerson.onClick'}" /> </vbox> <space /> <vbox> - <listbox id="addressListbox" model="@{composer.personData.addressesModel}" width="200px"> + <listbox id="addressListbox" model="@{composer.addressesModel}" width="200px"> <listitem self="@{each='address'}"> <listcell> <groupbox> @@ -60,7 +60,7 @@ <caption label="Phones" /> - <listbox id="phoneListbox" model="@{composer.personData.phonesModel}" width="310px"> + <listbox id="phoneListbox" model="@{composer.phonesModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Phone Number" /> @@ -87,7 +87,7 @@ <caption label="Emails" /> - <listbox id="emailListbox" model="@{composer.personData.emailsModel}" width="310px"> + <listbox id="emailListbox" model="@{composer.emailsModel}" width="310px"> <listhead sizable="true"> <listheader label="Name" /> <listheader label="Email" /> Modified: trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/personPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -1,16 +1,15 @@ <?page id="person" title="Person" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="person"?> +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="./person"?> <window id="person" apply="org.chorem.bonzoms.ui.PersonController"> - Companies: <toolbarbutton id="newPerson" label="Add new person" /> + Persons: <toolbarbutton id="newPerson" label="Add new person" /> <listbox autopaging="true" mold="paging" id="personListBox" rows="20" model="@{person$composer.personModel}" itemRenderer="@{person$composer.personDataRenderer}"> <listhead> <listheader label="First name" /> <listheader label="Last name" /> <listheader label="Birthday" /> - <listheader label="details" /> </listhead> </listbox> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -1,6 +1,6 @@ <?page id="result" title="Result" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="result"?> +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="./result"?> <window id="result" apply="org.chorem.bonzoms.ui.ResultController"> <listbox autopaging="true" mold="paging" id="wikittyListBox" rows="10" model="@{result$composer.wikittyModel}" Modified: trunk/bonzoms-ui-zk/src/main/webapp/serviceFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/serviceFormPage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/serviceFormPage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -10,25 +10,25 @@ <vbox> <label value="Type" /> - <textbox value="@{composer.serviceData.service.type, save-when='saveService.onClick'}" /> + <textbox value="@{composer.service.type, save-when='saveService.onClick'}" /> <label value="Name" /> - <textbox value="@{composer.serviceData.address.name, save-when='saveService.onClick'}" /> + <textbox value="@{composer.address.name, save-when='saveService.onClick'}" /> <label value="Address 1" /> - <textbox value="@{composer.serviceData.address.address1, save-when='saveService.onClick'}" /> + <textbox value="@{composer.address.address1, save-when='saveService.onClick'}" /> <label value="Address 2" /> - <textbox value="@{composer.serviceData.address.address2, save-when='saveService.onClick'}" /> + <textbox value="@{composer.address.address2, save-when='saveService.onClick'}" /> <label value="Zip code" /> - <textbox value="@{composer.serviceData.address.zipCode, save-when='saveService.onClick'}" /> + <textbox value="@{composer.address.zipCode, save-when='saveService.onClick'}" /> <label value="City" /> - <textbox value="@{composer.serviceData.address.city, save-when='saveService.onClick'}" /> + <textbox value="@{composer.address.city, save-when='saveService.onClick'}" /> <label value="Country" /> - <textbox value="@{composer.serviceData.address.country, save-when='saveService.onClick'}" /> + <textbox value="@{composer.address.country, save-when='saveService.onClick'}" /> </vbox> Modified: trunk/bonzoms-ui-zk/src/main/webapp/servicePage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/servicePage.zul 2010-07-27 12:55:07 UTC (rev 120) +++ trunk/bonzoms-ui-zk/src/main/webapp/servicePage.zul 2010-08-04 16:27:57 UTC (rev 121) @@ -1,15 +1,14 @@ <?page id="service" title="service" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="service"?> +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="./service"?> <window id="service" apply="org.chorem.bonzoms.ui.ServiceController"> - Employees: <toolbarbutton id="newService" label="Add new service" /> + Services: <toolbarbutton id="newService" label="Add new service" /> <listbox autopaging="true" mold="paging" id="serviceListBox" rows="20" model="@{service$composer.serviceModel}" itemRenderer="@{service$composer.serviceDataRenderer}"> <listhead> <listheader label="Type" /> <listheader label="Address" /> - <listheader label="Details" /> </listhead> </listbox> </window> \ No newline at end of file

1 0

r120 - in trunk/bonzoms-ui-zk: . src/main/java/org/chorem/bonzoms/ui src/main/webapp
by bbrossaud＠users.chorem.org July 27, 2010

July 27, 2010

Author: bbrossaud Date: 2010-07-27 14:55:07 +0200 (Tue, 27 Jul 2010) New Revision: 120 Url: http://chorem.org/repositories/revision/bonzoms/120 Log: addition missing sources Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java Modified: trunk/bonzoms-ui-zk/ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java trunk/bonzoms-ui-zk/src/main/webapp/index.zul Property changes on: trunk/bonzoms-ui-zk ___________________________________________________________________ Modified: svn:ignore - target + target .classpath .settings .project Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractController.java 2010-07-27 12:55:07 UTC (rev 120) @@ -0,0 +1,124 @@ +package org.chorem.bonzoms.ui; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.chorem.data.bonzoms.EmploymentContract; +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.util.GenericForwardComposer; +import org.zkoss.zul.Button; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Window; + +/** + * + * @author bbrossaud + */ +public class ContractController extends GenericForwardComposer { + + protected Model model = new Model(); + protected ContractsModel contractsModel = new ContractsModel(); + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + List<EmploymentContract> contracts = model.retrieveAllContracts(); + if (contracts != null) { + contractsModel.setContracts(contracts); + } + } + + protected void createWindowContractForm(EmploymentContract contract) throws InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (contract != null) { + map.put("contract", contract); + } + Window win = (Window) Executions.createComponents("contractFormPage.zul", null, map); + + win.addEventListener(ContractFormController.EVENT_ON_SAVE_CONTRACT, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + EmploymentContract data = (EmploymentContract) event.getData(); + if (data != null) { + int rowIndex = contractsModel.indexOf(data); + if (rowIndex == -1) { + contractsModel.addData(data); + } else { + contractsModel.reloadContent(rowIndex); + } + } + } + }); + + win.setPage(page); + win.setPosition("center"); + win.doModal(); + } + + /* + * Renderers + */ + public ListitemRenderer getContractRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + final EmploymentContract contract = (EmploymentContract) data; + + Listcell type = new Listcell(String.valueOf(contract.getType())); + Listcell salary = new Listcell(String.valueOf(contract.getSalary())); + Listcell workingTime = new Listcell(String.valueOf(contract.getWorkingTime())); + Listcell advantages = new Listcell(contract.getAdvantages()); + Listcell description = new Listcell(contract.getDescription()); + + Listcell details = new Listcell(); + Button button = new Button("details"); + details.appendChild(button); + button.addEventListener("onClick", new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + createWindowContractForm(contract); + } + }); + + item.appendChild(type); + item.appendChild(salary); + item.appendChild(workingTime); + item.appendChild(advantages); + item.appendChild(description); + item.appendChild(details); + } + }; + } + + + /* + * Events + */ + public void onCreate$contract(Event event) { + } + + public void onClick$newContract() throws SuspendNotAllowedException, InterruptedException { + createWindowContractForm(null); + } + + /* + * Getters + */ + public ContractsModel getContractsModel() { + return contractsModel; + } + + /* + * 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-26 14:15:05 UTC (rev 119) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-27 12:55:07 UTC (rev 120) @@ -148,9 +148,6 @@ /* * Events */ - public void onCreate$employee(Event event) { - } - public void onClick$newEmployee() throws SuspendNotAllowedException, InterruptedException { createWindowEmployeeForm(null); } @@ -158,11 +155,6 @@ /* * Getters */ - public Map<String, Object> getArgsMap(Event event) { - CreateEvent createEvent = (CreateEvent) ((ForwardEvent) event).getOrigin(); - return createEvent.getArg(); - } - public EmployeeModel getEmployeeModel() { return employeeModel; } 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-26 14:15:05 UTC (rev 119) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-27 12:55:07 UTC (rev 120) @@ -33,7 +33,7 @@ /** * - * @author sherkhan + * @author bbrossaud */ public class MainController extends GenericForwardComposer { @@ -48,7 +48,7 @@ @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - createEmployeesPage(); +// createEmployeesPage(); } protected void createEmployeesPage() { Modified: trunk/bonzoms-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/index.zul 2010-07-26 14:15:05 UTC (rev 119) +++ trunk/bonzoms-ui-zk/src/main/webapp/index.zul 2010-07-27 12:55:07 UTC (rev 120) @@ -17,6 +17,7 @@ <vbox id="content" > <hbox> Search: <textbox id="searchBox" /> <button label="Search" id="searchButton" /> + <include src="employeePage.zul" /> </hbox> <separator bar="true" /> </vbox>

1 0

r119 - in trunk/bonzoms-ui-zk/src/main: java/org/chorem/bonzoms/ui webapp
by bbrossaud＠users.chorem.org July 26, 2010

July 26, 2010

Author: bbrossaud Date: 2010-07-26 16:15:05 +0200 (Mon, 26 Jul 2010) New Revision: 119 Url: http://chorem.org/repositories/revision/bonzoms/119 Log: addition contract page Added: trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul Removed: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.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/EmployeeModel.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/PhonesModel.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java trunk/bonzoms-ui-zk/src/main/webapp/index.zul Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressesModel.java 2010-07-26 14:15:05 UTC (rev 119) @@ -36,36 +36,36 @@ */ public class AddressesModel extends AbstractListModel implements BindingListModel { - List<Address> _addresses = new ArrayList<Address>(); + List<Address> addresses = new ArrayList<Address>(); @Override public Object getElementAt(int index) { - return _addresses.get(index); + return addresses.get(index); } @Override public int getSize() { - return _addresses.size(); + return addresses.size(); } @Override public int indexOf(Object obj) { - return _addresses.indexOf(obj); + return addresses.indexOf(obj); } public void setAddresses(List<Address> addresses) { - _addresses = addresses; + this.addresses = addresses; fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } public void addData(Address newData) { - _addresses.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, _addresses.size() - 1, _addresses.size() - 1); + addresses.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, addresses.size() - 1, addresses.size() - 1); } public void removeData(Address data) { - int interval = _addresses.indexOf(data); - _addresses.remove(data); + int interval = addresses.indexOf(data); + addresses.remove(data); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } @@ -74,6 +74,6 @@ } public List<Address> getAddresses() { - return _addresses; + return addresses; } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyController.java 2010-07-26 14:15:05 UTC (rev 119) @@ -48,9 +48,9 @@ * @author sherkhan */ public class CompanyController extends GenericForwardComposer { - protected Model _model = new Model(); + protected Model model = new Model(); - protected CompanyModel _companyDataModel = new CompanyModel(); + protected CompanyModel companyDataModel = new CompanyModel(); @Override public void doAfterCompose(Component comp) throws Exception { @@ -58,18 +58,18 @@ String search = (String) arg.get("search"); List<Company> companies; if (search != null && !search.isEmpty()) { - companies = _model.retrieveCompaniesBySearch(search); + companies = model.retrieveCompaniesBySearch(search); } else { - companies = _model.retrieveAllCompanies(); + companies = model.retrieveAllCompanies(); } createCompaniesData(companies); } public void createCompaniesData(List<Company> companies) { for (Company company: companies) { - List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress())); + List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(company.getAddress())); CompanyData data = new CompanyData(company, addresses); - _companyDataModel.addData(data); + companyDataModel.addData(data); } } @@ -86,11 +86,11 @@ public void onEvent(Event event) throws Exception { CompanyData data = (CompanyData) event.getData(); if (data != null) { - int rowIndex = _companyDataModel.indexOf(data); + int rowIndex = companyDataModel.indexOf(data); if (rowIndex == -1) { - _companyDataModel.addData(data); + companyDataModel.addData(data); } else { - _companyDataModel.reloadContent(rowIndex); + companyDataModel.reloadContent(rowIndex); } } } @@ -209,6 +209,6 @@ * Getters */ public CompanyModel getCompanyModel() { - return _companyDataModel; + return companyDataModel; } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-26 14:15:05 UTC (rev 119) @@ -41,9 +41,9 @@ */ public class CompanyFormController extends GenericForwardComposer { - protected Model _model = new Model(); + protected Model model = new Model(); - protected CompanyData _companyData = new CompanyData(); + protected CompanyData companyData = new CompanyData(); protected Listbox addressListbox; protected Listbox phoneListbox; @@ -71,49 +71,49 @@ protected void initDefaultCompany() { Address address = new AddressImpl(); - _companyData.getAddressesModel().addData(address); + companyData.getAddressesModel().addData(address); Phone phone = new Phone(); - _companyData.getPhonesModel().addData(phone); + companyData.getPhonesModel().addData(phone); Email email = new Email(); - _companyData.getEmailsModel().addData(email); + companyData.getEmailsModel().addData(email); } protected void initCompany(CompanyData companyData) { - _companyData = companyData; - List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(companyData.getCompany().getAddress())); - _companyData.setAddresses(addresses); - _companyData.setEmailsModelList(_companyData.getCompany().getEmails()); - _companyData.setPhonesModelList(_companyData.getCompany().getPhones()); + this.companyData = companyData; + List<Address> addresses = model.retrieveAddressesByIds(new ArrayList<String>(companyData.getCompany().getAddress())); + companyData.setAddresses(addresses); + companyData.setEmailsModelList(companyData.getCompany().getEmails()); + companyData.setPhonesModelList(companyData.getCompany().getPhones()); } protected void removeCompanyAddresses() { - List<String> ids = _companyData.getRemovedAddresses(); + List<String> ids = companyData.getRemovedAddresses(); for (String id : ids) { - _companyData.getCompany().removeAddress(id); + companyData.getCompany().removeAddress(id); } } protected void saveAddresses() { - List<Address> addresses = _model.createAddresses(_companyData.getAddressesModel().getAddresses()); - if (!_companyData.getRemovedAddresses().isEmpty()) { - _model.deleteAddressesByIds(_companyData.getRemovedAddresses()); + List<Address> addresses = model.createAddresses(companyData.getAddressesModel().getAddresses()); + if (!companyData.getRemovedAddresses().isEmpty()) { + model.deleteAddressesByIds(companyData.getRemovedAddresses()); removeCompanyAddresses(); } for (Address address : addresses) { - _companyData.getCompany().addAddress(address.getWikittyId()); + companyData.getCompany().addAddress(address.getWikittyId()); } } protected void saveEmails() { - String emails = _companyData.getEmailsModelAsString(); - _companyData.getCompany().setEmails(emails); + String emails = companyData.getEmailsModelAsString(); + companyData.getCompany().setEmails(emails); } protected void savePhones() { - String phones = _companyData.getPhonesModelAsString(); - _companyData.getCompany().setPhones(phones); + String phones = companyData.getPhonesModelAsString(); + companyData.getCompany().setPhones(phones); } /* @@ -121,44 +121,44 @@ */ public void onClick$addAddress() { Address address = new AddressImpl(); - _companyData.getAddressesModel().addData(address); + companyData.getAddressesModel().addData(address); } public void onClick$deleteAddress() { int size = addressListbox.getItemCount(); if (size > 1) { - Address address = (Address) _companyData.getAddressesModel().getElementAt(size -1); - _companyData.getAddressesModel().removeData(address); + Address address = (Address) companyData.getAddressesModel().getElementAt(size -1); + companyData.getAddressesModel().removeData(address); String id = address.getWikittyId(); if (!id.isEmpty()) { - _companyData.getRemovedAddresses().add(id); + companyData.getRemovedAddresses().add(id); } } } public void onClick$addPhone() { Phone phone = new Phone(); - _companyData.getPhonesModel().addData(phone); + companyData.getPhonesModel().addData(phone); } public void onClick$deletePhone() { int size = phoneListbox.getItemCount(); if (size > 1) { - Phone phone = (Phone) _companyData.getPhonesModel().getElementAt(size -1); - _companyData.getPhonesModel().removeData(phone); + Phone phone = (Phone) companyData.getPhonesModel().getElementAt(size -1); + companyData.getPhonesModel().removeData(phone); } } public void onClick$addEmail() { Email email = new Email(); - _companyData.getEmailsModel().addData(email); + companyData.getEmailsModel().addData(email); } public void onClick$deleteEmail() { int size = emailListbox.getItemCount(); if (size > 1) { - Email email = (Email) _companyData.getEmailsModel().getElementAt(size - 1); - _companyData.getEmailsModel().removeData(email); + Email email = (Email) companyData.getEmailsModel().getElementAt(size - 1); + companyData.getEmailsModel().removeData(email); } } @@ -167,11 +167,11 @@ saveEmails(); saveAddresses(); - Company company = _model.updateCompany(_companyData.getCompany()); + Company company = model.updateCompany(companyData.getCompany()); - _companyData.setCompany(company); + companyData.setCompany(company); - Events.postEvent(EVENT_ON_SAVE_COMPANY, this.self, _companyData); + Events.postEvent(EVENT_ON_SAVE_COMPANY, this.self, companyData); this.self.detach(); } @@ -180,6 +180,6 @@ * Getters */ public CompanyData getCompanyData() { - return _companyData; + return companyData; } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java 2010-07-26 14:15:05 UTC (rev 119) @@ -67,19 +67,19 @@ } } - public void onClick$save() { + public void onClick$saveContracts() { Events.postEvent(EVENT_ON_SAVE_CONTRACTS, this.self, contractsData); self.detach(); } + public void onClose() { + contractsData.setContractsList(save); + } + /* * Getters */ public ContractsModel getContractsModel() { return contractsData.getContractsModel(); } - - public void onClose() { - contractsData.setContractsList(save); - } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsModel.java 2010-07-26 14:15:05 UTC (rev 119) @@ -36,44 +36,48 @@ */ public class ContractsModel extends AbstractListModel implements BindingListModel { - List<EmploymentContract> _contracts = new ArrayList<EmploymentContract>(); + List<EmploymentContract> contracts = new ArrayList<EmploymentContract>(); @Override public Object getElementAt(int index) { - return _contracts.get(index); + return contracts.get(index); } @Override public int getSize() { - return _contracts.size(); + return contracts.size(); } @Override public int indexOf(Object obj) { - return _contracts.indexOf(obj); + return contracts.indexOf(obj); } public void setContracts(List<EmploymentContract> contracts) { - _contracts = contracts; + this.contracts = contracts; fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } public void addData(EmploymentContract newData) { - _contracts.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, _contracts.size() - 1, _contracts.size() - 1); + contracts.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, contracts.size() - 1, contracts.size() - 1); } public void removeData(EmploymentContract data) { - int interval = _contracts.indexOf(data); - _contracts.remove(data); + int interval = contracts.indexOf(data); + contracts.remove(data); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } + public void reloadContent(int rowIndex) { + fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); + } + public void reload() { fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } public List<EmploymentContract> getContracts() { - return _contracts; + return contracts; } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmailsModel.java 2010-07-26 14:15:05 UTC (rev 119) @@ -36,36 +36,36 @@ */ public class EmailsModel extends AbstractListModel implements BindingListModel { - List<Email> _emails = new ArrayList<Email>(); + List<Email> emails = new ArrayList<Email>(); @Override public Object getElementAt(int index) { - return _emails.get(index); + return emails.get(index); } @Override public int getSize() { - return _emails.size(); + return emails.size(); } @Override public int indexOf(Object obj) { - return _emails.indexOf(obj); + return emails.indexOf(obj); } - public void setEmails(List<Email> Emailes) { - _emails = Emailes; + public void setEmails(List<Email> emails) { + this.emails = emails; fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } public void addData(Email newData) { - _emails.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, _emails.size() - 1, _emails.size() - 1); + emails.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, emails.size() - 1, emails.size() - 1); } public void removeData(Email data) { - int interval = _emails.indexOf(data); - _emails.remove(data); + int interval = emails.indexOf(data); + emails.remove(data); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } @@ -74,33 +74,33 @@ } public List<Email> getEmails() { - return _emails; + return emails; } public String getEmailsAsString() { - String emails = ""; - for (Email email : _emails) { + String mails = ""; + for (Email email : this.emails) { if (!email.isEmpty()) { - emails += email.getName() + ":" + email.getEmail() + ";"; + mails += email.getName() + ":" + email.getEmail() + ";"; } } - return emails; + return mails; } public void setEmails(String str) { - _emails.clear(); - String[] emails = StringUtil.split(str, ";"); - for (String email : emails) { + emails.clear(); + String[] mails = StringUtil.split(str, ";"); + for (String email : mails) { String[] values = StringUtil.split(email, ":"); String mail = ""; if (values.length > 1) { mail = values[1]; } Email newEmail = new Email(values[0], mail); - _emails.add(newEmail); + this.emails.add(newEmail); } - if (_emails.isEmpty()) { - _emails.add(new Email()); + if (this.emails.isEmpty()) { + this.emails.add(new Email()); } fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } 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-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-26 14:15:05 UTC (rev 119) @@ -49,34 +49,27 @@ */ public class EmployeeController extends GenericForwardComposer { - protected Model _model = new Model(); - protected EmployeeModel _employeeModel = new EmployeeModel(); - protected Employee _selectedEmployee = null; + protected Model model = new Model(); + protected EmployeeModel employeeModel = new EmployeeModel(); @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - String search = (String) arg.get("search"); - List<Employee> employees; - if (search != null && !search.isEmpty()) { - employees = _model.retrieveEmployeesBySearch(search); - } else { - employees = _model.retrieveAllEmployees(); - } + List<Employee> employees = model.retrieveAllEmployees(); createEmployeeDataList(employees); } public void createEmployeeDataList(List<Employee> employees) { for (Employee employee : employees) { - Address address = _model.retrieveAddressById(employee.getAddress()); + Address address = model.retrieveAddressById(employee.getAddress()); EmployeeData data = new EmployeeData(employee, address); - Person person = _model.retrievePersonById(employee.getPerson()); + Person person = model.retrievePersonById(employee.getPerson()); if (person != null) { PersonData personData = new PersonData(person, null); data.setPersonData(personData); } - _employeeModel.addData(data); + employeeModel.addData(data); } } @@ -93,11 +86,11 @@ public void onEvent(Event event) throws Exception { EmployeeData data = (EmployeeData) event.getData(); if (data != null) { - int rowIndex = _employeeModel.indexOf(data); + int rowIndex = employeeModel.indexOf(data); if (rowIndex == -1) { - _employeeModel.addData(data); + employeeModel.addData(data); } else { - _employeeModel.reloadContent(rowIndex); + employeeModel.reloadContent(rowIndex); } } } @@ -170,18 +163,11 @@ return createEvent.getArg(); } - public Employee getSelectedEmployee() { - return _selectedEmployee; - } - public EmployeeModel getEmployeeModel() { - return _employeeModel; + return employeeModel; } /* * Setters */ - public void setSelectedEmployee(Employee employee) { - _selectedEmployee = employee; - } } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeModel.java 2010-07-26 14:15:05 UTC (rev 119) @@ -34,36 +34,36 @@ * @author sherkhan */ public class EmployeeModel extends AbstractListModel implements BindingListModel { - protected List<EmployeeData> _employees = new ArrayList<EmployeeData>(); + protected List<EmployeeData> employees = new ArrayList<EmployeeData>(); @Override public Object getElementAt(int index) { - return _employees.get(index); + return employees.get(index); } @Override public int getSize() { - return _employees.size(); + return employees.size(); } @Override public int indexOf(Object obj) { - return _employees.indexOf(obj); + return employees.indexOf(obj); } public void setEmployees(List<EmployeeData> employees) { - _employees = employees; + this.employees = employees; fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } public void addData(EmployeeData newData) { - _employees.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, _employees.size() - 1, _employees.size() - 1); + employees.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, employees.size() - 1, employees.size() - 1); } public void removeData(EmployeeData data) { - int interval = _employees.indexOf(data); - _employees.remove(data); + int interval = employees.indexOf(data); + employees.remove(data); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } Deleted: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/FieldExtension.java 2010-07-26 14:15:05 UTC (rev 119) @@ -1,88 +0,0 @@ -/* - * #%L - * Bonzoms : bonzoms-zk - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package org.chorem.bonzoms.ui; - -import java.util.List; -import org.nuiton.wikitty.FieldType; -import org.nuiton.wikitty.WikittyExtension; - -/** - * - * @author sherkhan - */ -public class FieldExtension { - - protected FieldType _fieldType; - protected List<FieldExtension> _fieldExtensions = null; - protected String _name; - protected WikittyExtension _wikittyExtension; - - public FieldExtension(FieldType fieldType, String name, WikittyExtension wikittyExtension) { - _name = name; - _fieldType = fieldType; - _wikittyExtension = wikittyExtension; - } - - /* - * Setters - */ - public void setName(String name) { - _name = name; - } - - public void setType(FieldType fieldType) { - _fieldType = fieldType; - } - - public void setWikittyExtension(WikittyExtension wikittyExtension) { - _wikittyExtension = wikittyExtension; - } - - public void setFieldExtensions(List<FieldExtension> fieldExtensions) { - _fieldExtensions = fieldExtensions; - } - - /* - * Getters - */ - public String getName() { - return _name; - } - - public FieldType getFieldType() { - return _fieldType; - } - - public WikittyExtension getWikittyExtension() { - return _wikittyExtension; - } - - public List<FieldExtension> getFieldExtensions() { - return _fieldExtensions; - } -} 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-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-26 14:15:05 UTC (rev 119) @@ -48,33 +48,39 @@ @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - createEmployeesPage(null); + createEmployeesPage(); } - protected void createEmployeesPage(Map<String, Object> map) { + protected void createEmployeesPage() { removeAllContentPage(); - Component newContent = Executions.createComponents("employeePage.zul", null, map); + Component newContent = Executions.createComponents("employeePage.zul", null, null); content.appendChild(newContent); } - protected void createPersonsPage(Map<String, Object> map) { + protected void createPersonsPage() { removeAllContentPage(); - Component newContent = Executions.createComponents("personPage.zul", null, map); + Component newContent = Executions.createComponents("personPage.zul", null, null); content.appendChild(newContent); } - protected void createCompaniesPage(Map<String, Object> map) { + protected void createCompaniesPage() { removeAllContentPage(); - Component newContent = Executions.createComponents("companyPage.zul", null, map); + Component newContent = Executions.createComponents("companyPage.zul", null, null); content.appendChild(newContent); } - protected void createServicesPage(Map<String, Object> map) { + protected void createServicesPage() { removeAllContentPage(); - Component newContent = Executions.createComponents("servicePage.zul", null, map); + Component newContent = Executions.createComponents("servicePage.zul", null, null); content.appendChild(newContent); } + protected void createContractsPage() { + removeAllContentPage(); + Component newContent = Executions.createComponents("contractPage.zul", null, null); + content.appendChild(newContent); + } + protected void removeAllContentPage() { content.getLastChild().detach(); } @@ -114,18 +120,22 @@ } public void onClick$employees() { - createEmployeesPage(new HashMap<String, Object>()); + createEmployeesPage(); } public void onClick$persons() { - createPersonsPage(new HashMap<String, Object>()); + createPersonsPage(); } public void onClick$companies() { - createCompaniesPage(new HashMap<String, Object>()); + createCompaniesPage(); } public void onClick$services() { - createServicesPage(new HashMap<String, Object>()); + createServicesPage(); } + + public void onClick$contracts() { + createContractsPage(); + } } 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-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-26 14:15:05 UTC (rev 119) @@ -87,6 +87,13 @@ /* * Retrieve */ + public List<EmploymentContract> retrieveAllContracts() { + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT).criteria(); + List<EmploymentContract> contracts = proxy.findAllByCriteria(EmploymentContract.class, criteria).getAll(); + contracts = new ArrayList<EmploymentContract>(contracts); + return contracts; + } + public Employee retrieveEmployeeById(String id) { if (id == null || id.isEmpty()) { return null; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PhonesModel.java 2010-07-26 14:15:05 UTC (rev 119) @@ -36,36 +36,36 @@ */ public class PhonesModel extends AbstractListModel implements BindingListModel { - List<Phone> _phones = new ArrayList<Phone>(); + List<Phone> phones = new ArrayList<Phone>(); @Override public Object getElementAt(int index) { - return _phones.get(index); + return phones.get(index); } @Override public int getSize() { - return _phones.size(); + return phones.size(); } @Override public int indexOf(Object obj) { - return _phones.indexOf(obj); + return phones.indexOf(obj); } - public void setPhones(List<Phone> Phonees) { - _phones = Phonees; + public void setPhones(List<Phone> phones) { + this.phones = phones; fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } public void addData(Phone newData) { - _phones.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, _phones.size() - 1, _phones.size() - 1); + phones.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, phones.size() - 1, phones.size() - 1); } public void removeData(Phone data) { - int interval = _phones.indexOf(data); - _phones.remove(data); + int interval = phones.indexOf(data); + phones.remove(data); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } @@ -74,33 +74,33 @@ } public List<Phone> getPhones() { - return _phones; + return phones; } public String getPhonesAsString() { - String phones = ""; - for (Phone phone : _phones) { + String strPhones = ""; + for (Phone phone : this.phones) { if (!phone.isEmpty()) { - phones += phone.getName() + ":" + phone.getPhone() + ";"; + strPhones += phone.getName() + ":" + phone.getPhone() + ";"; } } - return phones; + return strPhones; } public void setPhones(String str) { - _phones.clear(); - String[] phones = StringUtil.split(str, ";"); - for (String phone : phones) { + phones.clear(); + String[] strPhones = StringUtil.split(str, ";"); + for (String phone : strPhones) { String[] values = StringUtil.split(phone, ":"); String number = ""; if (values.length > 1) { number = values[1]; } Phone newPhone = new Phone(values[0], number); - _phones.add(newPhone); + phones.add(newPhone); } - if (_phones.isEmpty()) { - _phones.add(new Phone()); + if (phones.isEmpty()) { + phones.add(new Phone()); } fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-26 14:15:05 UTC (rev 119) @@ -23,7 +23,6 @@ */ package org.chorem.bonzoms.ui; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -45,7 +44,6 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.GenericForwardComposer; -import org.zkoss.zul.Button; import org.zkoss.zul.Label; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; Added: trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul (rev 0) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractPage.zul 2010-07-26 14:15:05 UTC (rev 119) @@ -0,0 +1,18 @@ +<?page id="contract" title="Contract" cacheable="false" language="xul/html" zscriptLanguage="Java"?> +<?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> +<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="contract"?> + +<window id="contract" apply="org.chorem.bonzoms.ui.ContractController"> + Employees: <toolbarbutton id="newContract" label="Add new contract" /> + <listbox autopaging="true" mold="paging" id="contractListBox" rows="20" model="@{contract$composer.contractsModel}" + itemRenderer="@{contract$composer.contractRenderer}"> + <listhead> + <listheader label="Type" /> + <listheader label="Salary" /> + <listheader label="Working time" /> + <listheader label="Advantages" /> + <listheader label="Description" /> + <listheader label="Details" /> + </listhead> + </listbox> +</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-23 15:42:22 UTC (rev 118) +++ trunk/bonzoms-ui-zk/src/main/webapp/index.zul 2010-07-26 14:15:05 UTC (rev 119) @@ -7,9 +7,10 @@ <groupbox height="800px" > <caption label="Menu" /> <vbox> + <toolbarbutton id="companies" label="Companies" /> + <toolbarbutton id="contracts" label="Contracts" /> + <toolbarbutton id="employees" label="Employees" /> <toolbarbutton id="persons" label="Persons" /> - <toolbarbutton id="employees" label="Employees" /> - <toolbarbutton id="companies" label="Companies" /> <toolbarbutton id="services" label="Services" /> </vbox> </groupbox>

1 0

r118 - trunk/bonzoms-ui-zk/src/main/resources
by bbrossaud＠users.chorem.org July 23, 2010

July 23, 2010

Author: bbrossaud Date: 2010-07-23 17:42:22 +0200 (Fri, 23 Jul 2010) New Revision: 118 Url: http://chorem.org/repositories/revision/bonzoms/118 Log: addition log4j.properties Added: trunk/bonzoms-ui-zk/src/main/resources/log4j.properties Added: trunk/bonzoms-ui-zk/src/main/resources/log4j.properties =================================================================== --- trunk/bonzoms-ui-zk/src/main/resources/log4j.properties (rev 0) +++ trunk/bonzoms-ui-zk/src/main/resources/log4j.properties 2010-07-23 15:42:22 UTC (rev 118) @@ -0,0 +1,2 @@ +# solr +log4j.logger.org.apache.solr=WARN \ No newline at end of file

1 0

r117 - trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui
by bbrossaud＠users.chorem.org July 23, 2010

July 23, 2010

Author: bbrossaud Date: 2010-07-23 17:36:01 +0200 (Fri, 23 Jul 2010) New Revision: 117 Url: http://chorem.org/repositories/revision/bonzoms/117 Log: addition link instead wikitty id 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/ResultController.java 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-23 13:41:12 UTC (rev 116) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-23 15:36:01 UTC (rev 117) @@ -211,6 +211,11 @@ return proxy.restore(Company.class, id); } + public Wikitty retrieveWikittyById(String id) { + WikittyService service = proxy.getWikittyService(); + return service.restore(proxy.getSecurityToken(), id); + } + /* * Update */ Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-23 13:41:12 UTC (rev 116) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-23 15:36:01 UTC (rev 117) @@ -23,6 +23,7 @@ */ package org.chorem.bonzoms.ui; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -34,6 +35,7 @@ import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.Service; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.zkoss.zk.ui.Component; @@ -159,46 +161,88 @@ return cell; } - protected String valuesExtensionRenderer(String extensionName, Wikitty wikitty) { - String values = ""; + protected void extensionWikittyListRenderer(Wikitty wikitty, String extensionName, String fieldName, Listcell cell) { + List<String> ids = wikitty.getFieldAsList(extensionName, fieldName, String.class); + cell.appendChild(new Label(fieldName + " : [")); + if (ids != null) { + for (final String id : ids) { + Toolbarbutton button = new Toolbarbutton("..."); + button.addEventListener(Events.ON_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + Wikitty wikitty = model.retrieveWikittyById(id); + createPageByWikitty(wikitty); + } + }); + cell.appendChild(button); + cell.appendChild(new Label(", ")); + } + cell.getLastChild().detach(); + } + cell.appendChild(new Label("]")); + } + + protected void extensionWikittyRenderer(final Wikitty wikitty, String extensionName, String fieldName, Listcell cell) { + final String id = wikitty.getFieldAsString(extensionName, fieldName); + cell.appendChild(new Label(fieldName + " : ")); + if (id != null) { + Toolbarbutton button = new Toolbarbutton("..."); + button.addEventListener(Events.ON_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + Wikitty wikitty = model.retrieveWikittyById(id); + createPageByWikitty(wikitty); + } + }); + cell.appendChild(button); + } + } + + protected void valuesExtensionRenderer(String extensionName, Wikitty wikitty, Listcell cell) { WikittyExtension wikittyExtension = wikitty.getExtension(extensionName); Collection<String> fieldNames = wikittyExtension.getFieldNames(); for (String fieldName : fieldNames) { - String result = wikitty.getFieldAsString(extensionName, fieldName); - if (result == null) { - result = ""; - } - if (result.length() > 50) { - result = result.substring(0, 46); + TYPE type = wikittyExtension.getFieldType(fieldName).getType(); + if (type.equals(TYPE.WIKITTY)) { if (wikittyExtension.getFieldType(fieldName).isCollection()) { - result += "...]"; + extensionWikittyListRenderer(wikitty, extensionName, fieldName, cell); } else { - result += "..."; + extensionWikittyRenderer(wikitty, extensionName, fieldName, cell); } + } else { + String result = wikitty.getFieldAsString(extensionName, fieldName); + if (result == null) { + result = ""; + } + Label label = new Label(fieldName + " : " + result); + cell.appendChild(label); } - values += fieldName + " : " + result + "\n"; + Label label = new Label("\n"); + label.setMultiline(true); + cell.appendChild(label); } - return values; } protected Listcell valuesRenderer(Wikitty wikitty) { - String values = ""; Listcell cell = new Listcell(); Collection<String> extensions = wikitty.getExtensionNames(); for (String extension : extensions) { - values += extension + "\n"; - values += valuesExtensionRenderer(extension, wikitty) + "\n"; + Label startLabel = new Label(extension + "\n"); + startLabel.setMultiline(true); + cell.appendChild(startLabel); + valuesExtensionRenderer(extension, wikitty, cell); + Label endLabel = new Label("\n"); + endLabel.setMultiline(true); + cell.appendChild(endLabel); } - Label label = new Label(values); - label.setMultiline(true); - cell.appendChild(label); return cell; } protected Listcell dependanciesRenderer(String id) { Listcell cell = new Listcell(); List<Wikitty> wikitties = model.retrieveAllBySearch(id); - System.out.println("==================>" + wikitties.size()); for (final Wikitty wikitty : wikitties) { Collection<String> extensions = wikitty.getExtensionNames(); String str = StringUtil.join(extensions, ", ", false); @@ -229,7 +273,7 @@ Listcell dependances = dependanciesRenderer(wikitty.getId()); - item.addEventListener(Events.ON_CLICK, new EventListener() { + item.addEventListener(Events.ON_DOUBLE_CLICK, new EventListener() { @Override public void onEvent(Event event) throws Exception {

1 0

r116 - in trunk/bonzoms-ui-zk: . src/main/java/org/chorem/bonzoms/ui
by bbrossaud＠users.chorem.org July 23, 2010

July 23, 2010

Author: bbrossaud Date: 2010-07-23 15:41:12 +0200 (Fri, 23 Jul 2010) New Revision: 116 Url: http://chorem.org/repositories/revision/bonzoms/116 Log: remove log file Removed: trunk/bonzoms-ui-zk/transaction.log Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-23 13:39:17 UTC (rev 115) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-23 13:41:12 UTC (rev 116) @@ -37,7 +37,7 @@ /** * - * @author sherkhan + * @author bbrossaud */ public class CompanyFormController extends GenericForwardComposer { Deleted: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-23 13:39:17 UTC (rev 115) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-23 13:41:12 UTC (rev 116) @@ -1,701 +0,0 @@ -2010-07-02 16:53:43,505 [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 54233 -2010-07-02 16:53:43,508 [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 233 -2010-07-02 16:53:43,579 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54233 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-02 16:56:13,467 [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 33769 -2010-07-02 16:56:13,469 [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: 33 769 -2010-07-02 16:56:13,566 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33769 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-02 16:58:08,340 [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 40007 -2010-07-02 16:58:08,342 [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: 40 007 -2010-07-02 16:58:08,414 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40007 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-02 17:00:35,362 [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 58276 -2010-07-02 17:00:35,364 [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: 58 276 -2010-07-02 17:00:35,447 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58276 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-02 17:08:04,600 [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 35369 -2010-07-02 17:08:04,603 [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 369 -2010-07-02 17:08:04,700 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35369 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-02 17:09:04,318 [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 36345 -2010-07-02 17:09:04,323 [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: 36 345 -2010-07-02 17:09:04,412 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36345 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 10:33:56,281 [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 54582 -2010-07-05 10:33:56,307 [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 582 -2010-07-05 10:33:56,387 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54582 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 10:37:08,848 [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 54373 -2010-07-05 10:37:08,850 [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 373 -2010-07-05 10:37:08,954 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54373 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 10:42:36,668 [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 53592 -2010-07-05 10:42:36,670 [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: 53 592 -2010-07-05 10:42:36,762 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53592 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 14:14:57,393 [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 35702 -2010-07-05 14:14:57,398 [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 702 -2010-07-05 14:14:57,467 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35702 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 14:17:56,899 [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 50832 -2010-07-05 14:17:56,901 [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: 50 832 -2010-07-05 14:17:56,976 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50832 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 14:37:02,189 [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 50789 -2010-07-05 14:37:02,191 [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: 50 789 -2010-07-05 14:37:02,283 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50789 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 14:50:57,342 [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 47119 -2010-07-05 14:50:57,344 [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: 47 119 -2010-07-05 14:50:57,424 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47119 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 15:07:48,786 [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 52922 -2010-07-05 15:07:48,788 [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: 52 922 -2010-07-05 15:07:48,870 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52922 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 15:24:00,303 [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 34367 -2010-07-05 15:24:00,305 [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 367 -2010-07-05 15:24:00,394 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34367 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:01:47,241 [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 43538 -2010-07-05 16:01:47,243 [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: 43 538 -2010-07-05 16:01:47,346 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 43538 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:04:19,359 [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 53084 -2010-07-05 16:04:19,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: 53 084 -2010-07-05 16:04:19,442 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53084 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:19:32,579 [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 34427 -2010-07-05 16:19:32,581 [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 427 -2010-07-05 16:19:32,671 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34427 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:24:23,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 59932 -2010-07-05 16:24:23,180 [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: 59 932 -2010-07-05 16:24:23,287 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59932 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:42:01,945 [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 41362 -2010-07-05 16:42:01,947 [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 362 -2010-07-05 16:42:02,046 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41362 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:52:45,995 [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 60852 -2010-07-05 16:52:45,997 [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: 60 852 -2010-07-05 16:52:46,093 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60852 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:58:12,105 [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 41392 -2010-07-05 16:58:12,109 [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 392 -2010-07-05 16:58:12,209 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41392 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 16:59:53,569 [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 59758 -2010-07-05 16:59:53,571 [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: 59 758 -2010-07-05 16:59:53,619 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59758 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 17:01:55,465 [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 33860 -2010-07-05 17:01:55,472 [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: 33 860 -2010-07-05 17:01:55,570 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33860 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 17:10:46,522 [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 43286 -2010-07-05 17:10:46,524 [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: 43 286 -2010-07-05 17:10:46,578 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 43286 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 17:14:33,480 [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 39921 -2010-07-05 17:14:33,482 [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 921 -2010-07-05 17:14:33,542 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39921 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 17:42:05,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 42144 -2010-07-05 17:42:05,359 [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 144 -2010-07-05 17:42:05,407 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42144 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 17:48:28,355 [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 50200 -2010-07-05 17:48:28,357 [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: 50 200 -2010-07-05 17:48:28,427 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50200 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-05 17:51:04,709 [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 56323 -2010-07-05 17:51:04,712 [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 323 -2010-07-05 17:51:04,779 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56323 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 11:30:52,222 [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 60220 -2010-07-06 11:30:52,246 [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: 60 220 -2010-07-06 11:30:52,307 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60220 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 11:34:27,776 [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 46336 -2010-07-06 11:34:27,777 [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 336 -2010-07-06 11:34:27,844 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 46336 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 11:35:32,263 [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 48045 -2010-07-06 11:35:32,265 [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 045 -2010-07-06 11:35:32,332 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48045 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 12:20:00,444 [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 56971 -2010-07-06 12:20:00,446 [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 971 -2010-07-06 12:20:00,504 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56971 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 12:22:47,017 [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 34392 -2010-07-06 12:22:47,020 [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 392 -2010-07-06 12:22:47,080 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34392 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 14:06:18,879 [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 34165 -2010-07-06 14:06:18,882 [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 165 -2010-07-06 14:06:18,924 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34165 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 14:24:04,263 [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 58473 -2010-07-06 14:24:04,265 [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: 58 473 -2010-07-06 14:24:04,315 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58473 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 14:25:02,061 [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 53921 -2010-07-06 14:25:02,063 [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: 53 921 -2010-07-06 14:25:02,106 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53921 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 14:27:02,297 [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 44724 -2010-07-06 14:27:02,300 [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 724 -2010-07-06 14:27:02,346 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44724 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 14:28:05,073 [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 56882 -2010-07-06 14:28:05,076 [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 882 -2010-07-06 14:28:05,128 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56882 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 14:54:17,596 [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 50180 -2010-07-06 14:54:17,598 [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: 50 180 -2010-07-06 14:54:17,632 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50180 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 15:00:39,827 [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 44514 -2010-07-06 15:00:39,830 [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 514 -2010-07-06 15:00:39,875 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44514 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 15:56:17,382 [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 45317 -2010-07-06 15:56:17,385 [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 317 -2010-07-06 15:56:17,429 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 45317 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 16:00:51,321 [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 48790 -2010-07-06 16:00:51,332 [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 790 -2010-07-06 16:00:51,378 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48790 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 17:46:16,333 [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 58855 -2010-07-06 17:46:16,339 [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: 58 855 -2010-07-06 17:46:16,386 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58855 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 17:48:00,916 [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 40897 -2010-07-06 17:48:00,919 [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: 40 897 -2010-07-06 17:48:00,957 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40897 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-06 18:07:58,875 [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 48812 -2010-07-06 18:07:58,877 [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 812 -2010-07-06 18:07:58,934 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48812 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 10:36:17,934 [http-8080-2] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 56289 -2010-07-07 10:36:17,992 [http-8080-2] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 56 289 -2010-07-07 10:36:18,065 [http-8080-2] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56289 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 12:17:45,111 [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 36241 -2010-07-07 12:17:45,113 [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: 36 241 -2010-07-07 12:17:45,163 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36241 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 14:10:24,610 [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 38566 -2010-07-07 14:10:24,613 [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 566 -2010-07-07 14:10:24,673 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38566 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 14:13:14,453 [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 59202 -2010-07-07 14:13:14,456 [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: 59 202 -2010-07-07 14:13:14,520 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59202 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 14:38:12,180 [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 55231 -2010-07-07 14:38:12,181 [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 231 -2010-07-07 14:38:12,236 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55231 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 14:54:02,291 [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 55701 -2010-07-07 14:54:02,293 [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 701 -2010-07-07 14:54:02,353 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55701 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 15:10:56,249 [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 54102 -2010-07-07 15:10:56,252 [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 102 -2010-07-07 15:10:56,312 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54102 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 15:29:10,394 [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 58159 -2010-07-07 15:29:10,397 [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: 58 159 -2010-07-07 15:29:10,454 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58159 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 16:15:57,701 [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 38881 -2010-07-07 16:15:57,702 [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 881 -2010-07-07 16:15:57,773 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38881 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 16:20:09,074 [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 48412 -2010-07-07 16:20:09,076 [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 412 -2010-07-07 16:20:09,130 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48412 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 17:00:00,179 [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 47171 -2010-07-07 17:00:00,182 [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: 47 171 -2010-07-07 17:00:00,229 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47171 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 17:02:34,837 [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 59917 -2010-07-07 17:02:34,839 [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: 59 917 -2010-07-07 17:02:34,893 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59917 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 17:12:48,314 [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 42535 -2010-07-07 17:12:48,316 [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 535 -2010-07-07 17:12:48,374 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42535 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 17:38:25,830 [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 33222 -2010-07-07 17:38:25,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: 33 222 -2010-07-07 17:38:25,900 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33222 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-07 18:09:12,423 [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 50564 -2010-07-07 18:09:12,426 [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: 50 564 -2010-07-07 18:09:12,488 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50564 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 10:09:56,157 [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 39324 -2010-07-08 10:09:56,178 [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 324 -2010-07-08 10:09:56,236 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39324 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 12:03:07,967 [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 43296 -2010-07-08 12:03:07,969 [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: 43 296 -2010-07-08 12:03:08,020 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 43296 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 12:06:26,754 [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 60506 -2010-07-08 12:06:26,757 [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: 60 506 -2010-07-08 12:06:26,810 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60506 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 12:08:14,051 [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 57046 -2010-07-08 12:08:14,053 [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 046 -2010-07-08 12:08:14,126 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 57046 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 15:21:28,204 [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 60961 -2010-07-08 15:21:28,206 [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: 60 961 -2010-07-08 15:21:28,260 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60961 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 15:43:01,917 [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 39473 -2010-07-08 15:43:01,920 [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 473 -2010-07-08 15:43:02,018 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39473 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 15:44:41,330 [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 58215 -2010-07-08 15:44:41,332 [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: 58 215 -2010-07-08 15:44:41,415 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58215 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 15:47:07,494 [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 35826 -2010-07-08 15:47:07,496 [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 826 -2010-07-08 15:47:07,580 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35826 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 15:50:43,476 [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 40496 -2010-07-08 15:50:43,478 [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: 40 496 -2010-07-08 15:50:43,553 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40496 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 15:52:50,098 [http-8080-2] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 48667 -2010-07-08 15:52:50,100 [http-8080-2] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 48 667 -2010-07-08 15:52:50,175 [http-8080-2] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48667 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 16:01:23,340 [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 34479 -2010-07-08 16:01:23,342 [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 479 -2010-07-08 16:01:23,439 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34479 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 16:03:53,188 [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 42285 -2010-07-08 16:03:53,190 [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 285 -2010-07-08 16:03:53,279 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42285 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 16:23:06,722 [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 49245 -2010-07-08 16:23:06,724 [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: 49 245 -2010-07-08 16:23:06,805 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49245 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 16:24:42,501 [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 32778 -2010-07-08 16:24:42,503 [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: 32 778 -2010-07-08 16:24:42,596 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 32778 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 16:27:20,582 [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 44521 -2010-07-08 16:27:20,584 [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 521 -2010-07-08 16:27:20,678 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44521 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:10:26,196 [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 47620 -2010-07-08 17:10:26,198 [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: 47 620 -2010-07-08 17:10:26,281 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47620 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:11:33,567 [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 53720 -2010-07-08 17:11:33,569 [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: 53 720 -2010-07-08 17:11:33,667 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53720 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:28:17,571 [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 55854 -2010-07-08 17:28:17,574 [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 854 -2010-07-08 17:28:17,672 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55854 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:36:25,462 [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 59028 -2010-07-08 17:36:25,464 [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: 59 028 -2010-07-08 17:36:25,557 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59028 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:40:51,652 [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 55516 -2010-07-08 17:40:51,655 [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 516 -2010-07-08 17:40:51,757 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55516 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:41:53,207 [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 59641 -2010-07-08 17:41:53,209 [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: 59 641 -2010-07-08 17:41:53,303 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59641 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:46:52,029 [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 47983 -2010-07-08 17:46:52,031 [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: 47 983 -2010-07-08 17:46:52,120 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47983 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-08 17:58:08,167 [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 51679 -2010-07-08 17:58:08,169 [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 679 -2010-07-08 17:58:08,263 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 51679 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 10:25:26,380 [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 58239 -2010-07-09 10:25:26,396 [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: 58 239 -2010-07-09 10:25:26,486 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58239 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 10:29:56,457 [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 33224 -2010-07-09 10:29:56,459 [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: 33 224 -2010-07-09 10:29:56,532 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33224 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 10:46:50,714 [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 53890 -2010-07-09 10:46:50,716 [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: 53 890 -2010-07-09 10:46:50,786 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53890 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 10:52:29,086 [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 53806 -2010-07-09 10:52:29,088 [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: 53 806 -2010-07-09 10:52:29,161 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53806 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 11:16:19,372 [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 33833 -2010-07-09 11:16:19,374 [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: 33 833 -2010-07-09 11:16:19,460 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33833 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 11:20:36,147 [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 49853 -2010-07-09 11:20:36,149 [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: 49 853 -2010-07-09 11:20:36,236 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49853 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 11:29:15,331 [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 52987 -2010-07-09 11:29:15,333 [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: 52 987 -2010-07-09 11:29:15,424 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52987 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 11:33:22,305 [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 38704 -2010-07-09 11:33:22,308 [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 704 -2010-07-09 11:33:22,389 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38704 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 11:38:16,995 [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 56259 -2010-07-09 11:38:16,997 [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 259 -2010-07-09 11:38:17,081 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56259 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 11:39:51,935 [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 50263 -2010-07-09 11:39:51,938 [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: 50 263 -2010-07-09 11:39:52,013 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50263 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 14:07:02,276 [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 39075 -2010-07-09 14:07:02,278 [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 075 -2010-07-09 14:07:02,347 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39075 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 14:14:34,080 [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 53759 -2010-07-09 14:14:34,083 [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: 53 759 -2010-07-09 14:14:34,168 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53759 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 14:15:52,842 [http-8080-4] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1aee513 -2010-07-09 14:15:53,855 [http-8080-4] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@ce374a -2010-07-09 14:58:21,287 [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 34074 -2010-07-09 14:58:21,289 [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 074 -2010-07-09 14:58:21,374 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34074 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 15:06:01,332 [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 51859 -2010-07-09 15:06:01,334 [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 859 -2010-07-09 15:06:01,423 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 51859 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-09 16:37:10,056 [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 56428 -2010-07-09 16:37:10,058 [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 428 -2010-07-09 16:37:10,142 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56428 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 10:58:33,965 [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 55554 -2010-07-12 10:58:33,993 [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 554 -2010-07-12 10:58:34,055 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55554 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 11:54:26,186 [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 47211 -2010-07-12 11:54:26,188 [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: 47 211 -2010-07-12 11:54:26,242 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47211 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 11:55:39,000 [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 39491 -2010-07-12 11:55:39,003 [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 491 -2010-07-12 11:55:39,047 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39491 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 12:08:10,084 [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 50874 -2010-07-12 12:08:10,086 [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: 50 874 -2010-07-12 12:08:10,149 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50874 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 12:12:00,396 [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 47114 -2010-07-12 12:12:00,397 [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: 47 114 -2010-07-12 12:12:00,463 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47114 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 14:15:49,285 [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 58457 -2010-07-12 14:15:49,287 [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: 58 457 -2010-07-12 14:15:49,347 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58457 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 14:22:29,693 [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 40603 -2010-07-12 14:22:29,695 [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: 40 603 -2010-07-12 14:22:29,760 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40603 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 14:24:27,820 [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 50582 -2010-07-12 14:24:27,824 [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: 50 582 -2010-07-12 14:24:27,882 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50582 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 14:43:09,222 [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 48735 -2010-07-12 14:43:09,223 [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 735 -2010-07-12 14:43:09,282 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48735 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 14:48:20,286 [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 44099 -2010-07-12 14:48:20,288 [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 099 -2010-07-12 14:48:20,346 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44099 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 15:14:03,396 [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 59977 -2010-07-12 15:14:03,398 [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: 59 977 -2010-07-12 15:14:03,545 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59977 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 15:17:39,515 [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 49954 -2010-07-12 15:17:39,517 [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: 49 954 -2010-07-12 15:17:39,611 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49954 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 15:18:19,483 [http-8080-2] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@cf08b1 -2010-07-12 15:18:19,957 [http-8080-2] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@543c44 -2010-07-12 15:21:08,507 [http-8080-4] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@360e46 -2010-07-12 15:21:08,954 [http-8080-4] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@fc9fac -2010-07-12 15:21:55,761 [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 54797 -2010-07-12 15:21:55,763 [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 797 -2010-07-12 15:21:55,827 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54797 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 15:22:10,598 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@19e681c -2010-07-12 15:22:11,058 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@123e82b -2010-07-12 15:24:11,612 [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 60164 -2010-07-12 15:24:11,614 [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: 60 164 -2010-07-12 15:24:11,683 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60164 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 15:25:44,083 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1254e47 -2010-07-12 15:25:44,610 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1e776cc -2010-07-12 15:25:45,017 [http-8080-3] WARN com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.lastResource.disallow] Adding multiple last resources is disallowed. Current resource is com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord@1d93f39 -2010-07-12 15:54:37,200 [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 57798 -2010-07-12 15:54:37,202 [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 798 -2010-07-12 15:54:37,255 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 57798 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 17:37:11,812 [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 38886 -2010-07-12 17:37:11,816 [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 886 -2010-07-12 17:37:11,876 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38886 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 17:39:43,735 [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 47890 -2010-07-12 17:39:43,737 [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: 47 890 -2010-07-12 17:39:43,787 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47890 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 17:42:41,890 [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 52889 -2010-07-12 17:42:41,892 [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: 52 889 -2010-07-12 17:42:41,973 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52889 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 17:45:39,917 [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 48348 -2010-07-12 17:45:39,919 [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 348 -2010-07-12 17:45:39,977 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48348 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 17:49:17,173 [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 42715 -2010-07-12 17:49:17,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: 42 715 -2010-07-12 17:49:17,229 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42715 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 17:52:25,242 [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 54158 -2010-07-12 17:52:25,244 [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 158 -2010-07-12 17:52:25,322 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54158 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 18:09:40,507 [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 34887 -2010-07-12 18:09:40,509 [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 887 -2010-07-12 18:09:40,561 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34887 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 18:17:48,659 [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 46902 -2010-07-12 18:17:48,661 [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 902 -2010-07-12 18:17:48,723 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 46902 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-12 18:19:21,009 [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 36649 -2010-07-12 18:19:21,011 [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: 36 649 -2010-07-12 18:19:21,077 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36649 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-13 10:19:07,321 [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 58929 -2010-07-13 10:19:07,349 [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: 58 929 -2010-07-13 10:19:07,402 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58929 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-13 10:24:12,176 [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 59986 -2010-07-13 10:24:12,178 [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: 59 986 -2010-07-13 10:24:12,249 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59986 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-13 10:29:40,656 [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 57212 -2010-07-13 10:29:40,659 [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 212 -2010-07-13 10:29:40,739 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 57212 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-13 10:42:09,154 [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 52569 -2010-07-13 10:42:09,156 [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: 52 569 -2010-07-13 10:42:09,230 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52569 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 10:31:49,226 [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 60791 -2010-07-16 10:31:49,258 [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: 60 791 -2010-07-16 10:31:49,337 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60791 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 10:34:07,524 [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 54226 -2010-07-16 10:34:07,526 [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 226 -2010-07-16 10:34:07,578 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54226 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 10:40:18,457 [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 51345 -2010-07-16 10:40:18,459 [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 345 -2010-07-16 10:40:18,515 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 51345 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:07:15,442 [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 43368 -2010-07-16 15:07:15,446 [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: 43 368 -2010-07-16 15:07:15,503 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 43368 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:13:33,827 [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 47957 -2010-07-16 15:13:33,830 [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: 47 957 -2010-07-16 15:13:33,900 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47957 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:16:26,980 [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 52547 -2010-07-16 15:16:26,983 [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: 52 547 -2010-07-16 15:16:27,046 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52547 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:20:45,558 [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 36830 -2010-07-16 15:20:45,560 [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: 36 830 -2010-07-16 15:20:45,644 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36830 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:23:42,744 [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 39169 -2010-07-16 15:23:42,747 [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 169 -2010-07-16 15:23:42,814 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39169 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:24:43,201 [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 50179 -2010-07-16 15:24:43,202 [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: 50 179 -2010-07-16 15:24:43,241 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50179 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:25:33,175 [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 60635 -2010-07-16 15:25:33,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: 60 635 -2010-07-16 15:25:33,230 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60635 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:27:17,492 [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 34071 -2010-07-16 15:27:17,495 [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 071 -2010-07-16 15:27:17,551 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34071 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 15:29:02,862 [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 38098 -2010-07-16 15:29:02,864 [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 098 -2010-07-16 15:29:02,909 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38098 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 16:20:03,761 [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 59447 -2010-07-16 16:20:03,763 [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: 59 447 -2010-07-16 16:20:03,827 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59447 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 16:38:52,518 [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 41080 -2010-07-16 16:38:52,519 [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 080 -2010-07-16 16:38:52,566 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41080 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-16 18:03:03,219 [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 58947 -2010-07-16 18:03:03,221 [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: 58 947 -2010-07-16 18:03:03,283 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58947 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 10:42:25,227 [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 34618 -2010-07-19 10:42:25,256 [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 618 -2010-07-19 10:42:25,329 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34618 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 10:57:53,528 [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 48475 -2010-07-19 10:57:53,530 [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 475 -2010-07-19 10:57:53,584 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48475 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 11:18:39,613 [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 39370 -2010-07-19 11:18:39,615 [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 370 -2010-07-19 11:18:39,687 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39370 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 11:49:44,983 [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 36948 -2010-07-19 11:49:44,986 [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: 36 948 -2010-07-19 11:49:45,056 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36948 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 11:57:10,571 [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 56964 -2010-07-19 11:57:10,573 [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 964 -2010-07-19 11:57:10,640 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56964 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 11:58:15,083 [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 48991 -2010-07-19 11:58:15,084 [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 991 -2010-07-19 11:58:15,146 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48991 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 12:05:01,392 [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 44335 -2010-07-19 12:05:01,394 [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 335 -2010-07-19 12:05:01,448 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44335 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 12:06:30,398 [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 37272 -2010-07-19 12:06:30,406 [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 272 -2010-07-19 12:06:30,463 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 37272 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 12:10:16,130 [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 53609 -2010-07-19 12:10:16,132 [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: 53 609 -2010-07-19 12:10:16,194 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53609 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 15:05:23,427 [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 35099 -2010-07-19 15:05:23,429 [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 099 -2010-07-19 15:05:23,520 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35099 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 15:12:58,070 [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 56229 -2010-07-19 15:12:58,078 [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 229 -2010-07-19 15:12:58,176 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56229 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 15:16:04,729 [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 59140 -2010-07-19 15:16:04,731 [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: 59 140 -2010-07-19 15:16:04,791 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59140 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 15:18:16,986 [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 36635 -2010-07-19 15:18:16,989 [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: 36 635 -2010-07-19 15:18:17,057 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36635 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 15:21:29,150 [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 44372 -2010-07-19 15:21:29,152 [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 372 -2010-07-19 15:21:29,226 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44372 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 15:37:09,179 [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 59424 -2010-07-19 15:37:09,181 [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: 59 424 -2010-07-19 15:37:09,246 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59424 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 15:41:16,810 [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 36935 -2010-07-19 15:41:16,812 [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: 36 935 -2010-07-19 15:41:16,894 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 36935 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 17:59:55,278 [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 52294 -2010-07-19 17:59:55,292 [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: 52 294 -2010-07-19 17:59:55,381 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 52294 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 18:02:36,486 [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 49030 -2010-07-19 18:02:36,488 [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: 49 030 -2010-07-19 18:02:36,560 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49030 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 18:03:28,364 [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 39314 -2010-07-19 18:03:28,366 [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 314 -2010-07-19 18:03:28,437 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39314 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 18:04:49,607 [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 51376 -2010-07-19 18:04:49,609 [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 376 -2010-07-19 18:04:49,704 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 51376 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-19 18:06:53,687 [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 58500 -2010-07-19 18:06:53,689 [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: 58 500 -2010-07-19 18:06:53,796 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58500 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-20 09:58:11,528 [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 47552 -2010-07-20 09:58:11,562 [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: 47 552 -2010-07-20 09:58:11,642 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47552 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-20 10:02:51,201 [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 41731 -2010-07-20 10:02:51,203 [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 731 -2010-07-20 10:02:51,280 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41731 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-20 11:59:37,279 [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 34481 -2010-07-20 11:59:37,281 [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 481 -2010-07-20 11:59:37,357 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34481 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-20 14:01:07,153 [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 58039 -2010-07-20 14:01:07,155 [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: 58 039 -2010-07-20 14:01:07,225 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58039 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-20 15:05:56,191 [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 40876 -2010-07-20 15:05:56,197 [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: 40 876 -2010-07-20 15:05:56,269 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40876 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-20 15:08:52,171 [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 59353 -2010-07-20 15:08:52,173 [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: 59 353 -2010-07-20 15:08:52,253 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59353 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -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 -2010-07-21 17:28:02,662 [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 55227 -2010-07-21 17:28:02,663 [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 227 -2010-07-21 17:28:02,730 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55227 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 17:29:27,385 [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 49130 -2010-07-21 17:29:27,386 [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: 49 130 -2010-07-21 17:29:27,480 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49130 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 17:38:45,133 [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 35561 -2010-07-21 17:38:45,135 [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 561 -2010-07-21 17:38:45,217 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35561 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 18:03:06,992 [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 37400 -2010-07-21 18:03:06,994 [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 400 -2010-07-21 18:03:07,082 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 37400 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 18:07:11,061 [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 47692 -2010-07-21 18:07:11,064 [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: 47 692 -2010-07-21 18:07:11,147 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47692 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 18:11:33,531 [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 38191 -2010-07-21 18:11:33,533 [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 191 -2010-07-21 18:11:33,623 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38191 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 18:13:53,101 [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 56284 -2010-07-21 18:13:53,103 [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 284 -2010-07-21 18:13:53,198 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56284 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 18:20:31,222 [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 45537 -2010-07-21 18:20:31,224 [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 537 -2010-07-21 18:20:31,326 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 45537 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 18:28:35,266 [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 42096 -2010-07-21 18:28:35,268 [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 096 -2010-07-21 18:28:35,362 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42096 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-21 18:32:02,125 [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 58940 -2010-07-21 18:32:02,127 [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: 58 940 -2010-07-21 18:32:02,232 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58940 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 14:26:59,145 [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 45523 -2010-07-22 14:26:59,175 [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 523 -2010-07-22 14:26:59,248 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 45523 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 14:34:11,080 [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 39013 -2010-07-22 14:34:11,086 [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 013 -2010-07-22 14:34:11,167 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39013 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 15:30:29,392 [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 60002 -2010-07-22 15:30:29,394 [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: 60 002 -2010-07-22 15:30:29,483 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60002 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 15:41:08,922 [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 41442 -2010-07-22 15:41:08,925 [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 442 -2010-07-22 15:41:08,997 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41442 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 15:41:58,445 [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 33473 -2010-07-22 15:41:58,447 [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: 33 473 -2010-07-22 15:41:58,549 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33473 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 15:49:48,467 [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 34533 -2010-07-22 15:49:48,468 [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 533 -2010-07-22 15:49:48,560 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34533 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 17:23:18,008 [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 56984 -2010-07-22 17:23:18,010 [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 984 -2010-07-22 17:23:18,076 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56984 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 17:25:02,922 [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 38477 -2010-07-22 17:25:02,925 [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 477 -2010-07-22 17:25:02,978 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38477 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 17:34:35,884 [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 40474 -2010-07-22 17:34:35,886 [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: 40 474 -2010-07-22 17:34:35,988 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40474 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 17:43:31,327 [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 40189 -2010-07-22 17:43:31,329 [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: 40 189 -2010-07-22 17:43:31,414 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40189 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 17:50:11,928 [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 49462 -2010-07-22 17:50:11,935 [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: 49 462 -2010-07-22 17:50:12,038 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49462 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 17:53:49,532 [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 42286 -2010-07-22 17:53:49,533 [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 286 -2010-07-22 17:53:49,632 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42286 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 18:00:53,923 [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 40103 -2010-07-22 18:00:53,925 [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: 40 103 -2010-07-22 18:00:53,995 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40103 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-22 18:06:47,392 [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 53413 -2010-07-22 18:06:47,394 [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: 53 413 -2010-07-22 18:06:47,474 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53413 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 10:02:59,402 [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 48132 -2010-07-23 10:02:59,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: 48 132 -2010-07-23 10:02:59,534 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48132 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 10:20:48,643 [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 37249 -2010-07-23 10:20:48,647 [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 249 -2010-07-23 10:20:48,739 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 37249 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 10:23:15,032 [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 54738 -2010-07-23 10:23:15,034 [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 738 -2010-07-23 10:23:15,102 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54738 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 10:30:12,949 [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 47786 -2010-07-23 10:30:12,951 [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: 47 786 -2010-07-23 10:30:13,036 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47786 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 10:42:57,279 [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 50675 -2010-07-23 10:42:57,281 [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: 50 675 -2010-07-23 10:42:57,355 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50675 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 11:49:53,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 55038 -2010-07-23 11:49:53,341 [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 038 -2010-07-23 11:49:53,401 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55038 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 11:50:34,251 [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 48624 -2010-07-23 11:50:34,254 [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 624 -2010-07-23 11:50:34,329 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48624 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 11:53:19,926 [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 44796 -2010-07-23 11:53:19,928 [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 796 -2010-07-23 11:53:20,022 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44796 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 12:02:07,251 [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 58625 -2010-07-23 12:02:07,253 [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: 58 625 -2010-07-23 12:02:07,344 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58625 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 12:12:54,934 [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 33203 -2010-07-23 12:12:54,936 [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: 33 203 -2010-07-23 12:12:55,019 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33203 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 12:20:03,108 [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 47992 -2010-07-23 12:20:03,110 [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: 47 992 -2010-07-23 12:20:03,203 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47992 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 14:49:00,912 [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 57825 -2010-07-23 14:49:00,914 [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 825 -2010-07-23 14:49:01,010 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 57825 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 14:54:25,298 [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 40562 -2010-07-23 14:54:25,301 [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: 40 562 -2010-07-23 14:54:25,378 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40562 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService -2010-07-23 14:56:23,158 [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 59976 -2010-07-23 14:56:23,160 [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: 59 976 -2010-07-23 14:56:23,259 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59976 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService

1 0

r115 - in trunk/bonzoms-ui-zk: . src/main/java/org/chorem/bonzoms/ui src/main/webapp
by bbrossaud＠users.chorem.org July 23, 2010

July 23, 2010

Author: bbrossaud Date: 2010-07-23 15:39:17 +0200 (Fri, 23 Jul 2010) New Revision: 115 Url: http://chorem.org/repositories/revision/bonzoms/115 Log: in employee form we can select an existing company and service Modified: trunk/bonzoms-ui-zk/pom.xml trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.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/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/ResultController.java trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul trunk/bonzoms-ui-zk/transaction.log Modified: trunk/bonzoms-ui-zk/pom.xml =================================================================== --- trunk/bonzoms-ui-zk/pom.xml 2010-07-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/pom.xml 2010-07-23 13:39:17 UTC (rev 115) @@ -81,7 +81,7 @@   - <name>Bonzoms : bonzoms-zk</name> + <name>Bonzoms : bonzoms-ui-zk</name> <description>Interface Web ZK pour Bonzoms</description> <inceptionYear>2010</inceptionYear> @@ -95,7 +95,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> <configuration> <source>1.6</source> <target>1.6</target> Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-07-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyModel.java 2010-07-23 13:39:17 UTC (rev 115) @@ -34,36 +34,36 @@ * @author sherkhan */ public class CompanyModel extends AbstractListModel implements BindingListModel { - protected List<CompanyData> _companies = new ArrayList<CompanyData>(); + protected List<CompanyData> companies = new ArrayList<CompanyData>(); @Override public Object getElementAt(int index) { - return _companies.get(index); + return companies.get(index); } @Override public int getSize() { - return _companies.size(); + return companies.size(); } @Override public int indexOf(Object obj) { - return _companies.indexOf(obj); + return companies.indexOf(obj); } public void setCompanies(List<CompanyData> companies) { - _companies = companies; + this.companies = companies; fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } public void addData(CompanyData newData) { - _companies.add(newData); - fireEvent(ListDataEvent.INTERVAL_ADDED, _companies.size() - 1, _companies.size() - 1); + companies.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, companies.size() - 1, companies.size() - 1); } public void removeData(CompanyData data) { - int interval = _companies.indexOf(data); - _companies.remove(data); + int interval = companies.indexOf(data); + companies.remove(data); fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); } @@ -74,4 +74,8 @@ public void reload() { fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); } + + public List<CompanyData> getCompanies() { + return companies; + } } 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-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-23 13:39:17 UTC (rev 115) @@ -23,7 +23,6 @@ */ package org.chorem.bonzoms.ui; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; 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-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeData.java 2010-07-23 13:39:17 UTC (rev 115) @@ -44,6 +44,8 @@ protected PersonData personData = null; protected ServiceData serviceData = null; + protected CompanyData companyData = null; + protected ContractsData contractsData = null; public EmployeeData() { } @@ -104,6 +106,9 @@ this.serviceData = serviceData; } + public void setCompanyData(CompanyData companyData) { + this.companyData = companyData; + } /* * Getters @@ -187,4 +192,8 @@ public String getPersonEmailsModelAsString() { return personData.getEmailsAsString(); } + + public CompanyData getCompanyData() { + return companyData; + } } 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-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-23 13:39:17 UTC (rev 115) @@ -29,10 +29,13 @@ import java.util.Map; import java.util.Set; import org.chorem.data.bonzoms.Address; +import org.chorem.data.bonzoms.Company; +import org.chorem.data.bonzoms.CompanyImpl; import org.chorem.data.bonzoms.Employee; import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.Service; +import org.chorem.data.bonzoms.ServiceImpl; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.SuspendNotAllowedException; @@ -43,6 +46,8 @@ import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.Window; /** @@ -51,119 +56,208 @@ */ public class EmployeeFormController extends GenericForwardComposer { - protected Model _model = new Model(); + protected Model model = new Model(); - protected EmployeeData _employeeData = new EmployeeData(); + protected EmployeeData employeeData = new EmployeeData(); - protected Listbox addressListbox; - protected Listbox phoneListbox; - protected Listbox emailListbox; + protected CompanyModel companyModel = new CompanyModel(); + protected ServiceModel serviceModel = new ServiceModel(); + protected Listbox companyListbox; + protected Listbox serviceListbox; + public final static String EVENT_ON_SAVE_EMPLOYEE = "onSaveEmployee"; - + @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - EmployeeData employeeData = (EmployeeData) arg.get("employeeData"); - init(employeeData); + EmployeeData data = (EmployeeData) arg.get("employeeData"); + initCompanyModel(); + initServiceModel(); + if (data != null) { + initEmployee(data); + } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } - protected void init(EmployeeData employeeData) { - if (employeeData != null) { - initEmployee(employeeData); + protected void initCompanyModel() { + Company newCompany = new CompanyImpl(); + newCompany.setName("New company"); + companyModel.addData(new CompanyData(newCompany, null)); + List<Company> companies = model.retrieveAllCompanies(); + for (Company company : companies) { + CompanyData data = new CompanyData(company, null); + companyModel.addData(data); } } + protected void initServiceModel() { + Service newService = new ServiceImpl(); + newService.setType("New service"); + serviceModel.addData(new ServiceData(newService, null)); + List<Service> services = model.retrieveAllServices(); + for (Service service : services) { + ServiceData data = new ServiceData(service, null); + serviceModel.addData(data); + } + } + protected void initPerson() { - Person person = _model.retrievePersonById(_employeeData.getEmployee().getPerson()); + Person person = model.retrievePersonById(employeeData.getEmployee().getPerson()); if (person != null) { PersonData personData = new PersonData(person, null); - _employeeData.setPersonData(personData); + employeeData.setPersonData(personData); } } protected void initService() { - Service service = _model.retrieveServiceById(_employeeData.getEmployee().getService()); + Service service = model.retrieveServiceById(employeeData.getEmployee().getService()); if (service != null) { ServiceData serviceData = new ServiceData(service, null); - _employeeData.setServiceData(serviceData); + employeeData.setServiceData(serviceData); } } protected void initContracts() { - Set<String> contractIds = _employeeData.getEmployee().getEmploymentContract(); + Set<String> contractIds = employeeData.getEmployee().getEmploymentContract(); if (contractIds != null && !contractIds.isEmpty()) { List<String> ids = new ArrayList<String>(contractIds); - List<EmploymentContract> contracts = _model.retrieveContractsByIds(ids); + List<EmploymentContract> contracts = model.retrieveContractsByIds(ids); ContractsData contractsData = new ContractsData(contracts); - _employeeData.setContractsData(contractsData); + employeeData.setContractsData(contractsData); } } protected void initEmployee(EmployeeData employee) { - _employeeData = employee; - Address workingAddress = _model.retrieveAddressById(employee.getEmployee().getAddress()); - _employeeData.setWorkingAddress(workingAddress); + employeeData = employee; + Address workingAddress = model.retrieveAddressById(employee.getEmployee().getAddress()); + employeeData.setWorkingAddress(workingAddress); initPerson(); initService(); initContracts(); + } protected void removePersonAddresses() { - List<String> ids = _employeeData.getPersonRemovedAddresses(); + List<String> ids = employeeData.getPersonRemovedAddresses(); for (String id : ids) { - _employeeData.getPerson().removeAddress(id); + employeeData.getPerson().removeAddress(id); } } protected void removeEmployeeContracts() { - List<String> ids = _employeeData.getRemovedContracts(); + List<String> ids = employeeData.getRemovedContracts(); for (String id : ids) { - _employeeData.getEmployee().removeEmploymentContract(id); + employeeData.getEmployee().removeEmploymentContract(id); } } protected void saveEmployeeContracts() { - if (_employeeData.getContractsData() != null) { - List<EmploymentContract> contracts = _model.createContracts(_employeeData.getContractsList()); - if (!_employeeData.getRemovedContracts().isEmpty()) { - _model.deleteContractsByIds(_employeeData.getRemovedContracts()); + 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()); + employeeData.getEmployee().addEmploymentContract(contract.getWikittyId()); } } } /* + * Renderers + */ + + public ListitemRenderer getCompanyDataRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + CompanyData companyData = (CompanyData) data; + String id = employeeData.getEmployee().getCompany(); + String companyId = companyData.getCompany().getWikittyId(); + item.setLabel(companyData.getCompany().getName()); + if (id != null && id.equals(companyId)) { + companyListbox.setSelectedItem(item); + employeeData.setCompanyData(companyData); + } + } + }; + } + + public ListitemRenderer getServiceDataRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + ServiceData serviceData = (ServiceData) data; + String id = employeeData.getEmployee().getService(); + String serviceId = serviceData.getService().getWikittyId(); + item.setLabel(serviceData.getService().getType()); + if (id != null && id.equals(serviceId)) { + serviceListbox.setSelectedItem(item); + employeeData.setServiceData(serviceData); + } + } + }; + } + + /* * Events */ public void onClick$saveEmployee() { - Address workingAddress = _model.updateAddress(_employeeData.getWorkingAddress()); - _employeeData.getEmployee().setAddress(workingAddress.getWikittyId()); + Address workingAddress = model.updateAddress(employeeData.getWorkingAddress()); + employeeData.getEmployee().setAddress(workingAddress.getWikittyId()); saveEmployeeContracts(); - Employee employee = _model.createEmployee(_employeeData.getEmployee()); - _employeeData.setEmployee(employee); + Employee employee = model.createEmployee(employeeData.getEmployee()); + employeeData.setEmployee(employee); - Events.postEvent(EVENT_ON_SAVE_EMPLOYEE, this.self, _employeeData); - + Events.postEvent(EVENT_ON_SAVE_EMPLOYEE, this.self, employeeData); this.self.detach(); } + public void onSelect$companyListbox() { + int index = companyListbox.getSelectedIndex(); + if (index != -1) { + if (index == 0) { + employeeData.setCompanyData(null); + } else { + CompanyData data = (CompanyData) companyModel.getElementAt(index); + employeeData.setCompanyData(data); + employeeData.getEmployee().setCompany(data.getCompany().getWikittyId()); + } + } + } + + + public void onSelect$serviceListbox() { + int index = serviceListbox.getSelectedIndex(); + if (index != -1) { + if (index == 0) { + employeeData.setServiceData(null); + } else { + ServiceData data = (ServiceData) serviceModel.getElementAt(index); + employeeData.setServiceData(data); + employeeData.getEmployee().setService(data.getService().getWikittyId()); + } + } + } + public void onClick$editPerson() throws SuspendNotAllowedException, InterruptedException { Map<String, Object> map = new HashMap<String, Object>(); - if (_employeeData.getPersonData() != null) { - map.put("personData", _employeeData.getPersonData()); + if (employeeData.getPersonData() != null) { + map.put("personData", employeeData.getPersonData()); } Window win = (Window) Executions.createComponents("personFormPage.zul", null, map); @@ -173,7 +267,8 @@ public void onEvent(Event event) throws Exception { PersonData data = (PersonData) event.getData(); if (data != null) { - _employeeData.setPersonData(data); + employeeData.setPersonData(data); + employeeData.getEmployee().setPerson(data.getPerson().getWikittyId()); } } }); @@ -183,10 +278,39 @@ win.doModal(); } + public void onClick$editCompany() throws InterruptedException { + Map<String, Object> map = new HashMap<String, Object>(); + if (employeeData.getCompanyData() != null){ + map.put("companyData", employeeData.getCompanyData()); + } + Window win = (Window) Executions.createComponents("companyFormPage.zul", null, map); + + win.addEventListener(CompanyFormController.EVENT_ON_SAVE_COMPANY, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + CompanyData data = (CompanyData) event.getData(); + if (data != null) { + if (employeeData.getCompanyData() == null) { + companyModel.addData(data); + int index = companyModel.indexOf(data); + companyListbox.setSelectedIndex(index); + } + employeeData.setCompanyData(data); + employeeData.getEmployee().setCompany(data.getCompany().getWikittyId()); + } + } + }); + + win.setPage(page); + win.setPosition("center"); + win.doModal(); + } + public void onClick$editContracts() throws SuspendNotAllowedException, InterruptedException { Map<String, Object> map = new HashMap<String, Object>(); - if (_employeeData.getContractsData() != null) { - map.put("contractsData", _employeeData.getContractsData()); + if (employeeData.getContractsData() != null) { + map.put("contractsData", employeeData.getContractsData()); } Window win = (Window) Executions.createComponents("contractsFormPage.zul", null, map); @@ -196,7 +320,7 @@ public void onEvent(Event event) throws Exception { ContractsData data = (ContractsData) event.getData(); if (data != null) { - _employeeData.setContractsData(data); + employeeData.setContractsData(data); } } }); @@ -208,18 +332,23 @@ public void onClick$editService() throws SuspendNotAllowedException, InterruptedException { Map<String, Object> map = new HashMap<String, Object>(); - if (_employeeData.getServiceData() != null){ - 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); + if (employeeData.getServiceData() == null) { + serviceModel.addData(data); + int index = serviceModel.indexOf(data); + serviceListbox.setSelectedIndex(index); + } + employeeData.setServiceData(data); + employeeData.getEmployee().setService(data.getService().getWikittyId()); } } }); @@ -230,12 +359,17 @@ } /* - * Setters - */ - /* * Getters */ public EmployeeData getEmployeeData() { - return _employeeData; + return employeeData; } + + public CompanyModel getCompanyModel() { + return companyModel; + } + + public ServiceModel getServiceModel() { + return serviceModel; + } } 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-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-23 13:39:17 UTC (rev 115) @@ -160,19 +160,6 @@ return employees; } - 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; - } - public List<Company> retrieveCompaniesBySearch(String search) { Criteria criteria = Search.query().keyword(search).criteria(); List<Company> companies = proxy.findAllByCriteria(Company.class, criteria).getAll(); 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-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonController.java 2010-07-23 13:39:17 UTC (rev 115) @@ -57,13 +57,7 @@ @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - String search = (String) arg.get("search"); - List<Person> persons; - if (search != null && !search.isEmpty()) { - persons = model.retrievePersonsBySearch(search); - } else { - persons = model.retrieveAllPersons(); - } + List<Person> persons = model.retrieveAllPersons(); createPersonsData(persons); } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-23 13:39:17 UTC (rev 115) @@ -41,12 +41,14 @@ 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.zul.Button; import org.zkoss.zul.Label; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Toolbarbutton; import org.zkoss.zul.Window; /** @@ -193,6 +195,26 @@ return cell; } + protected Listcell dependanciesRenderer(String id) { + Listcell cell = new Listcell(); + List<Wikitty> wikitties = model.retrieveAllBySearch(id); + System.out.println("==================>" + wikitties.size()); + for (final Wikitty wikitty : wikitties) { + Collection<String> extensions = wikitty.getExtensionNames(); + String str = StringUtil.join(extensions, ", ", false); + Toolbarbutton button = new Toolbarbutton(str); + button.addEventListener(Events.ON_CLICK, new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + createPageByWikitty(wikitty); + } + }); + cell.appendChild(button); + } + return cell; + } + public ListitemRenderer getWikittyRenderer() { return new ListitemRenderer() { @@ -201,26 +223,22 @@ item.setValue(data); final Wikitty wikitty = (Wikitty) data; - Listcell id = new Listcell(wikitty.getId()); - Listcell extensions = extensionsRenderer(wikitty); Listcell values = valuesRenderer(wikitty); - Listcell detailsCell = new Listcell(); - Button details = new Button("details"); - detailsCell.appendChild(details); - details.addEventListener("onClick", new EventListener() { + Listcell dependances = dependanciesRenderer(wikitty.getId()); + item.addEventListener(Events.ON_CLICK, new EventListener() { + @Override public void onEvent(Event event) throws Exception { createPageByWikitty(wikitty); } }); - item.appendChild(id); item.appendChild(extensions); item.appendChild(values); - item.appendChild(detailsCell); + item.appendChild(dependances); } }; } Modified: trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/webapp/employeeFormPage.zul 2010-07-23 13:39:17 UTC (rev 115) @@ -1,48 +1,63 @@ <?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="340px" width="400" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.EmployeeFormController"> -<caption label="Employee"/> +<window closable="true" maximizable="true" sizable="true" height="350px" width="400" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.EmployeeFormController"> + <caption label="Employee"/> + <separator /> + <groupbox> <caption label="Employee informations" /> <hbox> <vbox> + <separator /> <label value="email" /> <textbox value="@{composer.employeeData.employee.workingEmail, save-when='saveEmployee.onClick'}" constraint="/.+@.+\.[a-z]+/" /> + <label value="Phone number" /> <textbox value="@{composer.employeeData.employee.workingPhone, save-when='saveEmployee.onClick'}" /> - <separator /> - <toolbarbutton id="editContracts" label="Edit contracts" /> - <separator /> - <toolbarbutton id="editService" label="Edit service" /> - <separator /> + + <toolbarbutton id="editService" label="Edit service :" /> + <listbox id="serviceListbox" width="100px" model="@{composer.serviceModel}" mold="select" itemRenderer="@{composer.serviceDataRenderer}"> + </listbox> + + <toolbarbutton id="editCompany" label="Edit company :" /> + <listbox id="companyListbox" width="100px" model="@{composer.companyModel}" mold="select" itemRenderer="@{composer.companyDataRenderer}"> + </listbox> + <toolbarbutton id="editPerson" label="Edit person" /> + <toolbarbutton id="editContracts" label="Edit contracts" /> + </vbox> - <groupbox> - <caption label="Working address" /> - <vbox> - <label value="Adress1" /> - <textbox value="@{composer.employeeData.workingAddress.address1, save-when='saveEmployee.onClick'}" /> + <vbox> + <separator /> - <label value="Adress2" /> - <textbox value="@{composer.employeeData.workingAddress.address2, save-when='saveEmployee.onClick'}" /> + <groupbox> + <caption label="Working address" /> + <vbox> + <label value="Adress1" /> + <textbox value="@{composer.employeeData.workingAddress.address1, save-when='saveEmployee.onClick'}" /> - <label value="Zip code" /> - <textbox value="@{composer.employeeData.workingAddress.zipCode, save-when='saveEmployee.onClick'}" /> + <label value="Adress2" /> + <textbox value="@{composer.employeeData.workingAddress.address2, save-when='saveEmployee.onClick'}" /> - <label value="City" /> - <textbox value="@{composer.employeeData.workingAddress.city, save-when='saveEmployee.onClick'}" /> + <label value="Zip code" /> + <textbox value="@{composer.employeeData.workingAddress.zipCode, save-when='saveEmployee.onClick'}" /> - <label value="Country" /> - <textbox value="@{composer.employeeData.workingAddress.country, save-when='saveEmployee.onClick'}" /> - </vbox> - </groupbox> + <label value="City" /> + <textbox value="@{composer.employeeData.workingAddress.city, save-when='saveEmployee.onClick'}" /> + <label value="Country" /> + <textbox value="@{composer.employeeData.workingAddress.country, save-when='saveEmployee.onClick'}" /> + </vbox> + </groupbox> + + </vbox> + </hbox> </groupbox> <button id="saveEmployee" label="Save" /> Modified: trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-23 13:39:17 UTC (rev 115) @@ -6,10 +6,9 @@ <listbox autopaging="true" mold="paging" id="wikittyListBox" rows="10" model="@{result$composer.wikittyModel}" itemRenderer="@{result$composer.wikittyRenderer}"> <listhead> - <listheader label="id" /> <listheader label="Extensions" /> <listheader label="Values" /> - <listheader label="Details" /> + <listheader label="Dependances" /> </listhead> </listbox> </window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-21 19:59:57 UTC (rev 114) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-23 13:39:17 UTC (rev 115) @@ -615,3 +615,87 @@ 2010-07-21 18:32:02,125 [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 58940 2010-07-21 18:32:02,127 [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: 58 940 2010-07-21 18:32:02,232 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58940 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 14:26:59,145 [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 45523 +2010-07-22 14:26:59,175 [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 523 +2010-07-22 14:26:59,248 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 45523 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 14:34:11,080 [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 39013 +2010-07-22 14:34:11,086 [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 013 +2010-07-22 14:34:11,167 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39013 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 15:30:29,392 [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 60002 +2010-07-22 15:30:29,394 [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: 60 002 +2010-07-22 15:30:29,483 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 60002 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 15:41:08,922 [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 41442 +2010-07-22 15:41:08,925 [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 442 +2010-07-22 15:41:08,997 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 41442 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 15:41:58,445 [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 33473 +2010-07-22 15:41:58,447 [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: 33 473 +2010-07-22 15:41:58,549 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33473 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 15:49:48,467 [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 34533 +2010-07-22 15:49:48,468 [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 533 +2010-07-22 15:49:48,560 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 34533 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 17:23:18,008 [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 56984 +2010-07-22 17:23:18,010 [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 984 +2010-07-22 17:23:18,076 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56984 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 17:25:02,922 [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 38477 +2010-07-22 17:25:02,925 [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 477 +2010-07-22 17:25:02,978 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38477 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 17:34:35,884 [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 40474 +2010-07-22 17:34:35,886 [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: 40 474 +2010-07-22 17:34:35,988 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40474 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 17:43:31,327 [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 40189 +2010-07-22 17:43:31,329 [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: 40 189 +2010-07-22 17:43:31,414 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40189 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 17:50:11,928 [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 49462 +2010-07-22 17:50:11,935 [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: 49 462 +2010-07-22 17:50:12,038 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49462 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 17:53:49,532 [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 42286 +2010-07-22 17:53:49,533 [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 286 +2010-07-22 17:53:49,632 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42286 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 18:00:53,923 [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 40103 +2010-07-22 18:00:53,925 [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: 40 103 +2010-07-22 18:00:53,995 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40103 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-22 18:06:47,392 [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 53413 +2010-07-22 18:06:47,394 [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: 53 413 +2010-07-22 18:06:47,474 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 53413 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 10:02:59,402 [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 48132 +2010-07-23 10:02:59,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: 48 132 +2010-07-23 10:02:59,534 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48132 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 10:20:48,643 [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 37249 +2010-07-23 10:20:48,647 [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 249 +2010-07-23 10:20:48,739 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 37249 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 10:23:15,032 [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 54738 +2010-07-23 10:23:15,034 [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 738 +2010-07-23 10:23:15,102 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 54738 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 10:30:12,949 [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 47786 +2010-07-23 10:30:12,951 [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: 47 786 +2010-07-23 10:30:13,036 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47786 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 10:42:57,279 [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 50675 +2010-07-23 10:42:57,281 [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: 50 675 +2010-07-23 10:42:57,355 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 50675 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 11:49:53,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 55038 +2010-07-23 11:49:53,341 [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 038 +2010-07-23 11:49:53,401 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55038 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 11:50:34,251 [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 48624 +2010-07-23 11:50:34,254 [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 624 +2010-07-23 11:50:34,329 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 48624 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 11:53:19,926 [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 44796 +2010-07-23 11:53:19,928 [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 796 +2010-07-23 11:53:20,022 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 44796 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 12:02:07,251 [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 58625 +2010-07-23 12:02:07,253 [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: 58 625 +2010-07-23 12:02:07,344 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58625 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 12:12:54,934 [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 33203 +2010-07-23 12:12:54,936 [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: 33 203 +2010-07-23 12:12:55,019 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 33203 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 12:20:03,108 [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 47992 +2010-07-23 12:20:03,110 [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: 47 992 +2010-07-23 12:20:03,203 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47992 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 14:49:00,912 [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 57825 +2010-07-23 14:49:00,914 [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 825 +2010-07-23 14:49:01,010 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 57825 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 14:54:25,298 [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 40562 +2010-07-23 14:54:25,301 [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: 40 562 +2010-07-23 14:54:25,378 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 40562 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-23 14:56:23,158 [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 59976 +2010-07-23 14:56:23,160 [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: 59 976 +2010-07-23 14:56:23,259 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 59976 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService

1 0

r114 - in trunk/bonzoms-ui-zk: . src/main/java/org/chorem/bonzoms/ui src/main/webapp
by bbrossaud＠users.chorem.org July 21, 2010

July 21, 2010

Author: bbrossaud Date: 2010-07-21 21:59:57 +0200 (Wed, 21 Jul 2010) New Revision: 114 Url: http://chorem.org/repositories/revision/bonzoms/114 Log: fulltext search works 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/ResultController.java trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul trunk/bonzoms-ui-zk/transaction.log 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-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-21 19:59:57 UTC (rev 114) @@ -32,8 +32,10 @@ import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.Service; import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; @@ -133,6 +135,9 @@ } public Service retrieveServiceById(String id) { + if (id == null || id.isEmpty()) { + return null; + } return proxy.restore(Service.class, id); } @@ -190,19 +195,25 @@ } public List<Wikitty> retrieveAllBySearch(String str) { + List<Wikitty> wikitties = new ArrayList<Wikitty>(); + Search search = Search.query().eq(Element.ELT_EXTENSION, Person.EXT_PERSON); search = search.or().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY); - search = search.or().eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); - search = search.or().eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); - search = search.or().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); - search = search.or().eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); - search = search.and().keyword(str); + search = search.eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); + search = search.eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); + search = search.eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); + search = search.eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); + if (str != null && !str.isEmpty()) { + search = search.and().keyword(str); + } Criteria criteria = search.criteria(); - - List<Wikitty> wikitties = proxy.findAllByCriteria(null, criteria).cast(null, proxy.getWikittyService()).getAll(); - wikitties = new ArrayList<Wikitty>(wikitties); - + WikittyService service = proxy.getWikittyService(); + PagedResult result = service.findAllByCriteria(null, criteria); + if (result != null) { + wikitties = result.cast(null, proxy.getWikittyService()).getAll(); + wikitties = new ArrayList<Wikitty>(wikitties); + } return wikitties; } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-21 19:59:57 UTC (rev 114) @@ -217,6 +217,10 @@ createPageByWikitty(wikitty); } }); + item.appendChild(id); + item.appendChild(extensions); + item.appendChild(values); + item.appendChild(detailsCell); } }; } Modified: trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul 2010-07-21 19:59:57 UTC (rev 114) @@ -1,29 +1,29 @@ <?page id="AddressForm" title="Address 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.AddressFormController"> +<window closable="true" maximizable="true" sizable="true" height="350px" width="200px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.AddressFormController"> <caption label="Address"/> <groupbox> <caption label="@{composer.address.name}" /> <vbox> <label value="Name" /> - <textbox value="@{composer.address.name, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.name, save-when='saveAddress.onClick'}" /> <label value="Adress1" /> - <textbox value="@{composer.address.address1, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.address1, save-when='saveAddress.onClick'}" /> <label value="Adress2" /> - <textbox value="@{composer.address.address2, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.address2, save-when='saveAddress.onClick'}" /> <label value="Zip code" /> - <textbox value="@{composer.address.zipCode, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.zipCode, save-when='saveAddress.onClick'}" /> <label value="City" /> - <textbox value="@{composer.address.city, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.city, save-when='saveAddress.onClick'}" /> <label value="Country" /> - <textbox value="@{composer.address.country, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.country, save-when='saveAddress.onClick'}" /> </vbox> </groupbox> Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-21 19:59:57 UTC (rev 114) @@ -1,7 +1,8 @@ <?page id="ContractForm" title="Contract 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="400px" width="450px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.ContractFormController"> +<window closable="true" maximizable="true" sizable="true" height="350px" width="450px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.ContractFormController"> + <caption label="Contract" /> <groupbox> <caption label="@{composer.contract.type}" /> @@ -10,16 +11,16 @@ <vbox> <label value="Type" /> - <textbox value="@{composer.contract.type, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.type, save-when='saveContract.onClick'}" /> <label value="Salary" /> - <doublebox value="@{composer.contract.salary, save-when='save.onClick'}" /> + <doublebox value="@{composer.contract.salary, save-when='saveContract.onClick'}" /> <label value="Working time" /> - <textbox value="@{composer.contract.workingTime, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.workingTime, save-when='saveContract.onClick'}" /> <label value="Advantages" /> - <textbox value="@{composer.contract.advantages, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.advantages, save-when='saveContract.onClick'}" /> </vbox> @@ -27,16 +28,16 @@ <vbox> <label value="Name" /> - <textbox value="@{composer.contract.name, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.name, save-when='saveContract.onClick'}" /> <label value="Start" /> - <datebox format="yyyy/MM/dd" value="@{composer.contract.start, save-when='save.onClick'}" /> + <datebox format="yyyy/MM/dd" value="@{composer.contract.start, save-when='saveContract.onClick'}" /> <label value="End" /> - <datebox format="yyyy/MM/dd" value="@{composer.contract.end, save-when='save.onClick'}" /> + <datebox format="yyyy/MM/dd" value="@{composer.contract.end, save-when='saveContract.onClick'}" /> <label value="Description" /> - <textbox rows="5" value="@{composer.contract.description, save-when='save.onClick'}" /> + <textbox rows="5" value="@{composer.contract.description, save-when='saveContract.onClick'}" /> </vbox> Modified: trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-21 19:59:57 UTC (rev 114) @@ -3,7 +3,7 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="result"?> <window id="result" apply="org.chorem.bonzoms.ui.ResultController"> - <listbox autopaging="true" mold="paging" id="wikittyListBox" rows="20" model="@{result$composer.wikittyModel}" + <listbox autopaging="true" mold="paging" id="wikittyListBox" rows="10" model="@{result$composer.wikittyModel}" itemRenderer="@{result$composer.wikittyRenderer}"> <listhead> <listheader label="id" /> Modified: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-21 19:59:57 UTC (rev 114) @@ -585,3 +585,33 @@ 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 +2010-07-21 17:28:02,662 [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 55227 +2010-07-21 17:28:02,663 [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 227 +2010-07-21 17:28:02,730 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55227 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 17:29:27,385 [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 49130 +2010-07-21 17:29:27,386 [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: 49 130 +2010-07-21 17:29:27,480 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49130 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 17:38:45,133 [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 35561 +2010-07-21 17:38:45,135 [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 561 +2010-07-21 17:38:45,217 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35561 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:03:06,992 [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 37400 +2010-07-21 18:03:06,994 [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 400 +2010-07-21 18:03:07,082 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 37400 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:07:11,061 [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 47692 +2010-07-21 18:07:11,064 [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: 47 692 +2010-07-21 18:07:11,147 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47692 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:11:33,531 [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 38191 +2010-07-21 18:11:33,533 [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 191 +2010-07-21 18:11:33,623 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38191 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:13:53,101 [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 56284 +2010-07-21 18:13:53,103 [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 284 +2010-07-21 18:13:53,198 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56284 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:20:31,222 [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 45537 +2010-07-21 18:20:31,224 [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 537 +2010-07-21 18:20:31,326 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 45537 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:28:35,266 [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 42096 +2010-07-21 18:28:35,268 [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 096 +2010-07-21 18:28:35,362 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42096 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:32:02,125 [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 58940 +2010-07-21 18:32:02,127 [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: 58 940 +2010-07-21 18:32:02,232 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58940 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService

1 0

r113 - in trunk/bonzoms-ui-zk/src/main: java/org/chorem/bonzoms/ui webapp
by bbrossaud＠users.chorem.org July 21, 2010

July 21, 2010

Author: bbrossaud Date: 2010-07-21 17:27:32 +0200 (Wed, 21 Jul 2010) New Revision: 113 Url: http://chorem.org/repositories/revision/bonzoms/113 Log: addition fullText search Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.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/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/PersonFormController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/AddressFormController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -0,0 +1,52 @@ +package org.chorem.bonzoms.ui; + +import org.chorem.data.bonzoms.Address; +import org.chorem.data.bonzoms.AddressImpl; +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; + +/** + * + * @author bbrossaud + */ +public class AddressFormController extends GenericForwardComposer { + + protected Model model = new Model(); + + protected Address address = new AddressImpl(); + + public final static String EVENT_ON_SAVE_ADDRESS = "onSaveAddress"; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + Address data = (Address) arg.get("address"); + if (data != null) { + this.address = data; + } + DataBinder binder = new AnnotateDataBinder(comp); + binder.bindBean("composer", this); + binder.loadAll(); + } + + /* + * Events + */ + public void onClick$saveAddress() { + address = model.createAddress(address); + + Events.postEvent(EVENT_ON_SAVE_ADDRESS, this.self, address); + + self.detach(); + } + + /* + * Getters + */ + public Address getAddress() { + return address; + } +} Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/CompanyFormController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -23,6 +23,7 @@ */ package org.chorem.bonzoms.ui; +import java.util.ArrayList; import java.util.List; import org.chorem.data.bonzoms.Address; import org.chorem.data.bonzoms.AddressImpl; @@ -79,8 +80,10 @@ _companyData.getEmailsModel().addData(email); } - protected void initCompany(CompanyData company) { - _companyData = company; + protected void initCompany(CompanyData companyData) { + _companyData = companyData; + List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(companyData.getCompany().getAddress())); + _companyData.setAddresses(addresses); _companyData.setEmailsModelList(_companyData.getCompany().getEmails()); _companyData.setPhonesModelList(_companyData.getCompany().getPhones()); } 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-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -1,7 +1,5 @@ package org.chorem.bonzoms.ui; -import java.util.ArrayList; -import java.util.List; import org.chorem.data.bonzoms.EmploymentContract; import org.chorem.data.bonzoms.EmploymentContractImpl; import org.zkoss.zk.ui.Component; @@ -9,77 +7,44 @@ import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zkplus.databind.DataBinder; -import org.zkoss.zul.Listbox; /** * - * @author sherkhan + * @author bbrossaud */ public class ContractFormController extends GenericForwardComposer { - protected ContractsData contractsData = new ContractsData(); - protected List<EmploymentContract> save = new ArrayList<EmploymentContract>(); - protected Listbox contractListbox; + protected Model model = new Model(); + protected EmploymentContract contract = new EmploymentContractImpl(); + public final static String EVENT_ON_SAVE_CONTRACT = "onSaveContract"; - public final static String EVENT_ON_SAVE_CONTRACTS = "onSaveContracts"; - @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - ContractsData data = (ContractsData) arg.get("contractsData"); + EmploymentContract data = (EmploymentContract) arg.get("contract"); if (data != null) { - initContracts(data); - } else { - initDefaultContracts(); + this.contract = data; } 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 */ - public void onClick$addContract() { - EmploymentContract contract = new EmploymentContractImpl(); - contractsData.getContractsModel().addData(contract); - } + public void onClick$saveContract() { + contract = model.createContract(contract); - public void onClick$deleteContract() { - int size = contractListbox.getItemCount(); - if (size > 1) { - EmploymentContract contract = (EmploymentContract) contractsData.getContractsModel().getElementAt(size -1); - contractsData.getContractsModel().removeData(contract); - String id = contract.getWikittyId(); - if (!id.isEmpty()) { - contractsData.getRemovedContracts().add(id); - } - } - } + Events.postEvent(EVENT_ON_SAVE_CONTRACT, this.self, contract); - public void onClick$save() { - Events.postEvent(EVENT_ON_SAVE_CONTRACTS, this.self, contractsData); self.detach(); } /* * Getters */ - public ContractsModel getContractsModel() { - return contractsData.getContractsModel(); + public EmploymentContract getContract() { + return contract; } - - public void onClose() { - contractsData.setContractsList(save); - } } Copied: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java (from rev 111, trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractFormController.java) =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ContractsFormController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -0,0 +1,85 @@ +package org.chorem.bonzoms.ui; + +import java.util.ArrayList; +import java.util.List; +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; +import org.zkoss.zul.Listbox; + +/** + * + * @author sherkhan + */ +public class ContractsFormController extends GenericForwardComposer { + + protected ContractsData contractsData = new ContractsData(); + 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 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 + */ + public void onClick$addContract() { + EmploymentContract contract = new EmploymentContractImpl(); + contractsData.getContractsModel().addData(contract); + } + + public void onClick$deleteContract() { + int size = contractListbox.getItemCount(); + if (size > 1) { + EmploymentContract contract = (EmploymentContract) contractsData.getContractsModel().getElementAt(size -1); + contractsData.getContractsModel().removeData(contract); + String id = contract.getWikittyId(); + if (!id.isEmpty()) { + contractsData.getRemovedContracts().add(id); + } + } + } + + public void onClick$save() { + Events.postEvent(EVENT_ON_SAVE_CONTRACTS, this.self, contractsData); + self.detach(); + } + + /* + * Getters + */ + public ContractsModel getContractsModel() { + return contractsData.getContractsModel(); + } + + public void onClose() { + contractsData.setContractsList(save); + } +} 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-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -74,8 +74,7 @@ Person person = _model.retrievePersonById(employee.getPerson()); if (person != null) { - List<Address> addresses = _model.retrieveAddressesByIds(new ArrayList<String>(person.getAddress())); - PersonData personData = new PersonData(person, addresses); + PersonData personData = new PersonData(person, null); data.setPersonData(personData); } _employeeModel.addData(data); 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-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/EmployeeFormController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -29,10 +29,9 @@ 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; @@ -79,20 +78,18 @@ } protected void initPerson() { - 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()); + Person person = _model.retrievePersonById(_employeeData.getEmployee().getPerson()); + if (person != null) { + PersonData personData = new PersonData(person, null); + _employeeData.setPersonData(personData); } } protected void initService() { - if (_employeeData.getServiceData() != null) { - Service service = _model.retrieveServiceById(_employeeData.getEmployee().getService()); - Address address = _model.retrieveAddressById(service.getAddress()); - _employeeData.setService(service); - _employeeData.setServiceAddress(address); + Service service = _model.retrieveServiceById(_employeeData.getEmployee().getService()); + if (service != null) { + ServiceData serviceData = new ServiceData(service, null); + _employeeData.setServiceData(serviceData); } } @@ -148,7 +145,6 @@ /* * Events */ - public void onClick$saveEmployee() { Address workingAddress = _model.updateAddress(_employeeData.getWorkingAddress()); @@ -192,9 +188,9 @@ if (_employeeData.getContractsData() != null) { map.put("contractsData", _employeeData.getContractsData()); } - Window win = (Window) Executions.createComponents("contractFormPage.zul", null, map); + Window win = (Window) Executions.createComponents("contractsFormPage.zul", null, map); - win.addEventListener(ContractFormController.EVENT_ON_SAVE_CONTRACTS, new EventListener() { + win.addEventListener(ContractsFormController.EVENT_ON_SAVE_CONTRACTS, new EventListener() { @Override public void onEvent(Event event) throws Exception { 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-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/MainController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -92,18 +92,21 @@ * Events */ public void onOK$searchBox() { - Component win = content.getLastChild(); - String id = win.getId(); - Map<String, Object> map = initMap(); - if (id.equals(EMPLOYEE_WINDOW_ID)) { - createEmployeesPage(map); - } else if (id.equals(COMPANY_WINDOW_ID)) { - createCompaniesPage(map); - } else if (id.equals(PERSON_WINDOW_ID)) { - createPersonsPage(map); - } else if (id.equals(SERVICE_WINDOW_ID)) { - createServicesPage(map); - } +// Component win = content.getLastChild(); +// String id = win.getId(); +// Map<String, Object> map = initMap(); +// if (id.equals(EMPLOYEE_WINDOW_ID)) { +// createEmployeesPage(map); +// } else if (id.equals(COMPANY_WINDOW_ID)) { +// createCompaniesPage(map); +// } else if (id.equals(PERSON_WINDOW_ID)) { +// createPersonsPage(map); +// } else if (id.equals(SERVICE_WINDOW_ID)) { +// createServicesPage(map); +// } + removeAllContentPage(); + Component newContent = Executions.createComponents("resultPage.zul", null, initMap()); + content.appendChild(newContent); } public void onClick$searchButton() { 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-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-21 15:27:32 UTC (rev 113) @@ -32,6 +32,7 @@ import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.Service; import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; @@ -77,9 +78,20 @@ return proxy.store(person); } + public EmploymentContract createContract(EmploymentContract contract) { + return proxy.store(contract); + } + /* * Retrieve */ + public Employee retrieveEmployeeById(String id) { + if (id == null || id.isEmpty()) { + return null; + } + return proxy.restore(Employee.class, id); + } + public List<Employee> retrieveAllEmployees() { Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE).criteria(); List<Employee> employees = proxy.findAllByCriteria(Employee.class, criteria).getAll(); @@ -170,6 +182,37 @@ return services; } + public EmploymentContract retrieveContractById(String id) { + if (id == null || id.isEmpty()) { + return null; + } + return proxy.restore(EmploymentContract.class, id); + } + + public List<Wikitty> retrieveAllBySearch(String str) { + Search search = Search.query().eq(Element.ELT_EXTENSION, Person.EXT_PERSON); + search = search.or().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY); + search = search.or().eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); + search = search.or().eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); + search = search.or().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); + search = search.or().eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); + search = search.and().keyword(str); + + Criteria criteria = search.criteria(); + + List<Wikitty> wikitties = proxy.findAllByCriteria(null, criteria).cast(null, proxy.getWikittyService()).getAll(); + wikitties = new ArrayList<Wikitty>(wikitties); + + return wikitties; + } + + public Company retrieveCompanyById(String id) { + if (id == null || id.isEmpty()) { + return null; + } + return proxy.restore(Company.class, id); + } + /* * Update */ 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-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/PersonFormController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -1,8 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - package org.chorem.bonzoms.ui; import java.util.ArrayList; Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -21,17 +21,33 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.chorem.bonzoms.ui; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; import java.util.Map; -import org.zkoss.zk.ui.event.CreateEvent; +import org.chorem.data.bonzoms.Address; +import org.chorem.data.bonzoms.Company; +import org.chorem.data.bonzoms.Employee; +import org.chorem.data.bonzoms.EmploymentContract; +import org.chorem.data.bonzoms.Person; +import org.chorem.data.bonzoms.Service; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +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.ForwardEvent; +import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.Button; +import org.zkoss.zul.Label; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; +import org.zkoss.zul.Window; /** * @@ -40,16 +56,175 @@ public class ResultController extends GenericForwardComposer { protected Model model = new Model(); + protected WikittyModel wikittyModel = new WikittyModel(); + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + String search = (String) arg.get("search"); + if (search == null) { + search = ""; + } + List<Wikitty> wikitties = model.retrieveAllBySearch(search); + wikittyModel.setWikitties(wikitties); + } + + protected void createPage(Map<String, Object> map, String zulFile) + throws SuspendNotAllowedException, InterruptedException { + Window win = (Window) Executions.createComponents(zulFile, null, map); + win.setPage(page); + win.setPosition("center"); + win.doModal(); + } + + + protected void createEmploymentContractPage(String id) throws SuspendNotAllowedException, InterruptedException { + EmploymentContract contract = model.retrieveContractById(id); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("contract", contract); + createPage(map, "contractFormPage.zul"); + } + + protected void createPersonPage(String id) throws SuspendNotAllowedException, InterruptedException { + Person person = model.retrievePersonById(id); + PersonData data = new PersonData(person, null); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("personData", data); + createPage(map, "personFormPage.zul"); + } + + protected void createEmployeePage(String id) throws SuspendNotAllowedException, InterruptedException { + Employee employee = model.retrieveEmployeeById(id); + EmployeeData data = new EmployeeData(employee, null); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("employeeData", data); + createPage(map, "employeeFormPage.zul"); + } + + protected void createAddressPage(String id) throws SuspendNotAllowedException, InterruptedException { + Address address = model.retrieveAddressById(id); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("address", address); + createPage(map, "addressFormPage.zul"); + } + + protected void createServicePage(String id) throws SuspendNotAllowedException, InterruptedException { + Service service = model.retrieveServiceById(id); + ServiceData data = new ServiceData(service, null); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("serviceData", data); + createPage(map, "serviceFormPage.zul"); + } + + protected void createCompanyPage(String id) throws SuspendNotAllowedException, InterruptedException { + Company company = model.retrieveCompanyById(id); + CompanyData data = new CompanyData(company, null); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("companyData", data); + createPage(map, "companyFormPage.zul"); + } + + protected void createPageByWikitty(Wikitty wikitty) throws SuspendNotAllowedException, InterruptedException { + Collection<String> extensions = wikitty.getExtensionNames(); + if (extensions.contains(EmploymentContract.EXT_EMPLOYMENTCONTRACT)) { + createEmploymentContractPage(wikitty.getId()); + } else if (extensions.contains(Person.EXT_PERSON)) { + createPersonPage(wikitty.getId()); + } else if (extensions.contains(Employee.EXT_EMPLOYEE)) { + createEmployeePage(wikitty.getId()); + } else if (extensions.contains(Address.EXT_ADDRESS)) { + createAddressPage(wikitty.getId()); + } else if (extensions.contains(Service.EXT_SERVICE)) { + createServicePage(wikitty.getId()); + } else if (extensions.contains(Company.EXT_COMPANY)) { + createCompanyPage(wikitty.getId()); + } + + } + /* * Events */ - public void onCreate$resultPage(Event event) { - Map<String, Object> args = retrieveArgsMap(event); + + /* + * Renderers + */ + + protected Listcell extensionsRenderer(Wikitty wikitty) { + Collection<String> extensions = wikitty.getExtensionNames(); + String render = StringUtil.join(extensions, ", ", false); + Listcell cell = new Listcell(render); + return cell; } - public Map<String, Object> retrieveArgsMap(Event event) { - CreateEvent createEvent = (CreateEvent) ((ForwardEvent) event).getOrigin(); - return createEvent.getArg(); + protected String valuesExtensionRenderer(String extensionName, Wikitty wikitty) { + String values = ""; + WikittyExtension wikittyExtension = wikitty.getExtension(extensionName); + Collection<String> fieldNames = wikittyExtension.getFieldNames(); + for (String fieldName : fieldNames) { + String result = wikitty.getFieldAsString(extensionName, fieldName); + if (result == null) { + result = ""; + } + if (result.length() > 50) { + result = result.substring(0, 46); + if (wikittyExtension.getFieldType(fieldName).isCollection()) { + result += "...]"; + } else { + result += "..."; + } + } + values += fieldName + " : " + result + "\n"; + } + return values; } + + protected Listcell valuesRenderer(Wikitty wikitty) { + String values = ""; + Listcell cell = new Listcell(); + Collection<String> extensions = wikitty.getExtensionNames(); + for (String extension : extensions) { + values += extension + "\n"; + values += valuesExtensionRenderer(extension, wikitty) + "\n"; + } + Label label = new Label(values); + label.setMultiline(true); + cell.appendChild(label); + return cell; + } + + public ListitemRenderer getWikittyRenderer() { + return new ListitemRenderer() { + + @Override + public void render(Listitem item, Object data) throws Exception { + item.setValue(data); + final Wikitty wikitty = (Wikitty) data; + + Listcell id = new Listcell(wikitty.getId()); + + Listcell extensions = extensionsRenderer(wikitty); + + Listcell values = valuesRenderer(wikitty); + + Listcell detailsCell = new Listcell(); + Button details = new Button("details"); + detailsCell.appendChild(details); + details.addEventListener("onClick", new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + createPageByWikitty(wikitty); + } + }); + } + }; + } + + /* + * Getter + */ + public WikittyModel getWikittyModel() { + return wikittyModel; + } } 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-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ServiceFormController.java 2010-07-21 15:27:32 UTC (rev 113) @@ -23,18 +23,32 @@ @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - serviceData = (ServiceData) arg.get("serviceData"); + ServiceData data = (ServiceData) arg.get("serviceData"); + if (data != null) { + initService(data); + } DataBinder binder = new AnnotateDataBinder(comp); binder.bindBean("composer", this); binder.loadAll(); } + protected void initService(ServiceData data) { + String id = data.getService().getAddress(); + Address address = model.retrieveAddressById(id); + if (address != null) { + data.setAddress(address); + } + serviceData = data; + } + /* * Events */ public void onClick$saveService() { Address address = model.createAddress(serviceData.getAddress()); serviceData.getService().setAddress(address.getWikittyId()); + serviceData.setAddress(address); + Service service = model.updateService(serviceData.getService()); serviceData.setService(service); Added: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java (rev 0) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/WikittyModel.java 2010-07-21 15:27:32 UTC (rev 113) @@ -0,0 +1,56 @@ +package org.chorem.bonzoms.ui; + +import java.util.ArrayList; +import java.util.List; +import org.nuiton.wikitty.Wikitty; +import org.zkoss.zkplus.databind.BindingListModel; +import org.zkoss.zul.AbstractListModel; +import org.zkoss.zul.event.ListDataEvent; + +/** + * + * @author bbrossaud + */ +public class WikittyModel extends AbstractListModel implements BindingListModel { + + protected List<Wikitty> wikitties = new ArrayList<Wikitty>(); + + @Override + public Object getElementAt(int index) { + return wikitties.get(index); + } + + @Override + public int getSize() { + return wikitties.size(); + } + + @Override + public int indexOf(Object obj) { + return wikitties.indexOf(obj); + } + + public void setWikitties(List<Wikitty> companies) { + wikitties = companies; + fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); + } + + public void addData(Wikitty newData) { + wikitties.add(newData); + fireEvent(ListDataEvent.INTERVAL_ADDED, wikitties.size() - 1, wikitties.size() - 1); + } + + public void removeData(Wikitty data) { + int interval = wikitties.indexOf(data); + wikitties.remove(data); + fireEvent(ListDataEvent.INTERVAL_REMOVED, interval, interval); + } + + public void reloadContent(int rowIndex) { + fireEvent(ListDataEvent.CONTENTS_CHANGED, rowIndex, rowIndex); + } + + public void reload() { + fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1); + } +} Added: trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul (rev 0) +++ trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul 2010-07-21 15:27:32 UTC (rev 113) @@ -0,0 +1,31 @@ +<?page id="AddressForm" title="Address 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.AddressFormController"> + <caption label="Address"/> + <groupbox> + <caption label="@{composer.address.name}" /> + <vbox> + + <label value="Name" /> + <textbox value="@{composer.address.name, save-when='saveCompany.onClick'}" /> + + <label value="Adress1" /> + <textbox value="@{composer.address.address1, save-when='saveCompany.onClick'}" /> + + <label value="Adress2" /> + <textbox value="@{composer.address.address2, save-when='saveCompany.onClick'}" /> + + <label value="Zip code" /> + <textbox value="@{composer.address.zipCode, save-when='saveCompany.onClick'}" /> + + <label value="City" /> + <textbox value="@{composer.address.city, save-when='saveCompany.onClick'}" /> + + <label value="Country" /> + <textbox value="@{composer.address.country, save-when='saveCompany.onClick'}" /> + + </vbox> + </groupbox> + <button id="saveAddress" label="Save" /> +</window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-21 15:27:32 UTC (rev 113) @@ -2,70 +2,45 @@ <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> <window closable="true" maximizable="true" sizable="true" height="400px" width="450px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.ContractFormController"> -<caption label="Contract"/> - <groupbox> - <caption label="Contracts informations" /> + <caption label="@{composer.contract.type}" /> <hbox> <vbox> - <listbox id="contractListbox" model="@{composer.contractsModel}" width="400px"> - <listitem self="@{each='contract'}"> - <listcell> - <groupbox> - <caption label="@{contract.type}" /> + <label value="Type" /> + <textbox value="@{composer.contract.type, save-when='save.onClick'}" /> - <hbox> + <label value="Salary" /> + <doublebox value="@{composer.contract.salary, save-when='save.onClick'}" /> - <vbox> + <label value="Working time" /> + <textbox value="@{composer.contract.workingTime, save-when='save.onClick'}" /> - <label value="Type" /> - <textbox value="@{contract.type, save-when='save.onClick'}" /> + <label value="Advantages" /> + <textbox value="@{composer.contract.advantages, save-when='save.onClick'}" /> - <label value="Salary" /> - <doublebox value="@{contract.salary, save-when='save.onClick'}" /> + </vbox> - <label value="Working time" /> - <textbox value="@{contract.workingTime, save-when='save.onClick'}" /> + <space /> - <label value="Advantages" /> - <textbox value="@{contract.advantages, save-when='save.onClick'}" /> + <vbox> + <label value="Name" /> + <textbox value="@{composer.contract.name, save-when='save.onClick'}" /> - </vbox> + <label value="Start" /> + <datebox format="yyyy/MM/dd" value="@{composer.contract.start, save-when='save.onClick'}" /> - <space /> + <label value="End" /> + <datebox format="yyyy/MM/dd" value="@{composer.contract.end, save-when='save.onClick'}" /> - <vbox> - <label value="Name" /> - <textbox value="@{contract.name, save-when='save.onClick'}" /> + <label value="Description" /> + <textbox rows="5" value="@{composer.contract.description, save-when='save.onClick'}" /> - <label value="Start" /> - <datebox format="yyyy/MM/dd" value="@{contract.start, save-when='save.onClick'}" /> - - <label value="End" /> - <datebox format="yyyy/MM/dd" value="@{contract.end, save-when='save.onClick'}" /> - - <label value="Description" /> - <textbox rows="5" value="@{contract.description, save-when='save.onClick'}" /> - - </vbox> - - </hbox> - </groupbox> - </listcell> - </listitem> - </listbox> - <hbox> - <button label="Add contract" id="addContract" /> - <button label="Delete contract" id="deleteContract" /> - </hbox> - </vbox> </hbox> </groupbox> - <button id="save" label="save" /> - + <button id="saveContract" label="Save" /> </window> \ No newline at end of file Copied: trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul (from rev 108, trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul) =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul (rev 0) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractsFormPage.zul 2010-07-21 15:27:32 UTC (rev 113) @@ -0,0 +1,71 @@ +<?page id="ContractsForm" title="Contracts 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="400px" width="450px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.ContractsFormController"> +<caption label="Contracts"/> + + <groupbox> + <caption label="Contracts informations" /> + + <hbox> + + <vbox> + + <listbox id="contractListbox" model="@{composer.contractsModel}" width="400px"> + <listitem self="@{each='contract'}"> + <listcell> + <groupbox> + <caption label="@{contract.type}" /> + + <hbox> + + <vbox> + + <label value="Type" /> + <textbox value="@{contract.type, save-when='save.onClick'}" /> + + <label value="Salary" /> + <doublebox value="@{contract.salary, save-when='save.onClick'}" /> + + <label value="Working time" /> + <textbox value="@{contract.workingTime, save-when='save.onClick'}" /> + + <label value="Advantages" /> + <textbox value="@{contract.advantages, save-when='save.onClick'}" /> + + </vbox> + + <space /> + + <vbox> + <label value="Name" /> + <textbox value="@{contract.name, save-when='save.onClick'}" /> + + <label value="Start" /> + <datebox format="yyyy/MM/dd" value="@{contract.start, save-when='save.onClick'}" /> + + <label value="End" /> + <datebox format="yyyy/MM/dd" value="@{contract.end, save-when='save.onClick'}" /> + + <label value="Description" /> + <textbox rows="5" value="@{contract.description, save-when='save.onClick'}" /> + + </vbox> + + </hbox> + </groupbox> + </listcell> + </listitem> + </listbox> + <hbox> + <button label="Add contract" id="addContract" /> + <button label="Delete contract" id="deleteContract" /> + </hbox> + + </vbox> + + </hbox> + </groupbox> + <button id="save" label="Save" /> + +</window> \ No newline at end of file Modified: trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-21 09:53:51 UTC (rev 112) +++ trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-21 15:27:32 UTC (rev 113) @@ -3,5 +3,13 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="result"?> <window id="result" apply="org.chorem.bonzoms.ui.ResultController"> - toto + <listbox autopaging="true" mold="paging" id="wikittyListBox" rows="20" model="@{result$composer.wikittyModel}" + itemRenderer="@{result$composer.wikittyRenderer}"> + <listhead> + <listheader label="id" /> + <listheader label="Extensions" /> + <listheader label="Values" /> + <listheader label="Details" /> + </listhead> + </listbox> </window> \ No newline at end of file

1 0