Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #10437 - Unify Deployer ContextProvider #12583

Open
wants to merge 26 commits into
base: jetty-12.1.x
Choose a base branch
from
Open

Issue #10437 - Unify Deployer ContextProvider #12583

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift click to select a range
8878567
Initial pass at implementation of EnvironmentContextProvider
joakime Nov 22, 2024
3a46e37
Fixing javadoc errors
joakime Nov 22, 2024
c5c07c2
Moving things around
joakime Nov 25, 2024
e0bdeb3
Moving changes back into ContextProvider
joakime Nov 25, 2024
7588d5f
Introducing ContextProvider.configureEnvironment(String name)
joakime Nov 25, 2024
42015b3
Fixing <env>[-zzz].properties sorting
joakime Nov 26, 2024
f9c90ce
Allow an Environment to be removed (needed for testing with Environment)
joakime Nov 26, 2024
83fc5f1
Fixing test cases
joakime Nov 26, 2024
a0c9058
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Nov 27, 2024
249679f
Fix javadoc
joakime Nov 27, 2024
bef04d9
Fix method names
joakime Nov 27, 2024
add337a
Fixing Environment contextClass loading
joakime Nov 27, 2024
2e9660d
Fixing test cases
joakime Nov 27, 2024
9bfab80
Fixing quickstart XML references to provider
joakime Nov 27, 2024
2c651ea
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Dec 2, 2024
0e534f7
Fixing quickstart XML
joakime Dec 2, 2024
43eb679
Fixing deploy containerScanJarPattern for ee9/ee8
joakime Dec 2, 2024
c5a00b8
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Dec 2, 2024
229e358
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/un…
joakime Dec 18, 2024
a363189
Changes from reviews. Preparing for BulkListener impl.
joakime Dec 18, 2024
5f6d504
Using BulkListener with sorted paths for alphabetical deployment.
joakime Dec 18, 2024
77c34c2
Changes from review
joakime Dec 18, 2024
5306c3d
More changes from review
joakime Dec 18, 2024
96d5bec
Simplify else
joakime Dec 19, 2024
ee18845
Reworking deploy.createContextHandler to be easier to follow
joakime Dec 20, 2024
e498f2c
Fixing WebAppContext default-context-path mistake
joakime Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing quickstart XML references to provider
  • Loading branch information
@joakime
joakime committed Nov 27, 2024
commit 9bfab80f1290d76f476a1d01a499948cf86db1cf
25 changes: 18 additions & 7 deletions jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 7,23 @@
<Arg><Property name="jetty.quickstart.mode"/></Arg>
</Call>

<Ref refid="WebAppProvider-ee10">
<Get name="properties">
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
</Get>
</Ref>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
<Arg>
<Property name="jetty.quickstart.mode" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
<Arg>
<Property name="jetty.quickstart.origin" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
<Arg>
<Property name="jetty.quickstart.xml" />
</Arg>
</Call>

</Configure>
26 changes: 18 additions & 8 deletions jetty-ee11/jetty-ee11-quickstart/src/main/config/etc/jetty-ee11-quickstart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 7,22 @@
<Arg><Property name="jetty.quickstart.mode"/></Arg>
</Call>

<Ref refid="WebAppProvider">
<Get name="properties">
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
</Get>
</Ref>

<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
<Arg>
<Property name="jetty.quickstart.mode" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
<Arg>
<Property name="jetty.quickstart.origin" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
<Arg>
<Property name="jetty.quickstart.xml" />
</Arg>
</Call>
</Configure>
25 changes: 18 additions & 7 deletions jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 7,23 @@
<Arg><Property name="jetty.quickstart.mode"/></Arg>
</Call>

<Ref refid="WebAppProvider-ee8">
<Get name="properties">
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
</Get>
</Ref>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
<Arg>
<Property name="jetty.quickstart.mode" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
<Arg>
<Property name="jetty.quickstart.origin" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
<Arg>
<Property name="jetty.quickstart.xml" />
</Arg>
</Call>

</Configure>
25 changes: 18 additions & 7 deletions jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 7,23 @@
<Arg><Property name="jetty.quickstart.mode"/></Arg>
</Call>

<Ref refid="WebAppProvider-ee9">
<Get name="properties">
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
<Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
</Get>
</Ref>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
<Arg>
<Property name="jetty.quickstart.mode" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
<Arg>
<Property name="jetty.quickstart.origin" />
</Arg>
</Call>
<Call name="setAttribute">
<Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
<Arg>
<Property name="jetty.quickstart.xml" />
</Arg>
</Call>

</Configure>