[seam-commits] [seam/forge] 19a881: Merge branch 'master' of github.com:lincolnthree/s...

Branch: refs/heads/master Home: https://github.com/seam/forge Commit: 19a881613e16c1251a0e02becd4f169c553fed08 https://github.com/seam/forge/commit/19a881613e16c1251a0e02becd4f169c553f... Author: unknown <Lincoln@.(none)> Date: 2011-03-07 (Mon, 07 Mar 2011) Changed paths: M dev-plugins/src/main/java/org/jboss/seam/forge/dev/java/JavaPlugin.java M dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/LsMavenPomPlugin.java M dev-plugins/src/main/java/org/jboss/seam/forge/dev/mvn/MavenPlugin.java R dev-plugins/src/main/java/org/jboss/seam/forge/dev/project/NewProjectPlugin.java M j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewEntityPlugin.java M j2ee-plugins/src/main/java/org/jboss/seam/forge/spec/jpa/NewFieldPlugin.java M parser-java/src/test/java/org/jboss/seam/forge/test/parser/java/FieldTest.java A project-model/src/main/java/org/jboss/seam/forge/project/ProjectImpl.java M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenDependencyFacet.java M project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/MavenMetadataFacet.java A project-model/src/main/java/org/jboss/seam/forge/project/facets/builtin/RepositoryLookup.java M project-model/src/main/java/org/jboss/seam/forge/project/locators/DefaultProjectLocator.java M project-model/src/main/java/org/jboss/seam/forge/project/locators/MavenProjectLocator.java R project-model/src/main/java/org/jboss/seam/forge/project/model/ProjectImpl.java R project-model/src/main/java/org/jboss/seam/forge/project/resources/builtin/aether/RepositoryLookup.java A project-model/src/test/java/org/jboss/seam/forge/test/project/facets/impl/RepositoryLookupTest.java R project-model/src/test/java/org/jboss/seam/forge/test/project/resources/ResourceAPITests.java R project-model/src/test/java/org/jboss/seam/forge/test/project/resources/builtin/aether/RepositoryLookupTest.java M project-model/src/test/java/org/jboss/seam/forge/test/project/util/ProjectModelTest.java R shell-api/src/main/java/org/jboss/seam/forge/BasePackageMarker.java A shell-api/src/main/java/org/jboss/seam/forge/Root.java M shell-api/src/main/java/org/jboss/seam/forge/project/facets/MetadataFacet.java M shell-api/src/main/java/org/jboss/seam/forge/project/services/ProjectFactory.java M shell-api/src/main/java/org/jboss/seam/forge/resources/AbstractResource.java M shell-api/src/main/java/org/jboss/seam/forge/resources/FileResource.java M shell-api/src/main/java/org/jboss/seam/forge/resources/Resource.java M shell-api/src/main/java/org/jboss/seam/forge/shell/PromptType.java M shell-api/src/main/java/org/jboss/seam/forge/shell/plugins/Help.java A shell-api/src/test/java/org/jboss/seam/forge/shell/PromptTypeTest.java R shell-api/src/test/java/org/jboss/seam/forge/shell/test/PromptTypeTest.java M shell/src/main/java/org/jboss/seam/forge/shell/command/ExecutionParser.java M shell/src/main/java/org/jboss/seam/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/HelpPlugin.java A shell/src/main/java/org/jboss/seam/forge/shell/plugins/builtin/NewProjectPlugin.java M shell/src/main/java/org/jboss/seam/forge/shell/project/resources/ResourceProducer.java M shell/src/test/java/org/jboss/seam/forge/shell/test/ExecutionParserTest.java M shell/src/test/java/org/jboss/seam/forge/shell/test/command/MockOptionTestPlugin.java M shell/src/test/java/org/jboss/seam/forge/shell/test/plugins/builtin/LsMavenPomPluginTestCase.java A shell/src/test/java/org/jboss/seam/forge/shell/test/plugins/builtin/NewProjectPluginTest.java R shell/src/test/java/org/jboss/seam/forge/shell/test/project/resources/MockEvent.java R shell/src/test/java/org/jboss/seam/forge/shell/test/project/resources/MockResourceInjectionPlugin.java R shell/src/test/java/org/jboss/seam/forge/shell/test/project/resources/ResourceProducerExtensionTest.java A shell/src/test/java/org/jboss/seam/forge/shell/test/resources/MockEvent.java A shell/src/test/java/org/jboss/seam/forge/shell/test/resources/MockResourceInjectionPlugin.java A shell/src/test/java/org/jboss/seam/forge/shell/test/resources/ResourceAPITests.java A shell/src/test/java/org/jboss/seam/forge/shell/test/resources/ResourceProducerExtensionTest.java M test-harness/src/main/java/org/jboss/seam/forge/test/AbstractShellTest.java M test-harness/src/main/java/org/jboss/seam/forge/test/SingletonAbstractShellTest.java Log Message: ----------- Merge branch 'master' of github.com:lincolnthree/seam-forge Commit: b24b062316e34af5ef63b8ffdad636d698cc7349 https://github.com/seam/forge/commit/b24b062316e34af5ef63b8ffdad636d698cc... Author: unknown <Lincoln@.(none)> Date: 2011-03-07 (Mon, 07 Mar 2011) Changed paths: M scaffold-plugin/src/main/java/org/jboss/seam/forge/scaffold/providers/MetawidgetScaffold.java R scaffold-plugin/src/main/resources/org/jboss/seam/forge/jpa/DatasourceProducer.jtpl A scaffold-plugin/src/main/resources/org/jboss/seam/forge/jpa/DatasourceProducer.jv R scaffold-plugin/src/main/resources/org/jboss/seam/forge/jpa/PersistenceUtil.jtpl A scaffold-plugin/src/main/resources/org/jboss/seam/forge/jpa/PersistenceUtil.jv R scaffold-plugin/src/main/resources/org/jboss/seam/forge/scaffold/templates/BackingBean.jtpl A scaffold-plugin/src/main/resources/org/jboss/seam/forge/scaffold/templates/BackingBean.jv Log Message: ----------- renamed clashing template files Compare: https://github.com/seam/forge/compare/43c0924...b24b062