Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add annotations for Attribute classattr_model | Adrian Likins | 2010-01-12 | 27 | -9/+2294 |
| | | | | | | Add a test case for Attribute Make Product and EntitlementPool use the Attribute class | ||||
* | Updating .project to what buildr generates. | Devan Goodwin | 2010-01-12 | 1 | -21/+10 |
| | |||||
* | Update the tomcat deploy script to use new buildr setup. | Devan Goodwin | 2010-01-12 | 1 | -4/+4 |
| | |||||
* | Add Attribute class. | Devan Goodwin | 2010-01-12 | 3 | -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 Dolguikh | 2010-01-12 | 4 | -85/+46 |
| | | | | passed in | ||||
* | Merge branch 'master' of ssh://git.fedorahosted.org/git/candlepin | Dmitri Dolguikh | 2010-01-12 | 2 | -114/+0 |
|\ | |||||
| * | remove our attempt at using python as our DDL | jesus m. rodriguez | 2010-01-11 | 2 | -114/+0 |
| | | |||||
* | | removed unused imports | Dmitri Dolguikh | 2010-01-11 | 11 | -54/+33 |
|/ | |||||
* | renamed ConsumerInfo to ConsumerFact | Dmitri Dolguikh | 2010-01-08 | 8 | -33/+30 |
| | |||||
* | let folks know to use buildr instead, of ant. | jesus m. rodriguez | 2010-01-06 | 1 | -1/+9 |
| | |||||
* | added schema generation task to buildr | Dmitri Dolguikh | 2010-01-04 | 1 | -2/+31 |
| | |||||
* | Merge branch 'buildr' of ssh://git.fedorahosted.org/git/candlepin into buildr | Dmitri Dolguikh | 2009-12-31 | 0 | -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/java | jesus m. rodriguez | 2009-12-10 | 1 | -0/+0 |
| | | |||||
| * | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-12-10 | 9 | -60/+56 |
| |\ | |||||
| * | | add GUICE dependencies | jesus m. rodriguez | 2009-12-10 | 1 | -2/+7 |
| | | | |||||
| * | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-12-10 | 78 | -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 Goodwin | 2009-11-17 | 1 | -1/+6 |
| | | | | |||||
| * | | | move src to proper location | jesus m. rodriguez | 2009-11-17 | 1 | -0/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-17 | 2 | -0/+32 |
| |\ \ \ | |||||
| * | | | | moved new resource to proper location | jesus m. rodriguez | 2009-11-16 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-16 | 6 | -4/+76 |
| |\ \ \ \ | |||||
| * | | | | | moved new files | jesus m. rodriguez | 2009-11-12 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-12 | 8 | -27/+192 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-11 | 3 | -75/+25 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-11 | 3 | -0/+139 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-11 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | moved newly add code to src/main/java, updated deps | jesus m. rodriguez | 2009-11-11 | 10 | -4/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-11 | 11 | -5/+1221 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test resources | jesus m. rodriguez | 2009-11-10 | 2 | -0/+65 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-10 | 4 | -0/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | add proper dependencies | jesus m. rodriguez | 2009-11-10 | 1 | -4/+16 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-10 | 2 | -3/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | put the tests back in .test package | jesus m. rodriguez | 2009-11-09 | 19 | -40/+43 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into buildr | jesus m. rodriguez | 2009-11-09 | 5 | -7/+126 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | reorganize the tree for use with buildr | jesus m. rodriguez | 2009-11-09 | 45 | -15/+68 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | brought in changes from master | Dmitri Dolguikh | 2009-12-31 | 32 | -77/+10 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | move from code/src/ -> src/main/java | jesus m. rodriguez | 2009-12-31 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | add GUICE dependencies | jesus m. rodriguez | 2009-12-31 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Add a few missing buildr deps for testing. | Devan Goodwin | 2009-12-31 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | move src to proper location | jesus m. rodriguez | 2009-12-31 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | moved new resource to proper location | jesus m. rodriguez | 2009-12-31 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | moved newly add code to src/main/java, updated deps | jesus m. rodriguez | 2009-12-31 | 10 | -4/+9 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | test resources | jesus m. rodriguez | 2009-12-31 | 2 | -0/+65 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | add proper dependencies | jesus m. rodriguez | 2009-12-31 | 1 | -4/+16 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | put the tests back in .test package | jesus m. rodriguez | 2009-12-31 | 16 | -21/+30 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | reorganize the tree for use with buildr | jesus m. rodriguez | 2009-12-31 | 40 | -10/+62 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'master' of ssh://git.fedorahosted.org/git/candlepin | Dmitri Dolguikh | 2009-12-22 | 10 | -16/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Increment db sequences by one instead of 50. | Devan Goodwin | 2009-12-18 | 9 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nooo idea why Hibernate/JPA wants to default to 50 but anyhow. |