- Sandbox-commits - mailman.cloud.codelutin.com

r467 - /
by echatellier＠users.nuiton.org 06 Jun '11

06 Jun '11

Author: echatellier Date: 2011-06-06 18:44:37 +0200 (Mon, 06 Jun 2011) New Revision: 467 Url: http://nuiton.org/repositories/revision/sandbox/467 Log: Initial import. Added: bobobrowselucenefacets/

1 0

r466 - in i18nastparsingtest: . src src/main src/main/java src/main/java/org src/main/java/org/test src/main/java/org/test/parsing
by echatellier＠users.nuiton.org 24 May '11

24 May '11

Author: echatellier Date: 2011-05-24 15:49:23 +0200 (Tue, 24 May 2011) New Revision: 466 Url: http://nuiton.org/repositories/revision/sandbox/466 Log: Initial import. Added: i18nastparsingtest/pom.xml i18nastparsingtest/src/ i18nastparsingtest/src/main/ i18nastparsingtest/src/main/java/ i18nastparsingtest/src/main/java/org/ i18nastparsingtest/src/main/java/org/test/ i18nastparsingtest/src/main/java/org/test/parsing/ i18nastparsingtest/src/main/java/org/test/parsing/I18nASTParsingTest.java i18nastparsingtest/src/main/resources/ Modified: i18nastparsingtest/ Property changes on: i18nastparsingtest ___________________________________________________________________ Added: svn:ignore + .settings .classpath .project target Added: i18nastparsingtest/pom.xml =================================================================== --- i18nastparsingtest/pom.xml (rev 0) +++ i18nastparsingtest/pom.xml 2011-05-24 13:49:23 UTC (rev 466) @@ -0,0 +1,20 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>AntlrTest</groupId> + <artifactId>AntlrTest</artifactId> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>2.2</version> + </dependency> + + <dependency> + <groupId>com.google.code.javaparser</groupId> + <artifactId>javaparser</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: i18nastparsingtest/src/main/java/org/test/parsing/I18nASTParsingTest.java =================================================================== --- i18nastparsingtest/src/main/java/org/test/parsing/I18nASTParsingTest.java (rev 0) +++ i18nastparsingtest/src/main/java/org/test/parsing/I18nASTParsingTest.java 2011-05-24 13:49:23 UTC (rev 466) @@ -0,0 +1,134 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.test.parsing; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; +import japa.parser.JavaParser; +import japa.parser.ast.CompilationUnit; +import japa.parser.ast.expr.MethodCallExpr; +import japa.parser.ast.visitor.VoidVisitorAdapter; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; + +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; + +/** + * Test. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class I18nASTParsingTest { + + /** + * Ce commentaire est le commentaire du main, il ne doit pas être détecté. + * + * _("commentaire java doc"); + * n_("commentaire java doc"); + * + * @param args + */ + public static void main(String... args) { + + // ca non plus _("ca non plus"); + + I18n.init(new ClassPathI18nInitializer(), null); + + // ca par contre oui + I18n._("ca par contre oui"); + + // ca aussi, multiligne + String mastringtellementlonguequecavapasseralaligne = _( + "ca par contre oui"); + + // voir ca : c'est plus dur + String trans = _("toto" + "tutu"); + + // ca non + n_("ca aussi"); + _(mastringtellementlonguequecavapasseralaligne); + + // parsing + parseMeJavaParser(); + } + + protected static void parseMeJavaParser() { + + String meResource = I18nASTParsingTest.class.getName().replace(".", "/") + + ".java"; + + try { + //InputStream meAsStream = AntrlTest.class.getResourceAsStream("/" + meResource); + File file = new File("src/main/java/" + meResource); + InputStream meAsStream = new FileInputStream(file); + System.out.println("Reading file " + file); + + CompilationUnit cu; + try { + // parse the file + cu = JavaParser.parse(meAsStream); + } finally { + meAsStream.close(); + } + + // visit and print the methods names + new MethodVisitor().visit(cu, null); + + } catch (Exception e) { + e.printStackTrace(); + + // test dans un bloc + _("test dans n bloc"); + } + } + + /** + * Simple visitor implementation for visiting MethodDeclaration nodes. + */ + static class MethodVisitor extends VoidVisitorAdapter { + @Override + public void visit(MethodCallExpr n, Object arg) { + + if (n.getName().matches("[nl]?_")) { + if (!n.getArgs().isEmpty()) { + String firstArgs = n.getArgs().get(0).toString(); + if (firstArgs.matches("^\"[^\"]+\"$")) { + String key = firstArgs.substring(1).substring(0, firstArgs.length() - 2); + System.out.println("Found key : " + key); + } + + } + } + } + } +} Property changes on: i18nastparsingtest/src/main/java/org/test/parsing/I18nASTParsingTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r465 - /
by echatellier＠users.nuiton.org 24 May '11

24 May '11

Author: echatellier Date: 2011-05-24 15:48:14 +0200 (Tue, 24 May 2011) New Revision: 465 Url: http://nuiton.org/repositories/revision/sandbox/465 Log: Initial import. Added: i18nastparsingtest/

1 0

r464 - orion-import-export
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:27:33 +0100 (Wed, 09 Feb 2011) New Revision: 464 Url: http://nuiton.org/repositories/revision/sandbox/464 Log: Update mavenpom4redmine to 2.4.4. Modified: orion-import-export/pom.xml Modified: orion-import-export/pom.xml =================================================================== --- orion-import-export/pom.xml 2011-02-09 08:25:12 UTC (rev 463) +++ orion-import-export/pom.xml 2011-02-09 08:27:33 UTC (rev 464) @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4.1</version> + <version>2.4.4</version> </parent> <groupId>fr.orion</groupId>

1 0

r463 - jpa2-validation/trunk
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:25:12 +0100 (Wed, 09 Feb 2011) New Revision: 463 Url: http://nuiton.org/repositories/revision/sandbox/463 Log: Update mavenpom4redmine to 2.4.4. Modified: jpa2-validation/trunk/pom.xml Modified: jpa2-validation/trunk/pom.xml =================================================================== --- jpa2-validation/trunk/pom.xml 2011-01-14 13:52:22 UTC (rev 462) +++ jpa2-validation/trunk/pom.xml 2011-02-09 08:25:12 UTC (rev 463) @@ -1,6 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.4.1</version> + <version>2.4.4</version> </parent> <groupId>org.nuiton.sandbox</groupId>

1 0

r462 - in jpa2-validation/trunk/jsr303-validation/src: it/hibernate/src/main/java/org/nuiton/sandbox/jsr303/validation/hibernate main/java/org/nuiton/sandbox/jsr303/validation/services test/java/org/nuiton/sandbox/jsr303/validation test/java/org/nuiton/sandbox/jsr303/validation/services
by fdesbois＠users.nuiton.org 14 Jan '11

14 Jan '11

Author: fdesbois Date: 2011-01-14 14:52:22 +0100 (Fri, 14 Jan 2011) New Revision: 462 Url: http://nuiton.org/repositories/revision/sandbox/462 Log: - Add tests for ServiceCustomer - Add test to check Transactional rollbackFor on non runtime Exception (BusinessException) Added: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BusinessException.java jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/services/ jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImplTest.java Modified: jpa2-validation/trunk/jsr303-validation/src/it/hibernate/src/main/java/org/nuiton/sandbox/jsr303/validation/hibernate/TransactionTest.java jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomer.java jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java Modified: jpa2-validation/trunk/jsr303-validation/src/it/hibernate/src/main/java/org/nuiton/sandbox/jsr303/validation/hibernate/TransactionTest.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/it/hibernate/src/main/java/org/nuiton/sandbox/jsr303/validation/hibernate/TransactionTest.java 2011-01-14 11:20:23 UTC (rev 461) +++ jpa2-validation/trunk/jsr303-validation/src/it/hibernate/src/main/java/org/nuiton/sandbox/jsr303/validation/hibernate/TransactionTest.java 2011-01-14 13:52:22 UTC (rev 462) @@ -4,6 +4,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.sandbox.jsr303.validation.services.BusinessException; import org.nuiton.sandbox.jsr303.validation.services.ServiceCustomer; import org.nuiton.sandbox.jsr317.jpa2.entity.Customer; import org.nuiton.sandbox.jsr317.jpa2.persistence.CustomerDAO; @@ -27,10 +28,14 @@ } public void executeAll() { - testSaveAgency(); + try { + testSaveAgency(); + } catch (BusinessException ex) { + throw new RuntimeException(ex); + } } - public void testSaveAgency() { + public void testSaveAgency() throws BusinessException { ServiceCustomer serviceCustomer = context.getBean(ServiceCustomer.class); CustomerDAO customerDAO = context.getBean(CustomerDAO.class); Added: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BusinessException.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BusinessException.java (rev 0) +++ jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BusinessException.java 2011-01-14 13:52:22 UTC (rev 462) @@ -0,0 +1,26 @@ +package org.nuiton.sandbox.jsr303.validation.services; + +/** + * Created on 14/01/11 + * + * @author fdesbois <florian.desbois(a)wiztivi.com> + * @version $Id$ + */ +public class BusinessException extends Exception { + + public BusinessException() { + super(); + } + + public BusinessException(String message) { + super(message); + } + + public BusinessException(String message, Throwable cause) { + super(message, cause); + } + + public BusinessException(Throwable cause) { + super(cause); + } +} Modified: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomer.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomer.java 2011-01-14 11:20:23 UTC (rev 461) +++ jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomer.java 2011-01-14 13:52:22 UTC (rev 462) @@ -12,7 +12,12 @@ */ public interface ServiceCustomer { - void saveCustomer(Customer customer) throws ConstraintViolationException; + void saveCustomer(Customer customer) throws ConstraintViolationException, BusinessException; Customer newCustomer(); + + int countCustomers(); + + void deleteCustomer(Customer customer); + } Modified: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java 2011-01-14 11:20:23 UTC (rev 461) +++ jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java 2011-01-14 13:52:22 UTC (rev 462) @@ -22,17 +22,33 @@ protected CustomerDAO customerDAO; @Override - @Transactional(readOnly = false) - public void saveCustomer(Customer customer) throws ConstraintViolationException { + @Transactional(readOnly = false, rollbackFor = BusinessException.class) + public void saveCustomer(Customer customer) throws ConstraintViolationException, BusinessException { checkConstraints(customer); customerDAO.save(customer); + + if (customer.getFirstName().equals("FAKE")) { + throw new BusinessException(); + } } @Override + @Transactional(readOnly = false) + public void deleteCustomer(Customer customer) { + Customer customerToDelete = customerDAO.read(customer.getId()); + customerDAO.delete(customerToDelete); + } + + @Override public Customer newCustomer() { return customerDAO.newInstance(); } + @Override + public int countCustomers() { + return customerDAO.count(); + } + } Added: jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImplTest.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImplTest.java (rev 0) +++ jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImplTest.java 2011-01-14 13:52:22 UTC (rev 462) @@ -0,0 +1,90 @@ +package org.nuiton.sandbox.jsr303.validation.services; + +import javax.inject.Inject; +import javax.validation.ConstraintViolationException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.sandbox.jsr303.validation.test.BaseValidationTest; +import org.nuiton.sandbox.jsr317.jpa2.entity.Customer; + +/** + * Created on 14/01/11 + * + * @author fdesbois <florian.desbois(a)wiztivi.com> + * @version $Id$ + */ +public class ServiceCustomerImplTest extends BaseValidationTest { + + private static final Log log = LogFactory.getLog(ServiceCustomerImplTest.class); + + @Inject + private ServiceCustomer serviceCustomer; + + @Test + public void testSaveCustomerSuccess() throws Exception { + + // ---- PREPARE DATA ---- // + + Customer customer = serviceCustomer.newCustomer(); + customer.setFirstName("FIRST_NAME"); + customer.setLastName("LAST_NAME"); + + // ---- EXECUTE ---- // + + serviceCustomer.saveCustomer(customer); + + // ---- CHECK DATA ---- // + + Assert.assertEquals(1, serviceCustomer.countCustomers()); + + // ---- CLEAN DATA ---- // + + serviceCustomer.deleteCustomer(customer); + } + + @Test(expected = ConstraintViolationException.class) + public void testSaveCustomerErrorOnConstraint() throws Exception { + + // ---- PREPARE DATA ---- // + + Customer customer = serviceCustomer.newCustomer(); + + // ---- EXECUTE ---- // + + try { + serviceCustomer.saveCustomer(customer); + + } finally { + + // ---- CHECK DATA ---- // + + Assert.assertEquals(0, serviceCustomer.countCustomers()); + } + } + + @Test(expected = BusinessException.class) + public void testSaveCustomerErrorFake() throws Exception { + + // ---- PREPARE DATA ---- // + + Customer customer = serviceCustomer.newCustomer(); + customer.setFirstName("FAKE"); + customer.setLastName("TOTO"); + + // ---- EXECUTE ---- // + + try { + serviceCustomer.saveCustomer(customer); + + } finally { + + // ---- CHECK DATA ---- // + + Assert.assertEquals(0, serviceCustomer.countCustomers()); + } + } + +}

1 0

r461 - in jpa2-validation/trunk: . jsr303-validation jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test jsr317-jpa2 jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test
by fdesbois＠users.nuiton.org 14 Jan '11

14 Jan '11

Author: fdesbois Date: 2011-01-14 12:20:23 +0100 (Fri, 14 Jan 2011) New Revision: 461 Url: http://nuiton.org/repositories/revision/sandbox/461 Log: Use JSR-330 : @Inject instead of @Autowired Modified: jpa2-validation/trunk/jsr303-validation/pom.xml jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java jpa2-validation/trunk/jsr317-jpa2/pom.xml jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java jpa2-validation/trunk/pom.xml Modified: jpa2-validation/trunk/jsr303-validation/pom.xml =================================================================== --- jpa2-validation/trunk/jsr303-validation/pom.xml 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr303-validation/pom.xml 2011-01-14 11:20:23 UTC (rev 461) @@ -62,6 +62,13 @@ <artifactId>validation-api</artifactId> </dependency> +  + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> +  <dependency> <groupId>commons-logging</groupId> Modified: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/BaseService.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,5 +1,6 @@ package org.nuiton.sandbox.jsr303.validation.services; +import javax.inject.Inject; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.Validator; @@ -9,7 +10,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.sandbox.jsr317.jpa2.persistence.ModelContext; -import org.springframework.beans.factory.annotation.Autowired; /** * Created on 28 oct. 2010 @@ -21,10 +21,10 @@ protected final Log logger = LogFactory.getLog(getClass()); - @Autowired + @Inject protected ModelContext modelContext; - @Autowired + @Inject protected Validator validator; protected <T> void checkConstraints(T object, Class<?>... groups) throws ConstraintViolationException { Modified: jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr303-validation/src/main/java/org/nuiton/sandbox/jsr303/validation/services/ServiceCustomerImpl.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,11 +1,11 @@ package org.nuiton.sandbox.jsr303.validation.services; +import javax.inject.Inject; +import javax.inject.Named; import javax.validation.ConstraintViolationException; import org.nuiton.sandbox.jsr317.jpa2.entity.Customer; import org.nuiton.sandbox.jsr317.jpa2.persistence.CustomerDAO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** @@ -14,11 +14,11 @@ * @author fdesbois <florian.desbois(a)wiztivi.com> * @version $Id$ */ -@Service +@Named @Transactional(readOnly = true) public class ServiceCustomerImpl extends BaseService implements ServiceCustomer { - @Autowired + @Inject protected CustomerDAO customerDAO; @Override Modified: jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/CustomerValidationTest.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,5 +1,6 @@ package org.nuiton.sandbox.jsr303.validation; +import javax.inject.Inject; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import java.util.Set; @@ -12,7 +13,6 @@ import org.nuiton.sandbox.jsr303.validation.test.BaseValidationTest; import org.nuiton.sandbox.jsr317.jpa2.entity.Customer; import org.nuiton.sandbox.jsr317.jpa2.persistence.CustomerDAO; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; /** @@ -25,7 +25,7 @@ private static final Log log = LogFactory.getLog(CustomerValidationTest.class); - @Autowired + @Inject protected CustomerDAO userDAO; @Test Modified: jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java =================================================================== --- jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr303-validation/src/test/java/org/nuiton/sandbox/jsr303/validation/test/BaseValidationTest.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,5 +1,11 @@ package org.nuiton.sandbox.jsr303.validation.test; +import javax.inject.Inject; +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import javax.validation.Validator; +import java.lang.annotation.Annotation; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -8,14 +14,8 @@ import org.nuiton.sandbox.jsr317.jpa2.persistence.ModelContext; import org.nuiton.sandbox.jsr317.jpa2.sample.DataProviderLimit; import org.nuiton.sandbox.jsr317.jpa2.test.BaseJpaTest; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; -import java.lang.annotation.Annotation; - /** * Created on 26 oct. 2010 * @@ -27,10 +27,10 @@ private static final Log log = LogFactory.getLog(BaseValidationTest.class); - @Autowired + @Inject protected ModelContext modelContext; - @Autowired + @Inject protected Validator validator; protected class ValidationTestRule extends JpaTestRule { Modified: jpa2-validation/trunk/jsr317-jpa2/pom.xml =================================================================== --- jpa2-validation/trunk/jsr317-jpa2/pom.xml 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr317-jpa2/pom.xml 2011-01-14 11:20:23 UTC (rev 461) @@ -76,6 +76,13 @@ <artifactId>hibernate-core</artifactId> </dependency> +  + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> +  <dependency> <groupId>commons-logging</groupId> Modified: jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java =================================================================== --- jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/CustomerDAOImpl.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,12 +1,13 @@ package org.nuiton.sandbox.jsr317.jpa2.persistence; +import javax.inject.Named; + import org.nuiton.sandbox.jsr317.jpa2.entity.AccessCode; import org.nuiton.sandbox.jsr317.jpa2.entity.AccessCodeImpl; import org.nuiton.sandbox.jsr317.jpa2.entity.Address; import org.nuiton.sandbox.jsr317.jpa2.entity.AddressImpl; import org.nuiton.sandbox.jsr317.jpa2.entity.Customer; import org.nuiton.sandbox.jsr317.jpa2.entity.CustomerImpl; -import org.springframework.stereotype.Repository; /** * Created on 22 oct. 2010 @@ -14,7 +15,7 @@ * @author fdesbois <fdesbois(a)codelutin.com> * @version $Id$ */ -@Repository +@Named public class CustomerDAOImpl extends BaseDAOImpl<Customer, CustomerImpl> implements CustomerDAO { public CustomerDAOImpl() { Modified: jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java =================================================================== --- jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr317-jpa2/src/main/java/org/nuiton/sandbox/jsr317/jpa2/persistence/ModelContextImpl.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,5 +1,7 @@ package org.nuiton.sandbox.jsr317.jpa2.persistence; +import javax.inject.Inject; +import javax.inject.Named; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import java.util.HashMap; @@ -7,9 +9,7 @@ import org.nuiton.sandbox.jsr317.jpa2.entity.BaseEntity; import org.nuiton.sandbox.jsr317.jpa2.persistence.BaseDAOImpl.SaveStrategy; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; /** * Created on 19 nov. 2010 @@ -17,10 +17,10 @@ * @author fdesbois <florian.desbois(a)wiztivi.com> * @version $Id$ */ -@Service +@Named public class ModelContextImpl implements ModelContext { - @Autowired + @Inject protected ApplicationContext context; @PersistenceContext Modified: jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java =================================================================== --- jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/sample/DataSampleProvider.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,5 +1,7 @@ package org.nuiton.sandbox.jsr317.jpa2.sample; +import javax.inject.Inject; +import javax.inject.Named; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; @@ -8,24 +10,23 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.sandbox.jsr317.jpa2.entity.Customer; import org.nuiton.sandbox.jsr317.jpa2.persistence.CustomerDAO; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * Provider of data sample usefull for tests or having usable data in the database. Defined as a {@link Service} to be injected using Spring - * {@link Autowired} annotation. + * {@link Inject} annotation. * <p /> * Created on 3 nov. 2010 * * @author fdesbois <fdesbois(a)codelutin.com> * @version $Id$ */ -@Service +@Named public class DataSampleProvider { private static final Log logger = LogFactory.getLog(DataSampleProvider.class); - @Autowired + @Inject protected CustomerDAO customerDAO; protected List<Customer> customers = new ArrayList<Customer>(); Modified: jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java =================================================================== --- jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/jsr317-jpa2/src/test/java/org/nuiton/sandbox/jsr317/jpa2/test/BaseJpaTest.java 2011-01-14 11:20:23 UTC (rev 461) @@ -1,5 +1,9 @@ package org.nuiton.sandbox.jsr317.jpa2.test; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Rule; @@ -10,14 +14,10 @@ import org.nuiton.sandbox.jsr317.jpa2.sample.DataProviderLimit; import org.nuiton.sandbox.jsr317.jpa2.sample.DataSampleProvider; import org.nuiton.sandbox.jsr317.jpa2.sample.UseDataProvider; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - /** * Created on 18 oct. 2010 * @@ -30,16 +30,16 @@ private static final Log log = LogFactory.getLog(BaseJpaTest.class); - @Autowired + @Inject protected ApplicationContext context; @PersistenceContext protected EntityManager entityManager; - @Autowired + @Inject protected DataSampleProvider dataProvider; - @Autowired + @Inject protected CustomerDAO userDAO; protected class JpaTestRule extends TestWatchman { Modified: jpa2-validation/trunk/pom.xml =================================================================== --- jpa2-validation/trunk/pom.xml 2011-01-12 13:52:52 UTC (rev 460) +++ jpa2-validation/trunk/pom.xml 2011-01-14 11:20:23 UTC (rev 461) @@ -77,7 +77,7 @@ <version>${springVersion}</version> </dependency> -  +  <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> @@ -91,20 +91,20 @@ <scope>provided</scope> </dependency> +  <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - <scope>test</scope> - </dependency> - -  - <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <version>${validationApiVersion}</version> </dependency> +  + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> +  <dependency> <groupId>log4j</groupId> @@ -131,6 +131,13 @@ <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <version>${hibernateValidatorVersion}</version> <scope>test</scope>

1 0

r460 - in testStandaloneRmi: . src/main/java/org/nuiton/sandbox src/main/java/org/nuiton/sandbox/rmi src/test/java/org/nuiton/sandbox src/test/java/org/nuiton/sandbox/business src/test/java/org/nuiton/sandbox/rmi
by athimel＠users.nuiton.org 12 Jan '11

12 Jan '11

Author: athimel Date: 2011-01-12 14:52:52 +0100 (Wed, 12 Jan 2011) New Revision: 460 Url: http://nuiton.org/repositories/revision/sandbox/460 Log: Prepare implementation for another project's integration Added: testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceImpl.java testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceInterface.java Removed: testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceInterface.java Modified: testStandaloneRmi/pom.xml testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutor.java testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutorImpl.java testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java Modified: testStandaloneRmi/pom.xml =================================================================== --- testStandaloneRmi/pom.xml 2011-01-12 09:52:53 UTC (rev 459) +++ testStandaloneRmi/pom.xml 2011-01-12 13:52:52 UTC (rev 460) @@ -8,5 +8,20 @@ <artifactId>sandbox-rmi</artifactId> <version>1.0</version> - + <dependencies> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + </dependency> + + </dependencies> + </project> \ No newline at end of file Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutor.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutor.java 2011-01-12 09:52:53 UTC (rev 459) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutor.java 2011-01-12 13:52:52 UTC (rev 460) @@ -4,10 +4,23 @@ import java.rmi.RemoteException; /** + * This class will act as an InvocationHandler except that it is distributed. + * * @author Arnaud Thimel <thimel(a)codelutin.com> */ public interface RemoteMethodExecutor extends Remote { - public abstract Object execute(String methodName, Class<?>[] parametersType, Object[] args) throws RemoteException; + /** + * Acts like an InvocationHandler. + * + * @param methodName name of the method to invoke + * @param parametersType parameters type to reliably identify the method + * @param args method arguments to process the effective call + * @return the result of the delegate method + * @throws RemoteException for any error. Business exceptions will be + * wrapped. + */ + Object execute(String methodName, Class<?>[] parametersType, Object[] args) + throws RemoteException; } Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutorImpl.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutorImpl.java 2011-01-12 09:52:53 UTC (rev 459) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteMethodExecutorImpl.java 2011-01-12 13:52:52 UTC (rev 460) @@ -1,15 +1,30 @@ package org.nuiton.sandbox.rmi; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.rmi.RemoteException; /** + * RMI implementation of an invocation handler. This object will be exported to + * a RMI registry and will delegate method calls to some business service. The + * service is provided in the constructor. + * * @author Arnaud Thimel <thimel(a)codelutin.com> */ public class RemoteMethodExecutorImpl<T> implements RemoteMethodExecutor { + /** + * The target service on which calls will be made + */ protected T service; + /** + * This is the only available constructor. It is mandatory to specify a + * target service on which call will be + * delegated. + * + * @param service the mandatory service which calls will be delegated on + */ public RemoteMethodExecutorImpl(T service) { if (service == null) { throw new NullPointerException("Service cannot be null"); @@ -18,14 +33,29 @@ } @Override - public Object execute(String methodName, Class<?>[] parametersType, Object[] args) throws RemoteException { + public Object execute( + String methodName, Class<?>[] parametersType, Object[] args) + throws RemoteException { + Object result; try { - Method method = service.getClass().getMethod(methodName, parametersType); + + // Get the method on the target service then invoke it + Method method = service.getClass().getMethod( + methodName, parametersType); result = method.invoke(service, args); - } catch (Exception eee) { - throw new RemoteException("Unable to delegate method call to service", eee); + + } catch (InvocationTargetException ite) { + // This is the normal behaviour if a business exception is thrown + Throwable targetException = ite.getTargetException(); + throw new RemoteException( + "Business exception occurred", targetException); + } catch (NoSuchMethodException nsme) { + throw new RemoteException("Delegate method not found", nsme); + } catch (IllegalAccessException iae) { + throw new RemoteException("Delegate method not accessible", iae); } + return result; } Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java 2011-01-12 09:52:53 UTC (rev 459) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java 2011-01-12 13:52:52 UTC (rev 460) @@ -1,44 +1,108 @@ package org.nuiton.sandbox.rmi; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.rmi.NotBoundException; +import java.rmi.RemoteException; +import java.rmi.ServerException; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; /** + * Factory to create RMI proxies to some given services. + * * @author Arnaud Thimel <thimel(a)codelutin.com> */ public class RemoteProxyFactory { + private final static Log log = LogFactory.getLog(RemoteProxyFactory.class); + + // TODO AThimel 12/01/2011 This settings has to be externalized protected final static int PORT = 12345; + protected final static String REGISTRY_IP = "10.1.1.85"; - protected static <T> T createProxy(final Class<T> serviceInterface) throws Exception { + /** + * Create a RMI proxy on the wanted service interface. The default RMI name + * will be used to find this service in the Registry. + * + * @param serviceInterface The class of the service proxy to create + * @param <T> some interface class + * @return A newly created proxy which interface is <T> + * @throws RemoteException in case the registry is not reachable + * @throws NotBoundException if the default RMI name cannot be found in the + * registry + */ + public static <T> T createProxy(final Class<T> serviceInterface) + throws RemoteException, NotBoundException { + + // The default RMI name will be the FQN of the service interface String rmiName = serviceInterface.getName(); T result = createProxy(rmiName, serviceInterface); + return result; } - protected static <T> T createProxy(String rmiName, final Class<T> serviceInterface) throws Exception { + /** + * Create a RMI proxy on the wanted service interface. The specific given + * RMI name will be used to find this service in the Registry. + * + * @param rmiName The specific RMI name to use to find the service + * in the registry + * @param serviceInterface The class of the service proxy to create + * @param <T> some interface class + * @return A newly created proxy which interface is <T> + * @throws RemoteException in case the registry is not reachable + * @throws NotBoundException if the default RMI name cannot be found in the + * registry + */ + public static <T> T createProxy(String rmiName, Class<T> serviceInterface) + throws RemoteException, NotBoundException { - Registry registry = LocateRegistry.getRegistry("10.1.1.85", PORT); - final RemoteMethodExecutor stub = (RemoteMethodExecutor) registry.lookup(rmiName); + // Lookup the registry and the remote executor from the registry + Registry registry = LocateRegistry.getRegistry(REGISTRY_IP, PORT); + final RemoteMethodExecutor stub = + (RemoteMethodExecutor) registry.lookup(rmiName); InvocationHandler handler = new InvocationHandler() { @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + public Object invoke(Object proxy, Method method, Object[] args) + throws Throwable { + // Get parameters types and values to prepare delegate call String methodName = method.getName(); Class<?>[] parametersType = method.getParameterTypes(); - Object result = stub.execute(methodName, parametersType, args); + // Delegate the execution and manage business exception cases + Object result; + try { + result = stub.execute(methodName, parametersType, args); + } catch (ServerException se) { + if (log.isInfoEnabled()) { + log.info("Server exception: " + se.getMessage()); + } + Throwable cause = se.getCause(); + if (cause instanceof RemoteException) { + RemoteException re = (RemoteException) cause; + cause = re.getCause(); + } + throw cause; + } return result; } }; - T proxy = (T) Proxy.newProxyInstance(ServiceExporter.class.getClassLoader(), new Class<?>[]{serviceInterface}, handler); + + // Invocation handler is ready, now create the proxy + T proxy = (T) Proxy.newProxyInstance( + ServiceExporter.class.getClassLoader(), + new Class<?>[]{serviceInterface}, + handler); + return proxy; } - } Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java 2011-01-12 09:52:53 UTC (rev 459) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java 2011-01-12 13:52:52 UTC (rev 460) @@ -1,5 +1,8 @@ package org.nuiton.sandbox.rmi; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.rmi.ConnectException; import java.rmi.Remote; import java.rmi.RemoteException; @@ -8,42 +11,85 @@ import java.rmi.server.UnicastRemoteObject; /** + * This class allows to make some service available throw RMI. For each service, + * a wrapper will be created which will be put in the RMI registry. This wrapper + * will intercept calls to the service and delegate them to it. + * * @author Arnaud Thimel <thimel(a)codelutin.com> */ public class ServiceExporter { + private final static Log log = LogFactory.getLog(ServiceExporter.class); + + // TODO AThimel 12/01/2011 This settings has to be externalized private static final int PORT = 12345; + /** + * Does some checks on RMI configuration + */ protected void testRmiConfig() { String rmiHost = System.getProperty("java.rmi.server.hostname"); - if (rmiHost == null || "".equals(rmiHost.trim())) { - System.err.println("Warning, server might not have been initialized properly, please specify '-Djava.rmi.server.hostname=<IP-address>'"); + if ((rmiHost == null || "".equals(rmiHost.trim())) + && log.isWarnEnabled()) { + log.warn("Server might not have been initialized properly, " + + "please specify '-Djava.rmi.server.hostname=<IP-address>'"); } } + /** + * Will look for the RMI registry. It an external registry cannot be found, + * a new one will be created. + * + * @return the registry found or created + * @throws RemoteException in case it is not possible to get the registry + */ protected Registry getRegistry() throws RemoteException { Registry result; try { result = LocateRegistry.getRegistry(PORT); - result.list(); // To test that registry has been created. Exception will be thrown is registry cannot be called + // To test that registry has been created. An exception will be + // thrown if registry cannot be called + result.list(); } catch (ConnectException ce) { - System.err.println("Registry not found, creating a new one"); + if (log.isWarnEnabled()) { + log.warn("Registry not found, creating a new one"); + } result = LocateRegistry.createRegistry(PORT); } return result; } - public <E> void registerService(Class<E> serviceInterface, E instance) throws RemoteException { + /** + * Will register a service using the default name. + * + * @param serviceInterface the interface used to bind the service. The RMI + * name will be generated from this class name + * @param instance the service instance to bind + * @param <E> some interface class + * @throws RemoteException in case the registry is not reachable + */ + public <E> void registerService(Class<E> serviceInterface, E instance) + throws RemoteException { String rmiName = serviceInterface.getName(); registerService(rmiName, instance); } - public <E> void registerService(String rmiName, E instance) throws RemoteException { + /** + * Will register a service using the given RMI name. + * + * @param rmiName the RMI name used to bind the service in the registry + * @param instance the service instance to bind + * @param <E> some interface class + * @throws RemoteException in case the registry is not reachable + */ + public <E> void registerService(String rmiName, E instance) + throws RemoteException { testRmiConfig(); // Create the proxy and let him be a stub - RemoteMethodExecutorImpl<E> executor = new RemoteMethodExecutorImpl<E>(instance); + RemoteMethodExecutorImpl<E> executor = + new RemoteMethodExecutorImpl<E>(instance); Remote stub = UnicastRemoteObject.exportObject(executor, 0); // Bind into the registry Copied: testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceImpl.java (from rev 459, testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java) =================================================================== --- testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceImpl.java (rev 0) +++ testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceImpl.java 2011-01-12 13:52:52 UTC (rev 460) @@ -0,0 +1,37 @@ +package org.nuiton.sandbox.business; + +import org.nuiton.wikitty.entities.Wikitty; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class ServiceImpl implements ServiceInterface { + + protected static final int number = (int) (Math.random() * 100); + + @Override + public String testExchange(String whoIsCalling, int intValue) { + System.out.println(String.format("Incoming call from %s with value: (%d). To guess: (%d)", whoIsCalling, intValue, number)); + String result; + if (intValue == number) { + result = String.format("Congrats %s, you found the correct number : '%d' !", whoIsCalling, intValue); + } else if (intValue < number) { + result = String.format("%s, your number is too low : '%d'", whoIsCalling, intValue); + } else { + result = String.format("%s, your number is too high : '%d'", whoIsCalling, intValue); + } + return result; + } + + @Override + public void testException() throws CloneNotSupportedException { + throw new CloneNotSupportedException(); + } + + @Override + public Wikitty testComplexObject(Wikitty in) throws CloneNotSupportedException { + Wikitty out = in.clone(); + return out; + } + +} Deleted: testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceInterface.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceInterface.java 2011-01-11 10:52:23 UTC (rev 455) +++ testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceInterface.java 2011-01-12 13:52:52 UTC (rev 460) @@ -1,7 +0,0 @@ -package org.nuiton.sandbox.business; - -public interface ServiceInterface { - - public abstract String testExchange(Integer intValue); - -} Copied: testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceInterface.java (from rev 457, testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceInterface.java) =================================================================== --- testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceInterface.java (rev 0) +++ testStandaloneRmi/src/test/java/org/nuiton/sandbox/business/ServiceInterface.java 2011-01-12 13:52:52 UTC (rev 460) @@ -0,0 +1,16 @@ +package org.nuiton.sandbox.business; + +import org.nuiton.wikitty.entities.Wikitty; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public interface ServiceInterface { + + String testExchange(String whoIsCalling, int intValue); + + void testException() throws CloneNotSupportedException; + + Wikitty testComplexObject(Wikitty in) throws CloneNotSupportedException; + +} Modified: testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java =================================================================== --- testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java 2011-01-12 09:52:53 UTC (rev 459) +++ testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java 2011-01-12 13:52:52 UTC (rev 460) @@ -1,6 +1,8 @@ package org.nuiton.sandbox.rmi; import org.nuiton.sandbox.business.ServiceInterface; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -20,6 +22,18 @@ ServiceInterface service = RemoteProxyFactory.createProxy(ServiceInterface.class); String result = service.testExchange(System.getProperty("user.name"), 50); System.out.println(result); + + try { + service.testException(); + } catch (CloneNotSupportedException cnse) { + System.err.println("Ok!"); + } + + Wikitty in = new WikittyImpl(); + in.setFqField("toto.titi", 999L); + Wikitty out = service.testComplexObject(in); + assert out.equals(in); + } }

1 0

r459 - in testStandaloneRmi/src/main/java/org/nuiton/sandbox: business rmi
by athimel＠users.nuiton.org 12 Jan '11

12 Jan '11

Author: athimel Date: 2011-01-12 10:52:53 +0100 (Wed, 12 Jan 2011) New Revision: 459 Url: http://nuiton.org/repositories/revision/sandbox/459 Log: Format code / organize imports Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java 2011-01-12 09:38:21 UTC (rev 458) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java 2011-01-12 09:52:53 UTC (rev 459) @@ -5,7 +5,7 @@ */ public class ServiceImpl implements ServiceInterface { - protected static final int number = (int)(Math.random() * 100); + protected static final int number = (int) (Math.random() * 100); @Override public String testExchange(String whoIsCalling, Integer intValue) { Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java 2011-01-12 09:38:21 UTC (rev 458) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java 2011-01-12 09:52:53 UTC (rev 459) @@ -3,7 +3,6 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.rmi.Remote; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; @@ -23,7 +22,7 @@ protected static <T> T createProxy(String rmiName, final Class<T> serviceInterface) throws Exception { Registry registry = LocateRegistry.getRegistry("10.1.1.85", PORT); - final RemoteMethodExecutor stub = (RemoteMethodExecutor)registry.lookup(rmiName); + final RemoteMethodExecutor stub = (RemoteMethodExecutor) registry.lookup(rmiName); InvocationHandler handler = new InvocationHandler() { @Override Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java 2011-01-12 09:38:21 UTC (rev 458) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java 2011-01-12 09:52:53 UTC (rev 459) @@ -1,12 +1,5 @@ package org.nuiton.sandbox.rmi; -import org.nuiton.sandbox.business.ServiceImpl; -import org.nuiton.sandbox.business.ServiceInterface; -import sun.security.jca.ServiceId; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.rmi.ConnectException; import java.rmi.Remote; import java.rmi.RemoteException;

1 0

r458 - in testStandaloneRmi/src: main/java/org/nuiton/sandbox/business main/java/org/nuiton/sandbox/rmi test/java/org/nuiton/sandbox/rmi
by athimel＠users.nuiton.org 12 Jan '11

12 Jan '11

Author: athimel Date: 2011-01-12 10:38:21 +0100 (Wed, 12 Jan 2011) New Revision: 458 Url: http://nuiton.org/repositories/revision/sandbox/458 Log: Implement a client side proxy Added: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ServiceExporterMain.java Removed: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIImpl.java testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIInterface.java testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/Client.java Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java 2011-01-12 09:12:32 UTC (rev 457) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/business/ServiceImpl.java 2011-01-12 09:38:21 UTC (rev 458) @@ -5,10 +5,19 @@ */ public class ServiceImpl implements ServiceInterface { + protected static final int number = (int)(Math.random() * 100); + @Override public String testExchange(String whoIsCalling, Integer intValue) { - System.out.println(String.format("Incoming call from %s with value: (%d) - Here I'm (%s)", whoIsCalling, intValue, System.getProperty("java.rmi.server.hostname"))); - String result = String.format("Hey %s, what is this fucking number '%d' ?", whoIsCalling, intValue); + System.out.println(String.format("Incoming call from %s with value: (%d). To guess: (%d)", whoIsCalling, intValue, number)); + String result; + if (intValue == number) { + result = String.format("Congrats %s, you found the correct number : '%d' !", whoIsCalling, intValue); + } else if (intValue < number) { + result = String.format("%s, your number is too low : '%d'", whoIsCalling, intValue); + } else { + result = String.format("%s, your number is too high : '%d'", whoIsCalling, intValue); + } return result; } Added: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java (rev 0) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/RemoteProxyFactory.java 2011-01-12 09:38:21 UTC (rev 458) @@ -0,0 +1,45 @@ +package org.nuiton.sandbox.rmi; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.rmi.Remote; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class RemoteProxyFactory { + + protected final static int PORT = 12345; + + protected static <T> T createProxy(final Class<T> serviceInterface) throws Exception { + String rmiName = serviceInterface.getName(); + T result = createProxy(rmiName, serviceInterface); + return result; + } + + protected static <T> T createProxy(String rmiName, final Class<T> serviceInterface) throws Exception { + + Registry registry = LocateRegistry.getRegistry("10.1.1.85", PORT); + final RemoteMethodExecutor stub = (RemoteMethodExecutor)registry.lookup(rmiName); + + InvocationHandler handler = new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + + String methodName = method.getName(); + Class<?>[] parametersType = method.getParameterTypes(); + + Object result = stub.execute(methodName, parametersType, args); + + return result; + } + }; + T proxy = (T) Proxy.newProxyInstance(ServiceExporter.class.getClassLoader(), new Class<?>[]{serviceInterface}, handler); + return proxy; + } + + +} Modified: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java 2011-01-12 09:12:32 UTC (rev 457) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceExporter.java 2011-01-12 09:38:21 UTC (rev 458) @@ -40,8 +40,13 @@ return result; } - public <E> void registerService(E instance, String name) throws RemoteException { + public <E> void registerService(Class<E> serviceInterface, E instance) throws RemoteException { + String rmiName = serviceInterface.getName(); + registerService(rmiName, instance); + } + public <E> void registerService(String rmiName, E instance) throws RemoteException { + testRmiConfig(); // Create the proxy and let him be a stub @@ -50,12 +55,7 @@ // Bind into the registry Registry registry = getRegistry(); - registry.rebind(name, stub); + registry.rebind(rmiName, stub); } - public static void main(String[] args) throws Exception { - new ServiceExporter().registerService(new ServiceImpl(), "toto"); - System.err.println("Service2 ready"); - } - } Deleted: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIImpl.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIImpl.java 2011-01-12 09:12:32 UTC (rev 457) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIImpl.java 2011-01-12 09:38:21 UTC (rev 458) @@ -1,58 +0,0 @@ -package org.nuiton.sandbox.rmi; - -import java.rmi.ConnectException; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.UnicastRemoteObject; - -/** - * @author Arnaud Thimel <thimel(a)codelutin.com> - */ -public class ServiceRMIImpl implements ServiceRMIInterface { - - private static final int PORT = 12345; - - public ServiceRMIImpl() { - } - - public static void main(String[] args) throws Exception { - - testRmiConfig(); - - ServiceRMIImpl impl = new ServiceRMIImpl(); - Remote stub = UnicastRemoteObject.exportObject(impl, 0); - - Registry registry = getRegistry(); - registry.bind("MyService", stub); - - System.err.println("Service ready"); - } - - protected static void testRmiConfig() { - String rmiHost = System.getProperty("java.rmi.server.hostname"); - if (rmiHost == null || "".equals(rmiHost.trim())) { - System.err.println("Warning, server might not have been initialized properly, please specify '-Djava.rmi.server.hostname=<IP-address>'"); - } - } - - protected static Registry getRegistry() throws RemoteException { - Registry result; - try { - result = LocateRegistry.getRegistry(PORT); - result.list(); // To test that registry has been created. Exception will be thrown is registry cannot be called - } catch (ConnectException ce) { - System.err.println("Registry not found, creating a new one"); - result = LocateRegistry.createRegistry(PORT); - } - return result; - } - - @Override - public String testExchange(String whoIsCalling, Integer intValue) throws RemoteException { - System.out.println(String.format("Incoming call from %s with value: (%d) - Here I'm (%s)", whoIsCalling, intValue, System.getProperty("java.rmi.server.hostname"))); - return String.format("Hey %s, what is this fucking number '%d' ?", whoIsCalling, intValue); - } - -} Deleted: testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIInterface.java =================================================================== --- testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIInterface.java 2011-01-12 09:12:32 UTC (rev 457) +++ testStandaloneRmi/src/main/java/org/nuiton/sandbox/rmi/ServiceRMIInterface.java 2011-01-12 09:38:21 UTC (rev 458) @@ -1,15 +0,0 @@ -package org.nuiton.sandbox.rmi; - -import org.nuiton.sandbox.business.ServiceInterface; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author Arnaud Thimel <thimel(a)codelutin.com> - */ -public interface ServiceRMIInterface extends Remote { - - public abstract String testExchange(String whoIsCalling, Integer intValue) throws RemoteException; - -} Deleted: testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/Client.java =================================================================== --- testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/Client.java 2011-01-12 09:12:32 UTC (rev 457) +++ testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/Client.java 2011-01-12 09:38:21 UTC (rev 458) @@ -1,19 +0,0 @@ -package org.nuiton.sandbox.rmi; - -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; - -/** - * @author Arnaud Thimel <thimel(a)codelutin.com> - */ -public class Client { - - private static final int PORT = 12345; - public static void main(String[] args) throws Exception { - Registry registry = LocateRegistry.getRegistry("10.1.1.85", PORT); - ServiceRMIInterface stub = (ServiceRMIInterface) registry.lookup("MyService"); - String response = stub.testExchange(System.getProperty("user.name"), 123); - System.out.println("response: " + response); - } - -} Modified: testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java =================================================================== --- testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java 2011-01-12 09:12:32 UTC (rev 457) +++ testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ClientExporter.java 2011-01-12 09:38:21 UTC (rev 458) @@ -16,12 +16,9 @@ */ public class ClientExporter { - private static final int PORT = 12345; public static void main(String[] args) throws Throwable { - Registry registry = LocateRegistry.getRegistry("10.1.1.85", PORT); - RemoteMethodExecutor stub = (RemoteMethodExecutor)registry.lookup("toto"); - - Object result = stub.execute("testExchange", new Class<?>[]{String.class, Integer.class}, new Object[] {System.getProperty("user.name"), 123}); + ServiceInterface service = RemoteProxyFactory.createProxy(ServiceInterface.class); + String result = service.testExchange(System.getProperty("user.name"), 50); System.out.println(result); } Added: testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ServiceExporterMain.java =================================================================== --- testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ServiceExporterMain.java (rev 0) +++ testStandaloneRmi/src/test/java/org/nuiton/sandbox/rmi/ServiceExporterMain.java 2011-01-12 09:38:21 UTC (rev 458) @@ -0,0 +1,16 @@ +package org.nuiton.sandbox.rmi; + +import org.nuiton.sandbox.business.ServiceImpl; +import org.nuiton.sandbox.business.ServiceInterface; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class ServiceExporterMain { + + public static void main(String[] args) throws Exception { + new ServiceExporter().registerService(ServiceInterface.class, new ServiceImpl()); + System.err.println("Service is ready, waiting for incoming calls"); + } + +}

1 0