diff options
| author | Jesse McConnell | 2014-06-09 18:07:22 +0000 |
|---|---|---|
| committer | Jesse McConnell | 2014-06-09 18:07:22 +0000 |
| commit | 10b6c574aeaf159398313eae6e3d4d3f31336ea0 (patch) | |
| tree | 58465c294e4d02064e51a48d37ac506ebdcc3af5 /jetty-quickstart | |
| parent | 2e859e4ae2d5ae821f40931861b7e3bcab6c4751 (diff) | |
| parent | 0d64434b277865862b2c836f956679068816c134 (diff) | |
| download | org.eclipse.jetty.project-10b6c574aeaf159398313eae6e3d4d3f31336ea0.tar.gz org.eclipse.jetty.project-10b6c574aeaf159398313eae6e3d4d3f31336ea0.tar.xz org.eclipse.jetty.project-10b6c574aeaf159398313eae6e3d4d3f31336ea0.zip | |
Merge branch 'master' into release-9
Diffstat (limited to 'jetty-quickstart')
3 files changed, 8 insertions, 6 deletions
diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 94f7a1d7a9..2a08a0b9a1 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -41,11 +41,13 @@ <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-mock-resources</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.mail.glassfish</artifactId> <version>1.4.1.v201005082020</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureDescriptorProcessor.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureDescriptorProcessor.java index 627277e2eb..d49bc0c3c2 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureDescriptorProcessor.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/PreconfigureDescriptorProcessor.java @@ -45,11 +45,11 @@ public class PreconfigureDescriptorProcessor extends IterativeDescriptorProcesso _showOrigin=LOG.isDebugEnabled(); try { - registerVisitor("env-entry", getClass().getDeclaredMethod("saveSnippet", __signature)); - registerVisitor("resource-ref", getClass().getDeclaredMethod("saveSnippet", __signature)); - registerVisitor("resource-env-ref", getClass().getDeclaredMethod("saveSnippet", __signature)); - registerVisitor("message-destination-ref", getClass().getDeclaredMethod("saveSnippet", __signature)); - registerVisitor("data-source", getClass().getDeclaredMethod("saveSnippet", __signature)); + registerVisitor("env-entry", getClass().getMethod("saveSnippet", __signature)); + registerVisitor("resource-ref", getClass().getMethod("saveSnippet", __signature)); + registerVisitor("resource-env-ref", getClass().getMethod("saveSnippet", __signature)); + registerVisitor("message-destination-ref", getClass().getMethod("saveSnippet", __signature)); + registerVisitor("data-source", getClass().getMethod("saveSnippet", __signature)); } catch (Exception e) { diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java index 7e5a6c849b..f63d2381a3 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorProcessor.java @@ -51,7 +51,7 @@ public class QuickStartDescriptorProcessor extends IterativeDescriptorProcessor { try { - registerVisitor("context-param", this.getClass().getDeclaredMethod("visitContextParam", __signature)); + registerVisitor("context-param", this.getClass().getMethod("visitContextParam", __signature)); } catch (Exception e) { |