Commit cc68b35deaa8916e64f13b2dec433ff0db74e174

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