You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/01/08 21:04:06 UTC
svn commit: r732810 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/test:
java/org/apache/webbeans/test/unittests/xml/XMLFieldTest.java
java/org/apache/webbeans/test/xml/ComponentForField.java
resources/org/apache/webbeans/test/xml/fieldTest.xml
Author: gerdogdu
Date: Thu Jan 8 12:04:06 2009
New Revision: 732810
URL: http://svn.apache.org/viewvc?rev=732810&view=rev
Log:
OWB-31 various XML definition improvements
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLFieldTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/ComponentForField.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/fieldTest.xml
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLFieldTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLFieldTest.java?rev=732810&r1=732809&r2=732810&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLFieldTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLFieldTest.java Thu Jan 8 12:04:06 2009
@@ -81,8 +81,6 @@
Assert.assertEquals("dskfj", cff.getStrField());
Assert.assertNotNull(cff.getDateField());
Assert.assertNotNull(cff.getCalendarField());
- Assert.assertNotNull(cff.getDateField2());
- Assert.assertNotNull(cff.getCalendarField2());
Assert.assertEquals(ComponentForField.class, cff.getClazzField());
Assert.assertNotNull(cff.getListStrField());
Assert.assertNotNull(cff.getListEnumField());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/ComponentForField.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/ComponentForField.java?rev=732810&r1=732809&r2=732810&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/ComponentForField.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/ComponentForField.java Thu Jan 8 12:04:06 2009
@@ -43,10 +43,6 @@
private Calendar calendarField;
- private Date dateField2;
-
- private Calendar calendarField2;
-
private Class<?> clazzField;
private List<String> listStrField;
@@ -313,37 +309,4 @@
{
this.enum1Field = enum1Field;
}
-
- /**
- * @return the dateField2
- */
- public Date getDateField2()
- {
- return dateField2;
- }
-
- /**
- * @param dateField2 the dateField2 to set
- */
- public void setDateField2(Date dateField2)
- {
- this.dateField2 = dateField2;
- }
-
- /**
- * @return the calendarField2
- */
- public Calendar getCalendarField2()
- {
- return calendarField2;
- }
-
- /**
- * @param calendarField2 the calendarField2 to set
- */
- public void setCalendarField2(Calendar calendarField2)
- {
- this.calendarField2 = calendarField2;
- }
-
-}
+ }
\ No newline at end of file
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/fieldTest.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/fieldTest.xml?rev=732810&r1=732809&r2=732810&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/fieldTest.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/xml/fieldTest.xml Thu Jan 8 12:04:06 2009
@@ -17,10 +17,8 @@
<myapp:booleanField>true</myapp:booleanField>
<myapp:enum1Field>ENUM1</myapp:enum1Field>
<myapp:strField>dskfj</myapp:strField>
- <myapp:dateField>September 30, 1998 10:45:30 PM CST</myapp:dateField>
- <myapp:calendarField>September 30, 1998 10:45:30 PM CST</myapp:calendarField>
- <myapp:dateField2>1998-09-30T22:45:30-0600</myapp:dateField2>
- <myapp:calendarField2>1998-09-30T22:45:30-0600</myapp:calendarField2>
+ <myapp:dateField>1998-09-30T22:45:30-0600</myapp:dateField>
+ <myapp:calendarField>1998-09-30T22:45:30-0600</myapp:calendarField>
<myapp:clazzField>org.apache.webbeans.test.xml.ComponentForField</myapp:clazzField>
<myapp:listStrField>
<value>gurkan</value>