April 2012 - seam-commits - Jboss List Archives

[forge/core]

by GitHub

Branch: refs/tags/1.0.4.Final Home: https://github.com/forge/core

12 years, 7 months

1
0
0 / 0

[forge/core] 145b25: [maven-release-plugin] prepare release 1.0.4.Final

by GitHub

Branch: refs/heads/master Home: https://github.com/forge/core Commit: 145b25796c102c43ee50c4fd65c2c56d6236a765 https://github.com/forge/core/commit/145b25796c102c43ee50c4fd65c2c56d6236... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-26 (Thu, 26 Apr 2012) Changed paths: M dev-plugins/pom.xml M dist/pom.xml M event-bus-api/pom.xml M git-tools-tests/pom.xml M git-tools/pom.xml M javaee-api/pom.xml M javaee-impl/pom.xml M maven-api/pom.xml M parser-java-api/pom.xml M parser-java/pom.xml M parser-xml/pom.xml M plugin-loader/pom.xml M pom.xml M project-model-maven-tests/pom.xml M project-model-maven/pom.xml M scaffold-api/pom.xml M scaffold-faces/pom.xml M scaffold-plugins/pom.xml M shell-api/pom.xml M shell/pom.xml M test-harness-web/pom.xml M test-harness/pom.xml Log Message: ----------- [maven-release-plugin] prepare release 1.0.4.Final

12 years, 7 months

1
0
0 / 0

[forge/core] 2d80e4: \@Alias is now a Qualifier

by GitHub

Branch: refs/heads/master Home: https://github.com/forge/core Commit: 2d80e4ca20a7c085e6922574c909f5a7b2e15b8a https://github.com/forge/core/commit/2d80e4ca20a7c085e6922574c909f5a7b2e1... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-16 (Mon, 16 Apr 2012) Changed paths: M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/servlet/ServletFacetImpl.java M project-model-maven/src/main/java/org/jboss/forge/maven/locators/DefaultProjectLocator.java M project-model-maven/src/main/java/org/jboss/forge/maven/locators/MavenProjectLocator.java M scaffold-plugins/src/main/java/org/jboss/forge/scaffold/plugins/ScaffoldPlugin.java M shell-api/src/main/java/org/jboss/forge/project/services/FacetFactory.java M shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java M shell-api/src/main/java/org/jboss/forge/shell/Wait.java M shell-api/src/main/java/org/jboss/forge/shell/plugins/Alias.java A shell-api/src/main/java/org/jboss/forge/shell/plugins/AliasLiteral.java A shell-api/src/main/java/org/jboss/forge/shell/project/FacetRegistry.java M shell/src/main/java/org/jboss/forge/shell/command/CommandLibraryExtension.java M shell/src/main/java/org/jboss/forge/shell/command/Execution.java A shell/src/main/java/org/jboss/forge/shell/command/FacetRegistryImpl.java M shell/src/main/java/org/jboss/forge/shell/env/ScopedConfigurationAdapter.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/AboutPlugin.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/LessPlugin.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/RunUrlPlugin.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/project/AvailableFacetsCompleter.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/project/InstalledFacetsCompleter.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/project/ProjectPlugin.java M shell/src/test/java/org/jboss/forge/shell/WaitTest.java M shell/src/test/java/org/jboss/forge/shell/test/ExecutionParserTest.java M shell/src/test/java/org/jboss/forge/shell/test/ShellIgnoreEOFTest.java M shell/src/test/java/org/jboss/forge/shell/test/resources/ResourceProducerExtensionTest.java Log Message: ----------- \@Alias is now a Qualifier Commit: 03522a5673f33ffbbd87132c664cb399e582426b https://github.com/forge/core/commit/03522a5673f33ffbbd87132c664cb399e582... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/servlet/ServletFacetImpl.java M project-model-maven/src/main/java/org/jboss/forge/maven/locators/MavenProjectLocator.java M shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java Log Message: ----------- Fix project location and creation Commit: 7910731b26e8fedf08ed078c35d50e3ca027c9d4 https://github.com/forge/core/commit/7910731b26e8fedf08ed078c35d50e3ca027... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dev-plugins/pom.xml A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java M dist/pom.xml M event-bus-api/pom.xml M git-tools-tests/pom.xml M git-tools/pom.xml M javaee-api/pom.xml M javaee-impl/pom.xml M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/EntityPlugin.java M maven-api/pom.xml M maven-api/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyAdapter.java M parser-java-api/pom.xml M parser-java/pom.xml M parser-xml/pom.xml M plugin-loader/pom.xml M pom.xml M project-model-maven-tests/pom.xml M project-model-maven/pom.xml M scaffold-api/pom.xml M scaffold-faces/pom.xml M scaffold-plugins/pom.xml M shell-api/pom.xml M shell-api/src/main/java/org/jboss/forge/project/dependencies/DependencyBuilder.java A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java M shell-api/src/main/java/org/jboss/forge/shell/Wait.java A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java M shell/pom.xml M shell/src/main/java/org/jboss/forge/shell/Bootstrap.java A shell/src/main/java/org/jboss/forge/shell/EvaluateListener.java M shell/src/main/java/org/jboss/forge/shell/ShellImpl.java M shell/src/main/java/org/jboss/forge/shell/command/fshparser/FSHParser.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/RunUrlPlugin.java A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties A shell/src/test/java/org/jboss/forge/shell/test/command/fshparser/FSHParserTest.java A shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/RmPluginTest.java M test-harness-web/pom.xml M test-harness/pom.xml M test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java Log Message: ----------- Merged from master Commit: 904cd81e366cbc67af3cfecbabb40fdc470ba89c https://github.com/forge/core/commit/904cd81e366cbc67af3cfecbabb40fdc470b... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M shell-api/src/main/java/org/jboss/forge/shell/Wait.java Log Message: ----------- Merged again Commit: 5135cfbf9efad1a1fb96882998cc19889e3cdd81 https://github.com/forge/core/commit/5135cfbf9efad1a1fb96882998cc19889e3c... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Log Message: ----------- Merge branches 'master' and 'FORGE-547' into FORGE-547 Commit: 1eeca1621f36a8609484580acb6e6f95d19653a3 https://github.com/forge/core/commit/1eeca1621f36a8609484580acb6e6f95d196... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dev-plugins/pom.xml A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java M dist/pom.xml M event-bus-api/pom.xml M git-tools-tests/pom.xml M git-tools/pom.xml M javaee-api/pom.xml M javaee-impl/pom.xml M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/EntityPlugin.java M maven-api/pom.xml M maven-api/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyAdapter.java M parser-java-api/pom.xml M parser-java/pom.xml M parser-xml/pom.xml M plugin-loader/pom.xml M pom.xml M project-model-maven-tests/pom.xml M project-model-maven/pom.xml M scaffold-api/pom.xml M scaffold-faces/pom.xml M scaffold-plugins/pom.xml M shell-api/pom.xml M shell-api/src/main/java/org/jboss/forge/project/dependencies/DependencyBuilder.java A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java M shell-api/src/main/java/org/jboss/forge/shell/Wait.java A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java M shell/pom.xml M shell/src/main/java/org/jboss/forge/shell/Bootstrap.java A shell/src/main/java/org/jboss/forge/shell/EvaluateListener.java M shell/src/main/java/org/jboss/forge/shell/ShellImpl.java M shell/src/main/java/org/jboss/forge/shell/command/fshparser/FSHParser.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/RunUrlPlugin.java A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties A shell/src/test/java/org/jboss/forge/shell/test/command/fshparser/FSHParserTest.java A shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/RmPluginTest.java M test-harness-web/pom.xml M test-harness/pom.xml M test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java Log Message: ----------- Merged from master Commit: 0252009615028ed2f6a393e602f74e9dabd728b1 https://github.com/forge/core/commit/0252009615028ed2f6a393e602f74e9dabd7... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Log Message: ----------- testRunScriptNotHostHttpUrl in RunUrlPluginTest Fails Commit: 19c3105b43f056226cf40d423f1e26f73f9da574 https://github.com/forge/core/commit/19c3105b43f056226cf40d423f1e26f73f9d... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat Log Message: ----------- Merge branch 'master' of github.com:forge/core into HEAD Commit: 4fad58f92c20788e9e51928ae617d9cbc3530c27 https://github.com/forge/core/commit/4fad58f92c20788e9e51928ae617d9cbc353... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M project-model-maven/src/main/java/org/jboss/forge/maven/locators/DefaultProjectLocator.java M shell-api/src/main/java/org/jboss/forge/project/services/FacetFactory.java M shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java Log Message: ----------- Fix project factory failures and exception on tab completion Commit: e9eadf8a7338e5f7f2f08a708009c7edc0183529 https://github.com/forge/core/commit/e9eadf8a7338e5f7f2f08a708009c7edc018... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat M project-model-maven/src/main/java/org/jboss/forge/maven/locators/DefaultProjectLocator.java M shell-api/src/main/java/org/jboss/forge/project/services/FacetFactory.java M shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java Log Message: ----------- Merge branch 'temp' into FORGE-547 Commit: 875573edde67dfe049697c1edabba2badcacfa1b https://github.com/forge/core/commit/875573edde67dfe049697c1edabba2badcac... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-26 (Thu, 26 Apr 2012) Changed paths: M dist/src/main/resources/modules/javax/api/main/module.xml M dist/src/main/resources/modules/org/jboss/shrinkwrap/descriptors/main/module.xml Log Message: ----------- Fix UTF-8 bug AGAIN Commit: 200d5e85ec3045df5d5e873883c86626eda3353f https://github.com/forge/core/commit/200d5e85ec3045df5d5e873883c86626eda3... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-26 (Thu, 26 Apr 2012) Log Message: ----------- Merge branches 'FORGE-547' and 'master' Compare: https://github.com/forge/core/compare/ace4acc...200d5e8

12 years, 7 months

1
0
0 / 0

[forge/core] 875573: Fix UTF-8 bug AGAIN

by GitHub

Branch: refs/heads/FORGE-547 Home: https://github.com/forge/core Commit: 875573edde67dfe049697c1edabba2badcacfa1b https://github.com/forge/core/commit/875573edde67dfe049697c1edabba2badcac... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-26 (Thu, 26 Apr 2012) Changed paths: M dist/src/main/resources/modules/javax/api/main/module.xml M dist/src/main/resources/modules/org/jboss/shrinkwrap/descriptors/main/module.xml Log Message: ----------- Fix UTF-8 bug AGAIN

12 years, 7 months

1
0
0 / 0

Seam SVN: r14637 - in branches/community/Seam_2_2/src/test/ftest: examples and 1 other directories.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-26 08:40:59 -0400 (Thu, 26 Apr 2012) New Revision: 14637 Modified: branches/community/Seam_2_2/src/test/ftest/build.xml branches/community/Seam_2_2/src/test/ftest/examples/build.xml branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java Log: update Selenium Modified: branches/community/Seam_2_2/src/test/ftest/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/build.xml 2012-04-25 07:46:15 UTC (rev 14636) +++ branches/community/Seam_2_2/src/test/ftest/build.xml 2012-04-26 12:40:59 UTC (rev 14637) @@ -41,7 +41,7 @@ <path id="selenium.server.classpath"> <fileset dir="${lib.dir}"> - <include name="selenium-server-standalone.jar" /> + <include name="*.jar" /> </fileset> </path> Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2012-04-25 07:46:15 UTC (rev 14636) +++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2012-04-26 12:40:59 UTC (rev 14637) @@ -412,14 +412,9 @@ <target name="copy.selenium" unless="copy.selenium.done"> <copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}"> - <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0.3" classifier="standalone"> - <exclusion groupId="org.seleniumhq.selenium.core" artifactId="selenium-core" /> - <exclusion groupId="org.seleniumhq.selenium.server" artifactId="selenium-server-coreless" /> - <exclusion groupId="org.apache.ant" artifactId="ant-trax" /> - <exclusion groupId="org.apache.ant" artifactId="ant-nodeps" /> + <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-server" version="2.21.0"> </dependency> - <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0.2"> - <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default" /> + <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-java" version="2.21.0"> </dependency> <dependency groupId="org.subethamail" artifactId="subethasmtp-smtp" version="1.2" >  Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java =================================================================== --- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java 2012-04-25 07:46:15 UTC (rev 14636) +++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java 2012-04-26 12:40:59 UTC (rev 14637) @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.List; import org.openqa.selenium.By; +import org.openqa.selenium.Dimension; +import org.openqa.selenium.Point; import org.openqa.selenium.WebElement; /** @@ -119,15 +121,26 @@ { return element.getAttribute(name); } - - //@Deprecated - //// @Override - //public String getElementName() - //{ - // return element.getElementName(); - //} - + // @Override + public String getCssValue(String propertyName) + { + return element.getCssValue(propertyName); + } + + // @Override + public Point getLocation() + { + return element.getLocation(); + } + + // @Override + public Dimension getSize() + { + return element.getSize(); + } + + // @Override public String getTagName() { return element.getTagName(); @@ -138,11 +151,11 @@ { return element.getText(); } - + // @Override - public String getValue() + public boolean isDisplayed() { - return element.getValue(); + return element.isDisplayed(); } // @Override @@ -164,12 +177,6 @@ } // @Override - public void setSelected() - { - element.setSelected(); - } - - // @Override public void setWaitTime(int millis) { this.waitTime = millis; @@ -180,11 +187,5 @@ { element.submit(); } - - // @Override - public boolean toggle() - { - return element.toggle(); - } - + }

12 years, 7 months

1
0
0 / 0

[forge/core] 922a5f: testRunScriptNotHostHttpUrl in RunUrlPluginTest Fa...

by GitHub

Branch: refs/heads/FORGE-547 Home: https://github.com/forge/core Commit: 922a5f22534f551c01d28c13f862c15d54363fe7 https://github.com/forge/core/commit/922a5f22534f551c01d28c13f862c15d5436... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/RunUrlPlugin.java Log Message: ----------- testRunScriptNotHostHttpUrl in RunUrlPluginTest Fails Commit: 2152f6aaaa3e3fb12a45f1b37fca929cdb32afb3 https://github.com/forge/core/commit/2152f6aaaa3e3fb12a45f1b37fca929cdb32... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M shell-api/src/main/java/org/jboss/forge/shell/Wait.java Log Message: ----------- testWaitCompletesAfterCommand in WaitTest Fails Commit: f674d9ee38c42bd31d167fb150d260da1524034e https://github.com/forge/core/commit/f674d9ee38c42bd31d167fb150d260da1524... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/command/fshparser/FSHParser.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java A shell/src/test/java/org/jboss/forge/shell/test/command/fshparser/FSHParserTest.java A shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/RmPluginTest.java Log Message: ----------- Tab completion fails to properly escape spaces in filenames Commit: 757ab6e4c7ac0809ccab11271b00427806c44d4c https://github.com/forge/core/commit/757ab6e4c7ac0809ccab11271b00427806c4... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/command/fshparser/FSHParser.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java A shell/src/test/java/org/jboss/forge/shell/test/command/fshparser/FSHParserTest.java A shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/RmPluginTest.java Log Message: ----------- Merge pull request #140 from koentsje/features/FORGE-43 Tab completion fails to properly escape spaces in filenames Commit: 74260a76e16f66c5c0fef00171775565efbda0dd https://github.com/forge/core/commit/74260a76e16f66c5c0fef00171775565efbd... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/EntityPlugin.java Log Message: ----------- Entity plugin does not pick-up created file if filename has spaces Commit: 39df9ee481589e815b60ac5da6ca5efeccd94fb0 https://github.com/forge/core/commit/39df9ee481589e815b60ac5da6ca5efeccd9... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/EntityPlugin.java Log Message: ----------- Merge pull request #142 from koentsje/FORGE-551 Entity plugin does not pick-up created file if filename has spaces Commit: 3f4089cac71fbe5fdb880b0763b03eb790a29efc https://github.com/forge/core/commit/3f4089cac71fbe5fdb880b0763b03eb790a2... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties Log Message: ----------- FORGE-541 Commit: 634708f9df978909c5709a5a17fc4cfdb6cf9eb7 https://github.com/forge/core/commit/634708f9df978909c5709a5a17fc4cfdb6cf... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java Log Message: ----------- tab completion wrongly escapes last space of a unique candidate Commit: 0713b50814735412ab4013f241c3bdc3809135dc https://github.com/forge/core/commit/0713b50814735412ab4013f241c3bdc38091... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java Log Message: ----------- Merge pull request #145 from koentsje/FORGE-555 tab completion wrongly escapes last space of a unique candidate Commit: 65aad7e1fdf3cf09b26cf3dabc47b66feef6d97b https://github.com/forge/core/commit/65aad7e1fdf3cf09b26cf3dabc47b66feef6... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java Log Message: ----------- Resolved conflict in pull request #145 Commit: e3ee8ad79996426da71d5ac546b0a0b586dd5b44 https://github.com/forge/core/commit/e3ee8ad79996426da71d5ac546b0a0b586dd... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties Log Message: ----------- Merge pull request #143 from gastaldi/feature/FORGE-541 FORGE-541 Commit: 6d0cc9367edb5ee2fd0d0ed70ca2fd851ef1c80b https://github.com/forge/core/commit/6d0cc9367edb5ee2fd0d0ed70ca2fd851ef1... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java Log Message: ----------- Fixed output messed when using Wait plugin Commit: f863165180ebe5030d822b6aece9cfa7fc68dfaf https://github.com/forge/core/commit/f863165180ebe5030d822b6aece9cfa7fc68... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/Bootstrap.java A shell/src/main/java/org/jboss/forge/shell/EvaluateListener.java Log Message: ----------- FORGE-422 Commit: 31b47dbabae8ca875ce2f4ffac903d3f81a51b28 https://github.com/forge/core/commit/31b47dbabae8ca875ce2f4ffac903d3f81a5... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java M shell/src/main/java/org/jboss/forge/shell/ShellImpl.java M test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java Log Message: ----------- FORGE-211 Commit: 29e45c79f045911be90ab5f74dc8dbc0525240cb https://github.com/forge/core/commit/29e45c79f045911be90ab5f74dc8dbc05252... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java M shell/src/main/java/org/jboss/forge/shell/ShellImpl.java M test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java Log Message: ----------- Merge pull request #146 from gastaldi/feature/FORGE-211 FORGE-211 Commit: fa22d53460e41453682e92d11fdabd4f0e8c6318 https://github.com/forge/core/commit/fa22d53460e41453682e92d11fdabd4f0e8c... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: M dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java M dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java M shell/src/main/java/org/jboss/forge/shell/ShellImpl.java M test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java Log Message: ----------- Merge branch 'master' of github.com:forge/core Commit: ec6ac2156997a4e63bc2e07e5295c0d9bb857b61 https://github.com/forge/core/commit/ec6ac2156997a4e63bc2e07e5295c0d9bb85... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java Log Message: ----------- FORGE-548 Commit: ad62f6d3231f04eeaad34e6a996765a55ab4529f https://github.com/forge/core/commit/ad62f6d3231f04eeaad34e6a996765a55ab4... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-19 (Thu, 19 Apr 2012) Changed paths: A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java Log Message: ----------- Merge pull request #141 from gastaldi/FORGE-548 FORGE-548: Created ColumnPrinter class Commit: 198beddfabe2abfb4adcdbc4c2f2c0b87db40969 https://github.com/forge/core/commit/198beddfabe2abfb4adcdbc4c2f2c0b87db4... Author: Sandro Sonntag <sso(a)adorsys.de> Date: 2012-04-21 (Sat, 21 Apr 2012) Changed paths: M maven-api/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyAdapter.java M shell-api/src/main/java/org/jboss/forge/project/dependencies/DependencyBuilder.java Log Message: ----------- Classifiers not considered correctly in dependency resolution - FORGE-526 Commit: f0e74e492f6a99cdbd249a4883f83c2ab6502de5 https://github.com/forge/core/commit/f0e74e492f6a99cdbd249a4883f83c2ab650... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-21 (Sat, 21 Apr 2012) Changed paths: A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java Log Message: ----------- Merge branch 'master' of github.com:forge/core Commit: 0696d76ac492ba78880903d0597beabe9ff44a31 https://github.com/forge/core/commit/0696d76ac492ba78880903d0597beabe9ff4... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-21 (Sat, 21 Apr 2012) Changed paths: M maven-api/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyAdapter.java M shell-api/src/main/java/org/jboss/forge/project/dependencies/DependencyBuilder.java Log Message: ----------- Merge branch 'FORGE-526' of git://github.com/xandrox/core Commit: 29456eb3f2bbf085f3c8707ada6c39e6764e3414 https://github.com/forge/core/commit/29456eb3f2bbf085f3c8707ada6c39e6764e... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-23 (Mon, 23 Apr 2012) Changed paths: M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java Log Message: ----------- ForgePlugin is a little smarter about installing the most recent version of a plugin if a direct version match cannot be found Commit: 11bd8281da099266cee2ae9d598216268d8fb034 https://github.com/forge/core/commit/11bd8281da099266cee2ae9d598216268d8f... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-23 (Mon, 23 Apr 2012) Changed paths: M dev-plugins/pom.xml M dist/pom.xml M event-bus-api/pom.xml M git-tools-tests/pom.xml M git-tools/pom.xml M javaee-api/pom.xml M javaee-impl/pom.xml M maven-api/pom.xml M parser-java-api/pom.xml M parser-java/pom.xml M parser-xml/pom.xml M plugin-loader/pom.xml M pom.xml M project-model-maven-tests/pom.xml M project-model-maven/pom.xml M scaffold-api/pom.xml M scaffold-faces/pom.xml M scaffold-plugins/pom.xml M shell-api/pom.xml M shell/pom.xml M test-harness-web/pom.xml M test-harness/pom.xml Log Message: ----------- [maven-release-plugin] prepare release 1.0.3.Final Commit: 8906f413c3a09a29fe038f66467ce3dfded05636 https://github.com/forge/core/commit/8906f413c3a09a29fe038f66467ce3dfded0... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-23 (Mon, 23 Apr 2012) Changed paths: M dev-plugins/pom.xml M dist/pom.xml M event-bus-api/pom.xml M git-tools-tests/pom.xml M git-tools/pom.xml M javaee-api/pom.xml M javaee-impl/pom.xml M maven-api/pom.xml M parser-java-api/pom.xml M parser-java/pom.xml M parser-xml/pom.xml M plugin-loader/pom.xml M pom.xml M project-model-maven-tests/pom.xml M project-model-maven/pom.xml M scaffold-api/pom.xml M scaffold-faces/pom.xml M scaffold-plugins/pom.xml M shell-api/pom.xml M shell/pom.xml M test-harness-web/pom.xml M test-harness/pom.xml Log Message: ----------- [maven-release-plugin] prepare for next development iteration Commit: 5fc0ff1e00054708afb33dbabb5a3335dba96bf3 https://github.com/forge/core/commit/5fc0ff1e00054708afb33dbabb5a3335dba9... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-24 (Tue, 24 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat Log Message: ----------- FORGE-556 Commit: ace4acce3d7e97c2126f32c796f2e45f2eea4fc6 https://github.com/forge/core/commit/ace4acce3d7e97c2126f32c796f2e45f2eea... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat Log Message: ----------- Merge pull request #149 from gastaldi/feature/FORGE-556 FORGE-556 Commit: 7910731b26e8fedf08ed078c35d50e3ca027c9d4 https://github.com/forge/core/commit/7910731b26e8fedf08ed078c35d50e3ca027... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dev-plugins/pom.xml A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java M dist/pom.xml M event-bus-api/pom.xml M git-tools-tests/pom.xml M git-tools/pom.xml M javaee-api/pom.xml M javaee-impl/pom.xml M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/EntityPlugin.java M maven-api/pom.xml M maven-api/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyAdapter.java M parser-java-api/pom.xml M parser-java/pom.xml M parser-xml/pom.xml M plugin-loader/pom.xml M pom.xml M project-model-maven-tests/pom.xml M project-model-maven/pom.xml M scaffold-api/pom.xml M scaffold-faces/pom.xml M scaffold-plugins/pom.xml M shell-api/pom.xml M shell-api/src/main/java/org/jboss/forge/project/dependencies/DependencyBuilder.java A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java M shell-api/src/main/java/org/jboss/forge/shell/Wait.java A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java M shell/pom.xml M shell/src/main/java/org/jboss/forge/shell/Bootstrap.java A shell/src/main/java/org/jboss/forge/shell/EvaluateListener.java M shell/src/main/java/org/jboss/forge/shell/ShellImpl.java M shell/src/main/java/org/jboss/forge/shell/command/fshparser/FSHParser.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/RunUrlPlugin.java A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties A shell/src/test/java/org/jboss/forge/shell/test/command/fshparser/FSHParserTest.java A shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/RmPluginTest.java M test-harness-web/pom.xml M test-harness/pom.xml M test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java Log Message: ----------- Merged from master Commit: 904cd81e366cbc67af3cfecbabb40fdc470ba89c https://github.com/forge/core/commit/904cd81e366cbc67af3cfecbabb40fdc470b... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M shell-api/src/main/java/org/jboss/forge/shell/Wait.java Log Message: ----------- Merged again Commit: 5135cfbf9efad1a1fb96882998cc19889e3cdd81 https://github.com/forge/core/commit/5135cfbf9efad1a1fb96882998cc19889e3c... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Log Message: ----------- Merge branches 'master' and 'FORGE-547' into FORGE-547 Commit: 1eeca1621f36a8609484580acb6e6f95d19653a3 https://github.com/forge/core/commit/1eeca1621f36a8609484580acb6e6f95d196... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dev-plugins/pom.xml A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/BundleCompleter.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/I18nPlugin.java A dev-plugins/src/main/java/org/jboss/forge/dev/i18n/LsBundlePlugin.java A dev-plugins/src/test/java/org/jboss/forge/dev/i18n/I18nPluginTest.java M dist/pom.xml M event-bus-api/pom.xml M git-tools-tests/pom.xml M git-tools/pom.xml M javaee-api/pom.xml M javaee-impl/pom.xml M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/EntityPlugin.java M maven-api/pom.xml M maven-api/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyAdapter.java M parser-java-api/pom.xml M parser-java/pom.xml M parser-xml/pom.xml M plugin-loader/pom.xml M pom.xml M project-model-maven-tests/pom.xml M project-model-maven/pom.xml M scaffold-api/pom.xml M scaffold-faces/pom.xml M scaffold-plugins/pom.xml M shell-api/pom.xml M shell-api/src/main/java/org/jboss/forge/project/dependencies/DependencyBuilder.java A shell-api/src/main/java/org/jboss/forge/resources/EntryResource.java A shell-api/src/main/java/org/jboss/forge/resources/PropertiesFileResource.java M shell-api/src/main/java/org/jboss/forge/shell/Wait.java A shell-api/src/main/java/org/jboss/forge/shell/util/ColumnPrinter.java M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java M shell/pom.xml M shell/src/main/java/org/jboss/forge/shell/Bootstrap.java A shell/src/main/java/org/jboss/forge/shell/EvaluateListener.java M shell/src/main/java/org/jboss/forge/shell/ShellImpl.java M shell/src/main/java/org/jboss/forge/shell/command/fshparser/FSHParser.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java M shell/src/main/java/org/jboss/forge/shell/console/jline/console/ConsoleReader.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/RunUrlPlugin.java A shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandler.properties R shell/src/main/resources/org/jboss/forge/shell/console/jline/console/completer/CandidateListCompletionHandlerBundle.properties A shell/src/test/java/org/jboss/forge/shell/test/command/fshparser/FSHParserTest.java A shell/src/test/java/org/jboss/forge/shell/test/completer/OptionAwareCompletionHandlerTest.java M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/RmPluginTest.java M test-harness-web/pom.xml M test-harness/pom.xml M test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java Log Message: ----------- Merged from master Commit: 0252009615028ed2f6a393e602f74e9dabd728b1 https://github.com/forge/core/commit/0252009615028ed2f6a393e602f74e9dabd7... Author: Koen Aers <koen.aers(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Log Message: ----------- testRunScriptNotHostHttpUrl in RunUrlPluginTest Fails Commit: 19c3105b43f056226cf40d423f1e26f73f9da574 https://github.com/forge/core/commit/19c3105b43f056226cf40d423f1e26f73f9d... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat Log Message: ----------- Merge branch 'master' of github.com:forge/core into HEAD Commit: 4fad58f92c20788e9e51928ae617d9cbc3530c27 https://github.com/forge/core/commit/4fad58f92c20788e9e51928ae617d9cbc353... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M project-model-maven/src/main/java/org/jboss/forge/maven/locators/DefaultProjectLocator.java M shell-api/src/main/java/org/jboss/forge/project/services/FacetFactory.java M shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java Log Message: ----------- Fix project factory failures and exception on tab completion Commit: e9eadf8a7338e5f7f2f08a708009c7edc0183529 https://github.com/forge/core/commit/e9eadf8a7338e5f7f2f08a708009c7edc018... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat M project-model-maven/src/main/java/org/jboss/forge/maven/locators/DefaultProjectLocator.java M shell-api/src/main/java/org/jboss/forge/project/services/FacetFactory.java M shell-api/src/main/java/org/jboss/forge/project/services/ProjectFactory.java M shell/src/main/java/org/jboss/forge/shell/completer/OptionAwareCompletionHandler.java Log Message: ----------- Merge branch 'temp' into FORGE-547 Compare: https://github.com/forge/core/compare/03522a5...e9eadf8

12 years, 7 months

1
0
0 / 0

[forge/core] 5fc0ff: FORGE-556

by GitHub

Branch: refs/heads/master Home: https://github.com/forge/core Commit: 5fc0ff1e00054708afb33dbabb5a3335dba96bf3 https://github.com/forge/core/commit/5fc0ff1e00054708afb33dbabb5a3335dba9... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-24 (Tue, 24 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat Log Message: ----------- FORGE-556 Commit: ace4acce3d7e97c2126f32c796f2e45f2eea4fc6 https://github.com/forge/core/commit/ace4acce3d7e97c2126f32c796f2e45f2eea... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-25 (Wed, 25 Apr 2012) Changed paths: M dist/src/main/resources/bin/forge M dist/src/main/resources/bin/forge.bat Log Message: ----------- Merge pull request #149 from gastaldi/feature/FORGE-556 FORGE-556 Compare: https://github.com/forge/core/compare/8906f41...ace4acc

12 years, 7 months

1
0
0 / 0

Seam SVN: r14636 - in branches/community/Seam_2_3/examples-ee6/tasks: tasks-ear/src/main/application/META-INF and 3 other directories.

by seam-commits＠lists.jboss.org

Author: rsmeral Date: 2012-04-25 03:46:15 -0400 (Wed, 25 Apr 2012) New Revision: 14636 Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java Log: tasks: back to jettison Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml 2012-04-24 15:50:50 UTC (rev 14635) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml 2012-04-25 07:46:15 UTC (rev 14636) @@ -64,16 +64,6 @@ <artifactId>jboss-seam</artifactId> <bundleFileName>jboss-seam.jar</bundleFileName> </ejbModule> - </modules> </configuration> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-24 15:50:50 UTC (rev 14635) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-25 07:46:15 UTC (rev 14636) @@ -5,5 +5,13 @@ <module name="org.apache.commons.collections" export="true"/> <module name="javax.faces.api" export="true"/> </dependencies> + <exclusions> + <module name="org.jboss.resteasy.resteasy-jackson-provider" slot="main"/> + </exclusions> </deployment> + <sub-deployment name="tasks-web.war"> + <exclusions> + <module name="org.jboss.resteasy.resteasy-jackson-provider" slot="main"/> + </exclusions> + </sub-deployment> </jboss-deployment-structure> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-04-24 15:50:50 UTC (rev 14635) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-04-25 07:46:15 UTC (rev 14636) @@ -53,45 +53,13 @@ <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jaxrs</artifactId> <scope>provided</scope> - <version>2.3.2.Final</version> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-atom-provider</artifactId> <scope>provided</scope> - <version>2.3.2.Final</version> </dependency> <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jackson-provider</artifactId> - <version>2.3.2.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxb-provider</artifactId> - <version>2.3.2.Final</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>1.9.2</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.2</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.9.2</version> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - <version>1.9.2</version> - </dependency> - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-resteasy</artifactId> <exclusions> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-04-24 15:50:50 UTC (rev 14635) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-04-25 07:46:15 UTC (rev 14636) @@ -37,9 +37,6 @@ import javax.xml.bind.annotation.XmlTransient; import javax.validation.constraints.NotNull; -import org.codehaus.jackson.annotate.JsonBackReference; -import org.codehaus.jackson.annotate.JsonManagedReference; -import org.jboss.resteasy.annotations.providers.jaxb.IgnoreMediaTypes; /** * @@ -95,7 +92,6 @@ @OneToMany(mappedBy = "category", cascade = CascadeType.REMOVE) @XmlTransient - @JsonManagedReference("category-task") public List<Task> getTasks() { return tasks; @@ -108,7 +104,6 @@ @ManyToOne @XmlTransient - @JsonBackReference("category-owner") public User getOwner() { return owner; Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-04-24 15:50:50 UTC (rev 14635) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-04-25 07:46:15 UTC (rev 14636) @@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlTransient; import javax.validation.constraints.NotNull; -import org.codehaus.jackson.annotate.JsonBackReference; /** * @@ -109,7 +108,6 @@ @ManyToOne @XmlTransient @NotNull - @JsonBackReference("category-task") public Category getCategory() { return category; @@ -128,7 +126,6 @@ } @Transient - @JsonBackReference("task-owner") public User getOwner() { return category.getOwner(); } Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java 2012-04-24 15:50:50 UTC (rev 14635) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java 2012-04-25 07:46:15 UTC (rev 14636) @@ -30,7 +30,6 @@ import javax.xml.bind.annotation.XmlTransient; import javax.validation.constraints.NotNull; -import org.codehaus.jackson.annotate.JsonManagedReference; /** * @@ -70,7 +69,6 @@ @OneToMany(mappedBy = "owner") @XmlTransient - @JsonManagedReference("category-owner") public List<Category> getCategories() { return categories; Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-24 15:50:50 UTC (rev 14635) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-25 07:46:15 UTC (rev 14636) @@ -61,7 +61,7 @@ public void createTaskTest() throws Exception { final String mimeType = "application/json"; - final String representation = "{\"name\":\"Test task\"}"; + final String representation = "{\"task\":{\"name\":\"Test task\"}}"; new ResourceRequest(new ResourceRequestEnvironment(this), Method.POST, "/v1/auth/category/School/unresolved") {

12 years, 7 months

1
0
0 / 0

Seam SVN: r14635 - in branches/community/Seam_2_3/examples-ee6/tasks: tasks-ear/src/main/application/META-INF and 3 other directories.

by seam-commits＠lists.jboss.org

Author: rsmeral Date: 2012-04-24 11:50:50 -0400 (Tue, 24 Apr 2012) New Revision: 14635 Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java Log: tasks example using Jackson Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml 2012-04-24 08:41:21 UTC (rev 14634) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/pom.xml 2012-04-24 15:50:50 UTC (rev 14635) @@ -30,14 +30,6 @@ <type>ejb</type> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-atom-provider</artifactId> - </dependency> </dependencies> @@ -72,7 +64,7 @@ <artifactId>jboss-seam</artifactId> <bundleFileName>jboss-seam.jar</bundleFileName> </ejbModule> - <jarModule> + </modules> </configuration> Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF ___________________________________________________________________ Added: svn:ignore + .jboss-deployment-structure.xml .jboss-deployment-structure.xml.bak .jboss-deployment-structure.xml.kate-swp Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-24 08:41:21 UTC (rev 14634) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-24 15:50:50 UTC (rev 14635) @@ -5,18 +5,5 @@ <module name="org.apache.commons.collections" export="true"/> <module name="javax.faces.api" export="true"/> </dependencies> - <exclusions> - <module name="org.jboss.resteasy.resteasy-jaxrs" slot="main"/> - <module name="org.jboss.resteasy.resteasy-jettison-provider" slot="main"/> - <module name="org.jboss.resteasy.resteasy-jaxb-provider" slot="main"/> - </exclusions> </deployment> - <sub-deployment name="tasks-web.war"> - <exclusions> - <module name="org.jboss.resteasy.resteasy-jaxrs" slot="main"/> - <module name="org.jboss.resteasy.resteasy-jettison-provider" slot="main"/> - <module name="org.jboss.resteasy.resteasy-jaxb-provider" slot="main"/> - <module name="org.jboss.resteasy.resteasy-yaml-provider" slot="main"/> - </exclusions> - </sub-deployment> </jboss-deployment-structure> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-04-24 08:41:21 UTC (rev 14634) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-04-24 15:50:50 UTC (rev 14635) @@ -53,13 +53,45 @@ <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jaxrs</artifactId> <scope>provided</scope> + <version>2.3.2.Final</version> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-atom-provider</artifactId> <scope>provided</scope> + <version>2.3.2.Final</version> </dependency> <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jackson-provider</artifactId> + <version>2.3.2.Final</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxb-provider</artifactId> + <version>2.3.2.Final</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-resteasy</artifactId> <exclusions> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-04-24 08:41:21 UTC (rev 14634) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-04-24 15:50:50 UTC (rev 14635) @@ -37,6 +37,9 @@ import javax.xml.bind.annotation.XmlTransient; import javax.validation.constraints.NotNull; +import org.codehaus.jackson.annotate.JsonBackReference; +import org.codehaus.jackson.annotate.JsonManagedReference; +import org.jboss.resteasy.annotations.providers.jaxb.IgnoreMediaTypes; /** * @@ -92,6 +95,7 @@ @OneToMany(mappedBy = "category", cascade = CascadeType.REMOVE) @XmlTransient + @JsonManagedReference("category-task") public List<Task> getTasks() { return tasks; @@ -104,6 +108,7 @@ @ManyToOne @XmlTransient + @JsonBackReference("category-owner") public User getOwner() { return owner; Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-04-24 08:41:21 UTC (rev 14634) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-04-24 15:50:50 UTC (rev 14635) @@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlTransient; import javax.validation.constraints.NotNull; +import org.codehaus.jackson.annotate.JsonBackReference; /** * @@ -108,6 +109,7 @@ @ManyToOne @XmlTransient @NotNull + @JsonBackReference("category-task") public Category getCategory() { return category; @@ -126,6 +128,7 @@ } @Transient + @JsonBackReference("task-owner") public User getOwner() { return category.getOwner(); } Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java 2012-04-24 08:41:21 UTC (rev 14634) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/User.java 2012-04-24 15:50:50 UTC (rev 14635) @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlTransient; import javax.validation.constraints.NotNull; +import org.codehaus.jackson.annotate.JsonManagedReference; /** * @@ -69,6 +70,7 @@ @OneToMany(mappedBy = "owner") @XmlTransient + @JsonManagedReference("category-owner") public List<Category> getCategories() { return categories; Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-24 08:41:21 UTC (rev 14634) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-24 15:50:50 UTC (rev 14635) @@ -61,7 +61,7 @@ public void createTaskTest() throws Exception { final String mimeType = "application/json"; - final String representation = "{\"task\":{\"name\":\"Test task\"}}"; + final String representation = "{\"name\":\"Test task\"}"; new ResourceRequest(new ResourceRequestEnvironment(this), Method.POST, "/v1/auth/category/School/unresolved") {

12 years, 7 months

1
0
0 / 0

Seam SVN: r14634 - in branches/community/Seam_2_3/seam-integration-tests: src/test/java/org/jboss/seam/test/integration and 1 other directory.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-24 04:41:21 -0400 (Tue, 24 Apr 2012) New Revision: 14634 Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java Log: seam-integration-tests, getting rid of the shrinkwrap maven resolver Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-04-23 18:07:09 UTC (rev 14633) +++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-04-24 08:41:21 UTC (rev 14634) @@ -10,6 +10,8 @@ <artifactId>seam-integration-tests</artifactId> <name>Seam Integration Tests</name> +  + <packaging>war</packaging> <build> <testResources> @@ -60,72 +62,68 @@ <dependencies> <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + </exclusion> + </exclusions> </dependency> - + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - + <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>test</scope> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> + <scope>provided</scope> </dependency> - + <dependency> - <groupId>org.jboss.spec.javax.jms</groupId> - <artifactId>jboss-jms-api_1.1_spec</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.0_spec</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - </dependency> - + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>org.jboss.arquillian.protocol</groupId> <artifactId>arquillian-protocol-servlet</artifactId> <scope>test</scope> </dependency> - + <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api-maven</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> @@ -136,14 +134,17 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> + <scope>provided</scope> </dependency> - + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-04-23 18:07:09 UTC (rev 14633) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-04-24 08:41:21 UTC (rev 14634) @@ -1,80 +1,64 @@ package org.jboss.seam.test.integration; -import org.jboss.seam.test.integration.bpm.SeamExpressionEvaluatorTestController; -import org.jboss.shrinkwrap.api.Archive; +import java.io.File; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.importer.ZipImporter; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.resolver.api.DependencyResolvers; -import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver; - public class Deployments { - public static WebArchive defaultSeamDeployment() { - return ShrinkWrap.create(WebArchive.class, "test.war") - .addAsWebInfResource(new StringAsset( - "<jboss-deployment-structure>" + - "<deployment>" + - "<dependencies>" + - "<module name=\"org.javassist\"/>" + - "<module name=\"org.dom4j\"/>" + - "</dependencies>" + - "</deployment>" + - "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") - .addAsResource("seam.properties") - .addAsResource("components.properties") - .addAsResource("messages_en.properties") - .addAsResource("META-INF/persistence.xml") - - .addAsResource("hibernate.cfg.xml") - .addAsWebInfResource("WEB-INF/components.xml", "components.xml") - .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") - .addAsWebInfResource("WEB-INF/web.xml", "web.xml") - .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") - - .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) - .configureFrom("pom.xml") - .goOffline() - .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta2-SNAPSHOT") - .resolveAsFiles()); - } - - public static WebArchive jbpmSeamDeployment() { - return ShrinkWrap.create(WebArchive.class, "test.war") - .addAsWebInfResource(new StringAsset( - "<jboss-deployment-structure>" + - "<deployment>" + - "<dependencies>" + - "<module name=\"org.javassist\"/>" + - "<module name=\"org.dom4j\"/>" + - "<module name=\"org.apache.commons.collections\"/>" + - "</dependencies>" + - "</deployment>" + - "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") - .addAsResource("seam.properties") - .addAsResource("components.properties") - .addAsResource("messages_en.properties") - .addAsResource("META-INF/persistence.xml") - - .addAsResource("testProcess1.jpdl.xml") - .addAsResource("testProcess2.jpdl.xml") - .addAsResource("testProcess3.jpdl.xml") - .addAsResource("testProcess4.jpdl.xml") + public static WebArchive defaultSeamDeployment() { + return ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class) + .addAsWebInfResource(new StringAsset( + "<jboss-deployment-structure>" + + "<deployment>" + + "<dependencies>" + + "<module name=\"org.javassist\"/>" + + "<module name=\"org.dom4j\"/>" + + "</dependencies>" + + "</deployment>" + + "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") + .addAsResource("seam.properties") + .addAsResource("components.properties") + .addAsResource("messages_en.properties") + .addAsResource("META-INF/persistence.xml") - .addAsResource("jbpm.cfg.xml") - - .addAsResource("hibernate.cfg.xml") - .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml") - .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") - .addAsWebInfResource("WEB-INF/web.xml", "web.xml") - .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") - - .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) - .configureFrom("pom.xml") - .goOffline() - .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta2-SNAPSHOT") - .artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3_seam2") - .exclusion("org.hibernate:hibernate-core") - .resolveAsFiles()); - } + .addAsResource("hibernate.cfg.xml") + .addAsWebInfResource("WEB-INF/components.xml", "components.xml") + .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") + .addAsWebInfResource("WEB-INF/web.xml", "web.xml") + .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml"); + } + + public static WebArchive jbpmSeamDeployment() { + return ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class) + .addAsWebInfResource(new StringAsset( + "<jboss-deployment-structure>" + + "<deployment>" + + "<dependencies>" + + "<module name=\"org.javassist\"/>" + + "<module name=\"org.dom4j\"/>" + + "<module name=\"org.apache.commons.collections\"/>" + + "</dependencies>" + + "</deployment>" + + "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") + .addAsResource("seam.properties") + .addAsResource("components.properties") + .addAsResource("messages_en.properties") + .addAsResource("META-INF/persistence.xml") + + .addAsResource("testProcess1.jpdl.xml") + .addAsResource("testProcess2.jpdl.xml") + .addAsResource("testProcess3.jpdl.xml") + .addAsResource("testProcess4.jpdl.xml") + + .addAsResource("jbpm.cfg.xml") + + .addAsResource("hibernate.cfg.xml") + .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml") + .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") + .addAsWebInfResource("WEB-INF/web.xml", "web.xml") + .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml"); + } }

12 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits April 2012