Changeset 73 for core/trunk
- Timestamp:
- 07/06/08 18:20:47 (5 months ago)
- Files:
-
- core/trunk/.settings/org.eclipse.jdt.core.prefs (deleted)
- core/trunk/pom.xml (modified) (2 diffs)
- core/trunk/src/main/java/org/restafarian/core/beans/LookupTable.java (modified) (2 diffs)
- core/trunk/src/main/java/org/restafarian/core/beans/LookupTableProperty.java (modified) (2 diffs)
- core/trunk/src/main/java/org/restafarian/core/beans/Person.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/dao (added)
- core/trunk/src/main/java/org/restafarian/core/dao/Dao.java (added)
- core/trunk/src/main/java/org/restafarian/core/dao/LookupTableDao.java (added)
- core/trunk/src/main/java/org/restafarian/core/dao/hibernate (added)
- core/trunk/src/main/java/org/restafarian/core/dao/hibernate/LookupTableDaoHibernate.java (added)
- core/trunk/src/main/java/org/restafarian/core/filters/FilterBase.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/filters/OpenIdFilter.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/filters/SecurityFilter.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/security/AuthenticatedUserManager.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/security/DefaultUserManager.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/security/ServiceBasedUserManager.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/security/SessionBasedUserManager.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/security/UserManager.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/servlets/ConfigurationInitializationServlet.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/servlets/RestServletBase.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/servlets/SelectListServletBase.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/utils/BetwixtTool.class (deleted)
- core/trunk/src/main/java/org/restafarian/core/utils/ISO8601DateConverter.class (deleted)
- core/trunk/src/main/resources/jdbc.properties (added)
- core/trunk/src/main/resources/log4j.xml (added)
- core/trunk/src/main/resources/org/restafarian/core/beans/LookupTable.hbm.xml (added)
- core/trunk/src/main/resources/org/restafarian/core/beans/LookupTableEntry.hbm.xml (added)
- core/trunk/src/main/resources/org/restafarian/core/beans/LookupTableProperty.hbm.xml (added)
- core/trunk/src/test/java/org/restafarian/core/dao (added)
- core/trunk/src/test/java/org/restafarian/core/dao/BaseDaoTestCase.java (added)
- core/trunk/src/test/java/org/restafarian/core/dao/LookupTableDaoTest.java (added)
- core/trunk/src/test/spring (added)
- core/trunk/src/test/spring/context (added)
- core/trunk/src/test/spring/context/applicationContext-hibernate.xml (added)
- core/trunk/src/test/spring/context/applicationContext.xml (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
core/trunk/pom.xml
r70 r73 97 97 </reporting> 98 98 99 <build> 100 <resources> 101 <resource> 102 <directory>src/main/resources</directory> 103 </resource> 104 <resource> 105 <directory>src/main/java</directory> 106 <includes> 107 <include>**/*.xml</include> 108 </includes> 109 </resource> 110 </resources> 111 <testResources> 112 <testResource> 113 <directory>src/test/resources</directory> 114 </testResource> 115 <testResource> 116 <directory>src/test/spring</directory> 117 <includes> 118 <include>**/*.xml</include> 119 </includes> 120 </testResource> 121 </testResources> 122 </build> 123 99 124 <dependencies> 100 125 <dependency> … … 139 164 </dependency> 140 165 <dependency> 166 <groupId>commons-dbcp</groupId> 167 <artifactId>commons-dbcp</artifactId> 168 <version>20030825.184428</version> 169 </dependency> 170 <dependency> 171 <groupId>commons-pool</groupId> 172 <artifactId>commons-pool</artifactId> 173 <version>20030825.183949</version> 174 </dependency> 175 <dependency> 176 <groupId>org.springframework</groupId> 177 <artifactId>spring</artifactId> 178 <version>2.5.5</version> 179 </dependency> 180 <dependency> 181 <groupId>org.springframework</groupId> 182 <artifactId>spring-hibernate3</artifactId> 183 <version>2.0.8</version> 184 </dependency> 185 <dependency> 141 186 <groupId>org.springframework.security</groupId> 142 187 <artifactId>spring-security-core</artifactId> 143 <version>2.0.1</version> 188 <version>2.0.3</version> 189 </dependency> 190 <dependency> 191 <groupId>org.springframework</groupId> 192 <artifactId>spring-test</artifactId> 193 <version>2.5.5</version> 194 <scope>test</scope> 195 </dependency> 196 <dependency> 197 <groupId>mysql</groupId> 198 <artifactId>mysql-connector-java</artifactId> 199 <version>5.1.6</version> 200 <scope>test</scope> 201 </dependency> 202 <dependency> 203 <groupId>aspectj</groupId> 204 <artifactId>aspectjweaver</artifactId> 205 <version>1.5.4</version> 206 </dependency> 207 <dependency> 208 <groupId>log4j</groupId> 209 <artifactId>log4j</artifactId> 210 <version>1.2.9</version> 144 211 </dependency> 145 212 </dependencies> core/trunk/src/main/java/org/restafarian/core/beans/LookupTable.java
r72 r73 1 1 package org.restafarian.core.beans; 2 3 import java.util.ArrayList; 4 import java.util.List; 2 5 3 6 /** … … 9 12 private String name = null; 10 13 private String description = null; 11 private LookupTableProperty[] property = null; 14 private List property = null; 15 16 public void addProperty(LookupTableProperty lookupTableProperty) { 17 if (property == null) { 18 property = new ArrayList(); 19 } 20 lookupTableProperty.setTableId(id); 21 lookupTableProperty.setSequence(property.size()); 22 property.add(lookupTableProperty); 23 } 24 25 public LookupTableProperty getProperty(int sequence) { 26 LookupTableProperty lookupTableProperty = null; 27 28 if (property != null && property.size() > sequence) { 29 lookupTableProperty = (LookupTableProperty) property.get(sequence); 30 } 31 32 return lookupTableProperty; 33 } 34 35 public void setProperty(int sequence, LookupTableProperty lookupTableProperty) { 36 if (property != null && property.size() > sequence) { 37 property.set(sequence, lookupTableProperty); 38 } 39 } 12 40 13 41 public String getDescription() { 14 42 return description; 15 43 } 44 16 45 public void setDescription(String description) { 17 46 this.description = description; 18 47 } 48 19 49 public String getId() { 20 50 return id; 21 51 } 52 22 53 public void setId(String id) { 23 54 this.id = id; 24 55 } 56 25 57 public String getName() { 26 58 return name; 27 59 } 60 28 61 public void setName(String name) { 29 62 this.name = name; 30 63 } 31 public LookupTableProperty[] getProperty() { 64 65 public List getProperty() { 32 66 return property; 33 67 } 34 public void setProperty(LookupTableProperty[] property) { 68 69 public void setProperty(List property) { 35 70 this.property = property; 36 71 } core/trunk/src/main/java/org/restafarian/core/beans/LookupTableProperty.java
r72 r73 8 8 private int id = -1; 9 9 private String tableId = null; 10 private int sequence = 0; 10 11 private String name = null; 11 12 private String type = null; … … 46 47 this.notes = notes; 47 48 } 49 public int getSequence() { 50 return sequence; 51 } 52 public void setSequence(int sequence) { 53 this.sequence = sequence; 54 } 48 55 public String getSize() { 49 56 return size;