Branch: refs/heads/master Home: https://github.com/forge/core Commit: 7d00465499a096ead7bf105c0b070c8f9d1094f5 https://github.com/forge/core/commit/7d00465499a096ead7bf105c0b070c8f9d10... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2012-03-20 (Tue, 20 Mar 2012) Changed paths: M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/FacesScaffold.java M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/config/ForgeConfigReader.java M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/inspector/ForgeInspectionResultConstants.java M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/inspector/ForgeInspector.java A scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/inspector/ForgeInspectorConfig.java A scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/processor/ForgeInspectionResultProcessor.java M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilder.java M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/QueryByExampleWidgetBuilder.java A scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/util/AnnotationLookup.java M scaffold-faces/src/main/resources/scaffold/faces/BackingBean.jv M scaffold-faces/src/main/resources/scaffold/faces/metawidget-bean.xml M scaffold-faces/src/main/resources/scaffold/faces/metawidget-entity.xml M scaffold-faces/src/main/resources/scaffold/faces/metawidget-qbe.xml M scaffold-faces/src/main/resources/scaffold/faces/metawidget-search.xml A scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/PrimaryKeyFacesScaffoldTest.java M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/metawidget/inspector/ForgeInspectorTest.java M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/scenario/petclinic/FacesScaffoldPetClinicTest.java Log Message: ----------- Apply targetDir with var Commit: f2f46a1bb8996f7302c28647e90e5f495ab13a94 https://github.com/forge/core/commit/f2f46a1bb8996f7302c28647e90e5f495ab1... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2012-03-20 (Tue, 20 Mar 2012) Changed paths: M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/FacesScaffold.java Log Message: ----------- Fix merge mistake Compare: https://github.com/forge/core/compare/a514ae6...f2f46a1