summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add annotations for Attribute classattr_modelAdrian Likins2010-01-1227-9/+2294
| | | | | | Add a test case for Attribute Make Product and EntitlementPool use the Attribute class
* Updating .project to what buildr generates.Devan Goodwin2010-01-121-21/+10
|
* Update the tomcat deploy script to use new buildr setup.Devan Goodwin2010-01-121-4/+4
|
* Add Attribute class.Devan Goodwin2010-01-123-36/+65
| | | | | | Attributes will represent hints on Products and EntitlementPools indicating what conditions must be satisfied for the entitlement to be granted.
* Consumer is now being created in ConsumerResource with all meta-data that is ↵Dmitri Dolguikh2010-01-124-85/+46
| | | | passed in
* Merge branch 'master' of ssh://git.fedorahosted.org/git/candlepinDmitri Dolguikh2010-01-122-114/+0
|\
| * remove our attempt at using python as our DDLjesus m. rodriguez2010-01-112-114/+0
| |
* | removed unused importsDmitri Dolguikh2010-01-1111-54/+33
|/
* renamed ConsumerInfo to ConsumerFactDmitri Dolguikh2010-01-088-33/+30
|
* let folks know to use buildr instead, of ant.jesus m. rodriguez2010-01-061-1/+9
|
* added schema generation task to buildrDmitri Dolguikh2010-01-041-2/+31
|
* Merge branch 'buildr' of ssh://git.fedorahosted.org/git/candlepin into buildrDmitri Dolguikh2009-12-310-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: proxy/buildfile proxy/code/src/META-INF/persistence.xml proxy/code/src/org/fedoraproject/candlepin/resource/test/CandlePingTestingModule.java proxy/code/webapp/WEB-INF/web.xml proxy/src/main/java/org/fedoraproject/candlepin/model/ConsumerCurator.java proxy/src/main/java/org/fedoraproject/candlepin/model/EntitlementPoolCurator.java proxy/src/main/java/org/fedoraproject/candlepin/model/ProductCurator.java proxy/src/main/webapp/META-INF/persistence.xml proxy/src/main/webapp/WEB-INF/web.xml proxy/src/test/java/org/fedoraproject/candlepin/resource/test/CandlePingTestingModule.java proxy/src/test/java/org/fedoraproject/candlepin/resource/test/CandlepinTestingModule.java proxy/src/test/resources/META-INF/persistence.xml proxy/src/test/resources/WEB-INF/web.xml
| * move from code/src/ -> src/main/javajesus m. rodriguez2009-12-101-0/+0
| |
| * Merge branch 'master' into buildrjesus m. rodriguez2009-12-109-60/+56
| |\
| * | add GUICE dependenciesjesus m. rodriguez2009-12-101-2/+7
| | |
| * | Merge branch 'master' into buildrjesus m. rodriguez2009-12-1078-1427/+2801
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: proxy/buildconf/build-utils.xml proxy/src/main/java/org/fedoraproject/candlepin/model/BaseModel.java proxy/src/main/java/org/fedoraproject/candlepin/model/Pinsetter.java proxy/src/main/java/org/fedoraproject/candlepin/resource/ApiHandler.java proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTest.java proxy/src/test/java/org/fedoraproject/candlepin/model/test/ConsumerTypeTest.java proxy/src/test/java/org/fedoraproject/candlepin/model/test/ProductTest.java proxy/src/test/java/org/fedoraproject/candlepin/model/test/TestUtil.java proxy/src/test/java/org/fedoraproject/candlepin/resource/test/ApiTest.java Moved all the new code from code/src/ to src/{main,test}/java
| * | | Add a few missing buildr deps for testing.Devan Goodwin2009-11-171-1/+6
| | | |
| * | | move src to proper locationjesus m. rodriguez2009-11-171-0/+0
| | | |
| * | | Merge branch 'master' into buildrjesus m. rodriguez2009-11-172-0/+32
| |\ \ \
| * | | | moved new resource to proper locationjesus m. rodriguez2009-11-161-0/+0
| | | | |
| * | | | Merge branch 'master' into buildrjesus m. rodriguez2009-11-166-4/+76
| |\ \ \ \
| * | | | | moved new filesjesus m. rodriguez2009-11-121-0/+0
| | | | | |
| * | | | | Merge branch 'master' into buildrjesus m. rodriguez2009-11-128-27/+192
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into buildrjesus m. rodriguez2009-11-113-75/+25
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into buildrjesus m. rodriguez2009-11-113-0/+139
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into buildrjesus m. rodriguez2009-11-112-3/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | moved newly add code to src/main/java, updated depsjesus m. rodriguez2009-11-1110-4/+9
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into buildrjesus m. rodriguez2009-11-1111-5/+1221
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into buildrjesus m. rodriguez2009-11-101-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test resourcesjesus m. rodriguez2009-11-102-0/+65
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into buildrjesus m. rodriguez2009-11-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into buildrjesus m. rodriguez2009-11-104-0/+37
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add proper dependenciesjesus m. rodriguez2009-11-101-4/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into buildrjesus m. rodriguez2009-11-102-3/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | put the tests back in .test packagejesus m. rodriguez2009-11-0919-40/+43
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into buildrjesus m. rodriguez2009-11-095-7/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | reorganize the tree for use with buildrjesus m. rodriguez2009-11-0945-15/+68
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | brought in changes from masterDmitri Dolguikh2009-12-3132-77/+10
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | move from code/src/ -> src/main/javajesus m. rodriguez2009-12-311-0/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | add GUICE dependenciesjesus m. rodriguez2009-12-311-2/+7
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Add a few missing buildr deps for testing.Devan Goodwin2009-12-311-1/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | move src to proper locationjesus m. rodriguez2009-12-311-0/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | moved new resource to proper locationjesus m. rodriguez2009-12-311-0/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | moved newly add code to src/main/java, updated depsjesus m. rodriguez2009-12-3110-4/+9
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | test resourcesjesus m. rodriguez2009-12-312-0/+65
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | add proper dependenciesjesus m. rodriguez2009-12-311-4/+16
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | put the tests back in .test packagejesus m. rodriguez2009-12-3116-21/+30
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | reorganize the tree for use with buildrjesus m. rodriguez2009-12-3140-10/+62
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master' of ssh://git.fedorahosted.org/git/candlepinDmitri Dolguikh2009-12-2210-16/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Increment db sequences by one instead of 50.Devan Goodwin2009-12-189-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nooo idea why Hibernate/JPA wants to default to 50 but anyhow.