Commit cc68b35deaa8916e64f13b2dec433ff0db74e174
1 parent
dc5a1f68
Exists in
master
Ajuste no nome dos projetos
Showing
32 changed files
with
97 additions
and
127 deletions
Show diff stats
archetype/jsf-jpa/pom.xml
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 | <relativePath>../../parent/archetype</relativePath> |
50 | 50 | </parent> |
51 | 51 | |
52 | - <name>JSF and JPA Archetype</name> | |
52 | + <name>Demoiselle Framework JSF and JPA Archetype</name> | |
53 | 53 | <description> |
54 | 54 | Archetype for web applications (JSF/JPA) |
55 | 55 | </description> | ... | ... |
archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml
... | ... | @@ -50,16 +50,4 @@ |
50 | 50 | <scope>test</scope> |
51 | 51 | </dependency> |
52 | 52 | </dependencies> |
53 | - | |
54 | - <repositories> | |
55 | - <repository> | |
56 | - <id>demoiselle.sourceforge.net-release</id> | |
57 | - <url>http://demoiselle.sourceforge.net/repository/release</url> | |
58 | - </repository> | |
59 | - <repository> | |
60 | - <id>snapshot.sourceforge.net-release</id> | |
61 | - <url>http://demoiselle.sourceforge.net/repository/snapshot</url> | |
62 | - </repository> | |
63 | - </repositories> | |
64 | - | |
65 | -</project> | |
66 | 53 | \ No newline at end of file |
54 | +</project> | ... | ... |
archetype/minimal/pom.xml
documentation/quickstart/pom.xml
documentation/reference/pom.xml
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java
... | ... | @@ -71,21 +71,21 @@ public class ConfigurationLoaderTest { |
71 | 71 | private ConfigurationLoader configurationLoader; |
72 | 72 | |
73 | 73 | private CoreBootstrap coreBootstrap; |
74 | - | |
74 | + | |
75 | 75 | @Configuration |
76 | 76 | public class ConfigurationSuccessfulPropertiesWithClassField { |
77 | 77 | |
78 | - protected Class classe; | |
78 | + protected Class<?> classe; | |
79 | 79 | |
80 | 80 | } |
81 | - | |
81 | + | |
82 | 82 | @Configuration |
83 | 83 | public class ConfigurationSuccessfulPropertiesWithPropertiesField { |
84 | 84 | |
85 | 85 | protected Properties properties; |
86 | 86 | |
87 | 87 | } |
88 | - | |
88 | + | |
89 | 89 | @Configuration |
90 | 90 | public class ConfigurationSuccessfulProperties { |
91 | 91 | |
... | ... | @@ -300,7 +300,7 @@ public class ConfigurationLoaderTest { |
300 | 300 | this.configurationLoader = new ConfigurationLoader(); |
301 | 301 | mockStatic(Beans.class); |
302 | 302 | this.coreBootstrap = PowerMock.createMock(CoreBootstrap.class); |
303 | - | |
303 | + | |
304 | 304 | expect(Beans.getReference(CoreBootstrap.class)).andReturn(coreBootstrap); |
305 | 305 | expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()); |
306 | 306 | } |
... | ... | @@ -313,28 +313,28 @@ public class ConfigurationLoaderTest { |
313 | 313 | public void testConfigurationSuccessfulPropertiesWithClassField() { |
314 | 314 | ConfigurationSuccessfulPropertiesWithClassField config = new ConfigurationSuccessfulPropertiesWithClassField(); |
315 | 315 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
316 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
316 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
317 | 317 | configurationLoader.load(config); |
318 | - assertEquals(ConfigurationLoaderTest.class,config.classe); | |
318 | + assertEquals(ConfigurationLoaderTest.class, config.classe); | |
319 | 319 | } |
320 | - | |
320 | + | |
321 | 321 | @Test |
322 | 322 | public void testConfigurationSuccessfulPropertiesWithPropertiesField() { |
323 | 323 | ConfigurationSuccessfulPropertiesWithPropertiesField config = new ConfigurationSuccessfulPropertiesWithPropertiesField(); |
324 | 324 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
325 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
325 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
326 | 326 | configurationLoader.load(config); |
327 | - assertEquals("teste1",config.properties.getProperty("1")); | |
328 | - assertEquals("teste2",config.properties.getProperty("2")); | |
327 | + assertEquals("teste1", config.properties.getProperty("1")); | |
328 | + assertEquals("teste2", config.properties.getProperty("2")); | |
329 | 329 | assertTrue(config.properties.containsKey("1")); |
330 | 330 | assertTrue(config.properties.containsKey("2")); |
331 | 331 | } |
332 | - | |
332 | + | |
333 | 333 | @Test |
334 | 334 | public void testConfigurationSuccessfulPropertiesPossibleConventions() { |
335 | 335 | ConfigurationSuccessfulProperties config = new ConfigurationSuccessfulProperties(); |
336 | 336 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
337 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
337 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
338 | 338 | configurationLoader.load(config); |
339 | 339 | assertEquals("ConfigurationTest", config.nameConfiguration); |
340 | 340 | |
... | ... | @@ -344,31 +344,31 @@ public class ConfigurationLoaderTest { |
344 | 344 | public void testConfigurationSuccessfulPropertiesNoConventions() { |
345 | 345 | ConfigurationSuccessfulProperties2 config = new ConfigurationSuccessfulProperties2(); |
346 | 346 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
347 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
347 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
348 | 348 | configurationLoader.load(config); |
349 | 349 | assertEquals("ConfigurationTest2", config.name); |
350 | 350 | } |
351 | 351 | |
352 | -// @Test | |
353 | -// public void ConfigurationPropertiesWithAbsentFile() { | |
354 | -// ConfigurationPropertiesWithAbsentFile config = new ConfigurationPropertiesWithAbsentFile(); | |
355 | -// | |
356 | -// expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); | |
357 | -// PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
358 | -// | |
359 | -// try { | |
360 | -// configurationLoader.load(config); | |
361 | -// fail(); | |
362 | -// } catch (Exception e) { | |
363 | -// } | |
364 | -// } | |
352 | + // @Test | |
353 | + // public void ConfigurationPropertiesWithAbsentFile() { | |
354 | + // ConfigurationPropertiesWithAbsentFile config = new ConfigurationPropertiesWithAbsentFile(); | |
355 | + // | |
356 | + // expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); | |
357 | + // PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
358 | + // | |
359 | + // try { | |
360 | + // configurationLoader.load(config); | |
361 | + // fail(); | |
362 | + // } catch (Exception e) { | |
363 | + // } | |
364 | + // } | |
365 | 365 | |
366 | 366 | @Test |
367 | 367 | public void testConfigurationProcessorWithNameEmpty() { |
368 | 368 | ConfigurationWithEmptyName config = new ConfigurationWithEmptyName(); |
369 | 369 | |
370 | 370 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
371 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
371 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
372 | 372 | |
373 | 373 | try { |
374 | 374 | configurationLoader.load(config); |
... | ... | @@ -382,7 +382,7 @@ public class ConfigurationLoaderTest { |
382 | 382 | ConfigurationWithoutNameAnnotation config = new ConfigurationWithoutNameAnnotation(); |
383 | 383 | |
384 | 384 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
385 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
385 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
386 | 386 | |
387 | 387 | configurationLoader.load(config); |
388 | 388 | assertEquals("ConfigurationTest", config.nameConfiguration); |
... | ... | @@ -393,8 +393,8 @@ public class ConfigurationLoaderTest { |
393 | 393 | ConfigurationWithIgnoreAnnotation config = new ConfigurationWithIgnoreAnnotation(); |
394 | 394 | |
395 | 395 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
396 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
397 | - | |
396 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
397 | + | |
398 | 398 | configurationLoader.load(config); |
399 | 399 | assertNull(config.nameConfiguration); |
400 | 400 | } |
... | ... | @@ -404,7 +404,7 @@ public class ConfigurationLoaderTest { |
404 | 404 | ConfigurationWithPrefix config = new ConfigurationWithPrefix(); |
405 | 405 | |
406 | 406 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
407 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
407 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
408 | 408 | |
409 | 409 | configurationLoader.load(config); |
410 | 410 | assertEquals("ConfigurationTest", config.nameConfiguration); |
... | ... | @@ -415,8 +415,8 @@ public class ConfigurationLoaderTest { |
415 | 415 | ConfigurationWithKeyNotFoundInProperties config = new ConfigurationWithKeyNotFoundInProperties(); |
416 | 416 | |
417 | 417 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
418 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
419 | - | |
418 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
419 | + | |
420 | 420 | configurationLoader.load(config); |
421 | 421 | assertNull(config.notExistKey); |
422 | 422 | } |
... | ... | @@ -426,7 +426,7 @@ public class ConfigurationLoaderTest { |
426 | 426 | ConfigurationWithNotNullFieldButValueIsNull config = new ConfigurationWithNotNullFieldButValueIsNull(); |
427 | 427 | |
428 | 428 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
429 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
429 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
430 | 430 | |
431 | 431 | try { |
432 | 432 | configurationLoader.load(config); |
... | ... | @@ -441,7 +441,7 @@ public class ConfigurationLoaderTest { |
441 | 441 | ConfigurationWithNotNullFieldAndValueIsNotNull config = new ConfigurationWithNotNullFieldAndValueIsNotNull(); |
442 | 442 | |
443 | 443 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
444 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
444 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
445 | 445 | |
446 | 446 | configurationLoader.load(config); |
447 | 447 | assertEquals("ConfigurationTest", config.nameConfiguration); |
... | ... | @@ -452,8 +452,8 @@ public class ConfigurationLoaderTest { |
452 | 452 | ConfigurationWithNonPrimitiveFieldValueNull config = new ConfigurationWithNonPrimitiveFieldValueNull(); |
453 | 453 | |
454 | 454 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
455 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
456 | - | |
455 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
456 | + | |
457 | 457 | configurationLoader.load(config); |
458 | 458 | assertNull(config.nameConfiguration); |
459 | 459 | } |
... | ... | @@ -463,8 +463,8 @@ public class ConfigurationLoaderTest { |
463 | 463 | ConfigurationWithPrimitiveFieldValueNull config = new ConfigurationWithPrimitiveFieldValueNull(); |
464 | 464 | |
465 | 465 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
466 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
467 | - | |
466 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
467 | + | |
468 | 468 | configurationLoader.load(config); |
469 | 469 | assertEquals(1, config.nameConfiguration); |
470 | 470 | } |
... | ... | @@ -474,7 +474,7 @@ public class ConfigurationLoaderTest { |
474 | 474 | ConfigurationWithKeyFromSystem config = new ConfigurationWithKeyFromSystem(); |
475 | 475 | |
476 | 476 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
477 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
477 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
478 | 478 | |
479 | 479 | configurationLoader.load(config); |
480 | 480 | assertEquals(System.getProperty("os.name"), config.nameConfiguration); |
... | ... | @@ -485,7 +485,7 @@ public class ConfigurationLoaderTest { |
485 | 485 | ConfigurationWithKeyFromXML config = new ConfigurationWithKeyFromXML(); |
486 | 486 | |
487 | 487 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
488 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
488 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
489 | 489 | |
490 | 490 | configurationLoader.load(config); |
491 | 491 | assertEquals("ConfigurationTest", config.nameConfiguration); |
... | ... | @@ -496,7 +496,7 @@ public class ConfigurationLoaderTest { |
496 | 496 | ConfigurationPropertiesWithTwoAmbiguousKey config = new ConfigurationPropertiesWithTwoAmbiguousKey(); |
497 | 497 | |
498 | 498 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
499 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
499 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
500 | 500 | |
501 | 501 | try { |
502 | 502 | configurationLoader.load(config); |
... | ... | @@ -512,7 +512,7 @@ public class ConfigurationLoaderTest { |
512 | 512 | ConfigurationPropertiesWithThreeAmbiguousKey config = new ConfigurationPropertiesWithThreeAmbiguousKey(); |
513 | 513 | |
514 | 514 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
515 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
515 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
516 | 516 | |
517 | 517 | try { |
518 | 518 | configurationLoader.load(config); |
... | ... | @@ -528,7 +528,7 @@ public class ConfigurationLoaderTest { |
528 | 528 | ConfigurationPropertiesWithFourAmbiguousKey config = new ConfigurationPropertiesWithFourAmbiguousKey(); |
529 | 529 | |
530 | 530 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
531 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
531 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
532 | 532 | |
533 | 533 | try { |
534 | 534 | configurationLoader.load(config); |
... | ... | @@ -544,7 +544,7 @@ public class ConfigurationLoaderTest { |
544 | 544 | ConfigurationPropertiesSuccessWithPrefixNonAmbiguous config = new ConfigurationPropertiesSuccessWithPrefixNonAmbiguous(); |
545 | 545 | |
546 | 546 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
547 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
547 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
548 | 548 | |
549 | 549 | configurationLoader.load(config); |
550 | 550 | assertEquals("Success", config.success); |
... | ... | @@ -555,7 +555,7 @@ public class ConfigurationLoaderTest { |
555 | 555 | ConfigurationWithConventionUnderline config = new ConfigurationWithConventionUnderline(); |
556 | 556 | |
557 | 557 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
558 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
558 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
559 | 559 | |
560 | 560 | configurationLoader.load(config); |
561 | 561 | assertEquals("Convention Underline", config.conventionUnderline); |
... | ... | @@ -566,7 +566,7 @@ public class ConfigurationLoaderTest { |
566 | 566 | ConfigurationWithConventionDot config = new ConfigurationWithConventionDot(); |
567 | 567 | |
568 | 568 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
569 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
569 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
570 | 570 | |
571 | 571 | configurationLoader.load(config); |
572 | 572 | assertEquals("Convention Dot", config.conventionDot); |
... | ... | @@ -577,7 +577,7 @@ public class ConfigurationLoaderTest { |
577 | 577 | ConfigurationWithConventionAllLowerCase config = new ConfigurationWithConventionAllLowerCase(); |
578 | 578 | |
579 | 579 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
580 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
580 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
581 | 581 | |
582 | 582 | configurationLoader.load(config); |
583 | 583 | assertEquals("All LowerCase", config.conventionAllLowerCase); |
... | ... | @@ -588,7 +588,7 @@ public class ConfigurationLoaderTest { |
588 | 588 | ConfigurationWithConventionAllUpperCase config = new ConfigurationWithConventionAllUpperCase(); |
589 | 589 | |
590 | 590 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
591 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
591 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
592 | 592 | |
593 | 593 | configurationLoader.load(config); |
594 | 594 | assertEquals("ALL UPPERCASE", config.conventionAllUpperCase); |
... | ... | @@ -599,8 +599,8 @@ public class ConfigurationLoaderTest { |
599 | 599 | ConfigurationPropertiesErrorWithComplexObject config = new ConfigurationPropertiesErrorWithComplexObject(); |
600 | 600 | |
601 | 601 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
602 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
603 | - | |
602 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
603 | + | |
604 | 604 | try { |
605 | 605 | configurationLoader.load(config); |
606 | 606 | fail(); |
... | ... | @@ -613,8 +613,8 @@ public class ConfigurationLoaderTest { |
613 | 613 | ConfigurationFromXMLWithPrefix config = new ConfigurationFromXMLWithPrefix(); |
614 | 614 | |
615 | 615 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
616 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
617 | - | |
616 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
617 | + | |
618 | 618 | configurationLoader.load(config); |
619 | 619 | assertEquals("ConfigurationTest", config.nameConfiguration); |
620 | 620 | } |
... | ... | @@ -624,8 +624,8 @@ public class ConfigurationLoaderTest { |
624 | 624 | ConfigurationXMLWithConventionDot config = new ConfigurationXMLWithConventionDot(); |
625 | 625 | |
626 | 626 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
627 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
628 | - | |
627 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
628 | + | |
629 | 629 | configurationLoader.load(config); |
630 | 630 | assertEquals("convention.dot", config.conventionDot); |
631 | 631 | } |
... | ... | @@ -635,8 +635,8 @@ public class ConfigurationLoaderTest { |
635 | 635 | ConfigurationXMLWithConventionUnderline config = new ConfigurationXMLWithConventionUnderline(); |
636 | 636 | |
637 | 637 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
638 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
639 | - | |
638 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
639 | + | |
640 | 640 | configurationLoader.load(config); |
641 | 641 | assertEquals("Convention_Underline", config.conventionUnderline); |
642 | 642 | } |
... | ... | @@ -646,8 +646,8 @@ public class ConfigurationLoaderTest { |
646 | 646 | ConfigurationXMLWithConventionAllUpperCase config = new ConfigurationXMLWithConventionAllUpperCase(); |
647 | 647 | |
648 | 648 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
649 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
650 | - | |
649 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
650 | + | |
651 | 651 | configurationLoader.load(config); |
652 | 652 | assertEquals("ALL UPPERCASE", config.conventionAllUpperCase); |
653 | 653 | } |
... | ... | @@ -657,10 +657,10 @@ public class ConfigurationLoaderTest { |
657 | 657 | ConfigurationXMLWithConventionAllLowerCase config = new ConfigurationXMLWithConventionAllLowerCase(); |
658 | 658 | |
659 | 659 | expect(coreBootstrap.isAnnotatedType(config.getClass())).andReturn(true); |
660 | - PowerMock.replayAll(CoreBootstrap.class,Beans.class); | |
661 | - | |
660 | + PowerMock.replayAll(CoreBootstrap.class, Beans.class); | |
661 | + | |
662 | 662 | configurationLoader.load(config); |
663 | 663 | assertEquals("All LowerCase", config.conventionAllLowerCase); |
664 | 664 | } |
665 | 665 | |
666 | -} | |
667 | 666 | \ No newline at end of file |
667 | +} | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextStoreTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ContextsTest.java
... | ... | @@ -39,12 +39,11 @@ package br.gov.frameworkdemoiselle.internal.context; |
39 | 39 | import static org.easymock.EasyMock.createMock; |
40 | 40 | import static org.easymock.EasyMock.expect; |
41 | 41 | import static org.easymock.EasyMock.expectLastCall; |
42 | -//import static org.easymock.EasyMock.replay; | |
43 | -import static org.powermock.api.easymock.PowerMock.mockStatic; | |
44 | -import static org.powermock.api.easymock.PowerMock.replay; | |
45 | 42 | import static org.junit.Assert.assertEquals; |
46 | 43 | import static org.junit.Assert.assertFalse; |
47 | 44 | import static org.junit.Assert.assertTrue; |
45 | +import static org.powermock.api.easymock.PowerMock.mockStatic; | |
46 | +import static org.powermock.api.easymock.PowerMock.replay; | |
48 | 47 | |
49 | 48 | import java.util.ArrayList; |
50 | 49 | import java.util.List; | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/context/ThreadLocalContextTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizerTest.java
1 | 1 | package br.gov.frameworkdemoiselle.internal.implementation; |
2 | 2 | |
3 | 3 | import static org.easymock.EasyMock.expect; |
4 | -import static org.junit.Assert.assertTrue; | |
5 | 4 | import static org.powermock.api.easymock.PowerMock.mockStatic; |
6 | 5 | import static org.powermock.api.easymock.PowerMock.replay; |
7 | 6 | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransactionTest.java
... | ... | @@ -37,7 +37,6 @@ |
37 | 37 | package br.gov.frameworkdemoiselle.internal.implementation; |
38 | 38 | |
39 | 39 | import static org.easymock.EasyMock.expect; |
40 | -import static org.junit.Assert.assertTrue; | |
41 | 40 | import static org.powermock.api.easymock.PowerMock.mockStatic; |
42 | 41 | import static org.powermock.api.easymock.PowerMock.replay; |
43 | 42 | |
... | ... | @@ -52,7 +51,6 @@ import org.powermock.modules.junit4.PowerMockRunner; |
52 | 51 | |
53 | 52 | import br.gov.frameworkdemoiselle.DemoiselleException; |
54 | 53 | import br.gov.frameworkdemoiselle.util.Beans; |
55 | -import br.gov.frameworkdemoiselle.util.ResourceBundle; | |
56 | 54 | |
57 | 55 | /** |
58 | 56 | * @author SERPRO | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationContextImplTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/PaginationImplTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptorTest.java
... | ... | @@ -64,7 +64,6 @@ import br.gov.frameworkdemoiselle.DemoiselleException; |
64 | 64 | import br.gov.frameworkdemoiselle.exception.ExceptionHandler; |
65 | 65 | import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap; |
66 | 66 | import br.gov.frameworkdemoiselle.util.Beans; |
67 | -import br.gov.frameworkdemoiselle.util.ResourceBundle; | |
68 | 67 | |
69 | 68 | @RunWith(PowerMockRunner.class) |
70 | 69 | @PrepareForTest(Beans.class) | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java
... | ... | @@ -35,7 +35,6 @@ |
35 | 35 | * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. |
36 | 36 | */ |
37 | 37 | package br.gov.frameworkdemoiselle.internal.interceptor; |
38 | -import org.junit.Ignore; | |
39 | 38 | import static org.easymock.EasyMock.expect; |
40 | 39 | import static org.easymock.EasyMock.replay; |
41 | 40 | import static org.easymock.EasyMock.verify; |
... | ... | @@ -46,6 +45,7 @@ import static org.junit.Assert.fail; |
46 | 45 | import javax.interceptor.InvocationContext; |
47 | 46 | |
48 | 47 | import org.easymock.EasyMock; |
48 | +import org.junit.Ignore; | |
49 | 49 | import org.junit.Test; |
50 | 50 | |
51 | 51 | import br.gov.frameworkdemoiselle.DemoiselleException; | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/LoggerProducerTest.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ResourceBundleProducerTest.java
... | ... | @@ -37,7 +37,6 @@ |
37 | 37 | package br.gov.frameworkdemoiselle.internal.producer; |
38 | 38 | |
39 | 39 | import static org.easymock.EasyMock.expect; |
40 | -import static org.junit.Assert.assertTrue; | |
41 | 40 | import static org.powermock.api.easymock.PowerMock.mockStatic; |
42 | 41 | import static org.powermock.api.easymock.PowerMock.replay; |
43 | 42 | |
... | ... | @@ -57,7 +56,6 @@ import org.junit.runner.RunWith; |
57 | 56 | import org.powermock.core.classloader.annotations.PrepareForTest; |
58 | 57 | import org.powermock.modules.junit4.PowerMockRunner; |
59 | 58 | |
60 | -import br.gov.frameworkdemoiselle.DemoiselleException; | |
61 | 59 | import br.gov.frameworkdemoiselle.annotation.Name; |
62 | 60 | import br.gov.frameworkdemoiselle.util.Beans; |
63 | 61 | import br.gov.frameworkdemoiselle.util.ResourceBundle; | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/message/DefaultMessageTest.java
... | ... | @@ -22,8 +22,8 @@ import static org.easymock.EasyMock.expect; |
22 | 22 | import static org.junit.Assert.assertEquals; |
23 | 23 | import static org.junit.Assert.assertSame; |
24 | 24 | import static org.powermock.api.easymock.PowerMock.mockStatic; |
25 | -import static org.powermock.api.easymock.PowerMock.replayAll; | |
26 | 25 | import static org.powermock.api.easymock.PowerMock.replay; |
26 | +import static org.powermock.api.easymock.PowerMock.replayAll; | |
27 | 27 | import static org.powermock.api.easymock.PowerMock.verifyAll; |
28 | 28 | |
29 | 29 | import java.util.Arrays; | ... | ... |
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/ExceptionsTest.java
... | ... | @@ -35,7 +35,6 @@ |
35 | 35 | * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. |
36 | 36 | */ |
37 | 37 | package br.gov.frameworkdemoiselle.util; |
38 | -import org.junit.Ignore; | |
39 | 38 | import static org.junit.Assert.assertFalse; |
40 | 39 | import static org.junit.Assert.assertTrue; |
41 | 40 | import static org.junit.Assert.fail; | ... | ... |
impl/core/src/test/resources/configuration-with-array.xml
1 | -<?xml version="1.0" encoding="UTF-8"?> | |
2 | 1 | <!-- |
3 | 2 | Demoiselle Framework |
4 | 3 | Copyright (C) 2010 SERPRO |
... | ... | @@ -35,7 +34,6 @@ |
35 | 34 | ou escreva para a Fundação do Software Livre (FSF) Inc., |
36 | 35 | 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. |
37 | 36 | --> |
38 | - | |
39 | 37 | <configuration> |
40 | 38 | |
41 | 39 | <integer> |
... | ... | @@ -44,14 +42,14 @@ |
44 | 42 | <array>12330</array> |
45 | 43 | <array>129399</array> |
46 | 44 | </integer> |
47 | - | |
45 | + | |
48 | 46 | <short> |
49 | 47 | <array>32767</array> |
50 | 48 | <array>123</array> |
51 | 49 | <array>5512</array> |
52 | 50 | <array>4212</array> |
53 | 51 | </short> |
54 | - | |
52 | + | |
55 | 53 | <byte> |
56 | 54 | <array>127</array> |
57 | 55 | <array>12</array> |
... | ... | @@ -62,12 +60,12 @@ |
62 | 60 | <array>1</array> |
63 | 61 | <array>-12</array> |
64 | 62 | </byte> |
65 | - | |
63 | + | |
66 | 64 | <boolean> |
67 | 65 | <array>true</array> |
68 | 66 | <array>false</array> |
69 | 67 | </boolean> |
70 | - | |
68 | + | |
71 | 69 | <long> |
72 | 70 | <array>9223372036854775807</array> |
73 | 71 | <array>0901920390123</array> |
... | ... | @@ -75,7 +73,7 @@ |
75 | 73 | <array>134230094</array> |
76 | 74 | <array>66123413423</array> |
77 | 75 | </long> |
78 | - | |
76 | + | |
79 | 77 | <float> |
80 | 78 | <array>3.4028235E38</array> |
81 | 79 | <array>34.244</array> |
... | ... | @@ -83,13 +81,13 @@ |
83 | 81 | <array>513.234</array> |
84 | 82 | <array>10000.000</array> |
85 | 83 | </float> |
86 | - | |
84 | + | |
87 | 85 | <double> |
88 | 86 | <array>1.7976931348623157E308</array> |
89 | 87 | <array>1231234.00120349192348123</array> |
90 | 88 | <array>1234123512341.9134828348238</array> |
91 | 89 | </double> |
92 | - | |
90 | + | |
93 | 91 | <big> |
94 | 92 | <decimal> |
95 | 93 | <array>16578.69899</array> |
... | ... | @@ -97,7 +95,7 @@ |
97 | 95 | <array>4487787.559</array> |
98 | 96 | </decimal> |
99 | 97 | </big> |
100 | - | |
98 | + | |
101 | 99 | <big> |
102 | 100 | <integer> |
103 | 101 | <array>1998987987897</array> |
... | ... | @@ -105,37 +103,37 @@ |
105 | 103 | <array>21474836475</array> |
106 | 104 | </integer> |
107 | 105 | </big> |
108 | - | |
106 | + | |
109 | 107 | <calendar> |
110 | 108 | <array>2012-06-14 10:10:00</array> |
111 | 109 | <array>2012-07-14 10:10:00</array> |
112 | 110 | <array>2012-06-15 18:10:00</array> |
113 | 111 | </calendar> |
114 | - | |
112 | + | |
115 | 113 | <date> |
116 | 114 | <array>2012-08-14 18:10:50</array> |
117 | 115 | <array>2012-07-14 10:10:00</array> |
118 | 116 | <array>2012-06-15 18:10:00</array> |
119 | 117 | </date> |
120 | - | |
118 | + | |
121 | 119 | <color> |
122 | 120 | <array>#808080</array> |
123 | 121 | <array>#cccccc</array> |
124 | 122 | <array> #ABCCCC</array> |
125 | 123 | </color> |
126 | - | |
124 | + | |
127 | 125 | <locale> |
128 | 126 | <array>en</array> |
129 | 127 | <array>pt_br</array> |
130 | 128 | <array>ca</array> |
131 | 129 | </locale> |
132 | - | |
130 | + | |
133 | 131 | <url> |
134 | 132 | <array>http://www.test.com</array> |
135 | 133 | <array>https://test.of.test.com</array> |
136 | 134 | <array>ftp://192.168.0.1</array> |
137 | 135 | </url> |
138 | - | |
136 | + | |
139 | 137 | <string> |
140 | 138 | <array>Test</array> |
141 | 139 | <array>One</array> | ... | ... |
impl/core/src/test/resources/configuration-with-list.xml
impl/extension/jsf/pom.xml
impl/extension/jta/pom.xml
impl/extension/se/pom.xml
impl/extension/servlet/pom.xml
parent/archetype/pom.xml
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | <relativePath>../framework</relativePath> |
49 | 49 | </parent> |
50 | 50 | |
51 | - <name>Archetype Parent</name> | |
51 | + <name>Demoiselle Framework Archetype Parent</name> | |
52 | 52 | <description> |
53 | 53 | Contém configurações comuns a todos os projetos geradores de arquétipos. |
54 | 54 | </description> | ... | ... |
parent/extension/pom.xml
parent/jsf/pom.xml
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | <relativePath>../servlet</relativePath> |
49 | 49 | </parent> |
50 | 50 | |
51 | - <name>JSF Parent</name> | |
51 | + <name>Demoiselle Framework JSF Parent</name> | |
52 | 52 | <description> |
53 | 53 | Especialização do POM demoiselle-web-parent, contendo configurações úteis para todas as aplicações JSF que |
54 | 54 | utilizam o framework. | ... | ... |
parent/minimal/pom.xml
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | <relativePath>../framework</relativePath> |
49 | 49 | </parent> |
50 | 50 | |
51 | - <name>App Parent</name> | |
51 | + <name>Demoiselle Framework Minimal Parent</name> | |
52 | 52 | <description> |
53 | 53 | Configurações úteis para todas as aplicações que utilizam o framework. O ideal é que toda aplicação que |
54 | 54 | utiliza o Demoiselle herde deste POM ou de uma de suas especializações. | ... | ... |
parent/se/pom.xml
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | <relativePath>../../../parent/extension</relativePath> |
49 | 49 | </parent> |
50 | 50 | |
51 | - <name>SE Parent</name> | |
51 | + <name>Demoiselle Framework SE Parent</name> | |
52 | 52 | <description> |
53 | 53 | Especialização do POM mínimo, contendo configurações úteis para todas as aplicações SE que utilizam o framework. |
54 | 54 | </description> | ... | ... |
parent/servlet/pom.xml
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | <relativePath>../extension</relativePath> |
49 | 49 | </parent> |
50 | 50 | |
51 | - <name>Servlet Parent</name> | |
51 | + <name>Demoiselle Framework Servlet Parent</name> | |
52 | 52 | <description> |
53 | 53 | Especialização do POM mínimo, contendo configurações úteis para todas as aplicações Servlet que utilizam o framework. |
54 | 54 | </description> | ... | ... |
pom.xml
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 | <relativePath>../internal/parent/build/demoiselle</relativePath> |
50 | 50 | </parent> |
51 | 51 | |
52 | - <name>Build Aggregator</name> | |
52 | + <name>Demoiselle Framework Build Aggregator</name> | |
53 | 53 | <description> |
54 | 54 | A liberação de versões do framework deve ser feita a partir deste build, que fará automaticamente o build |
55 | 55 | de todos os artefatos com versionamento sincronizado. Jamais gere uma versão do framework sem utilizar este build. |
... | ... | @@ -72,10 +72,8 @@ |
72 | 72 | <module>impl/extension/servlet</module> |
73 | 73 | <module>archetype/minimal</module> |
74 | 74 | <module>archetype/jsf-jpa</module> |
75 | - <!-- | |
76 | 75 | <module>documentation/quickstart</module> |
77 | 76 | <module>documentation/reference</module> |
78 | - --> | |
79 | 77 | </modules> |
80 | 78 | |
81 | 79 | <build> | ... | ... |