You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2019/12/05 16:40:44 UTC
[tomcat] branch master updated: Move SSI component into separate
JAR file.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 3554723 Move SSI component into separate JAR file.
3554723 is described below
commit 3554723117122fb520c72b6c4a828d5f146d8c40
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Thu Dec 5 11:39:36 2019 -0500
Move SSI component into separate JAR file.
---
build.xml | 18 ++++++++++++++++++
res/bnd/catalina-ssi.jar.tmp.bnd | 19 +++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/build.xml b/build.xml
index 3d1318e..fbe0311 100644
--- a/build.xml
+++ b/build.xml
@@ -110,6 +110,7 @@
<property name="tomcat-websocket.jar" value="${tomcat.build}/lib/tomcat-websocket.jar"/>
<property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
<property name="catalina-tribes.jar" value="${tomcat.build}/lib/catalina-tribes.jar"/>
+ <property name="catalina-ssi.jar" value="${tomcat.build}/lib/catalina-ssi.jar"/>
<property name="catalina-ha.jar" value="${tomcat.build}/lib/catalina-ha.jar"/>
<property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/>
<property name="catalina-storeconfig.jar" value="${tomcat.build}/lib/catalina-storeconfig.jar"/>
@@ -136,6 +137,7 @@
<property name="tomcat-websocket-src.jar" value="${tomcat.src.jars}/tomcat-websocket-src.jar"/>
<property name="catalina-src.jar" value="${tomcat.src.jars}/catalina-src.jar"/>
<property name="catalina-tribes-src.jar" value="${tomcat.src.jars}/catalina-tribes-src.jar"/>
+ <property name="catalina-ssi-src.jar" value="${tomcat.src.jars}/catalina-ssi-src.jar"/>
<property name="catalina-ha-src.jar" value="${tomcat.src.jars}/catalina-ha-src.jar"/>
<property name="catalina-ant-src.jar" value="${tomcat.src.jars}/catalina-ant-src.jar"/>
<property name="catalina-storeconfig-src.jar" value="${tomcat.src.jars}/catalina-storeconfig-src.jar"/>
@@ -420,12 +422,17 @@
<exclude name="org/apache/catalina/ha/**" />
<exclude name="org/apache/catalina/tribes/**" />
<exclude name="org/apache/catalina/storeconfig/**" />
+ <exclude name="org/apache/catalina/ssi/**" />
</patternset>
<patternset id="files.catalina-tribes">
<include name="org/apache/catalina/tribes/**" />
</patternset>
+ <patternset id="files.catalina-ssi">
+ <include name="org/apache/catalina/ssi/**" />
+ </patternset>
+
<patternset id="files.catalina-ha">
<include name="org/apache/catalina/ha/**" />
</patternset>
@@ -834,6 +841,12 @@
filesId="files.catalina-tribes"
addOSGi="true" />
+ <!-- Server-Side Includes (SSI) -->
+ <jarIt jarfile="${catalina-ssi.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.catalina-ssi"
+ addOSGi="true" />
+
<!-- Catalina Cluster/HA JAR File -->
<jarIt jarfile="${catalina-ha.jar}"
filesDir="${tomcat.classes}"
@@ -2644,6 +2657,11 @@ skip.installer property in build.properties" />
filesDir="java"
filesId="files.catalina-tribes" />
+ <!-- Catalina SSI JAR File -->
+ <jarIt jarfile="${catalina-ssi-src.jar}"
+ filesDir="java"
+ filesId="files.catalina-ssi" />
+
<!-- Catalina Cluster/HA JAR File -->
<jarIt jarfile="${catalina-ha-src.jar}"
filesDir="java"
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
new file mode 100644
index 0000000..c17840d
--- /dev/null
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Bundle-Name: tomcat-ssi
+Bundle-SymbolicName: org.apache.tomcat-ssi
+Bundle-Version: @VERSION@
+Export-Package: \
+ org.apache.catalina.ssi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate
JAR file.
Posted by Mark Thomas <ma...@apache.org>.
On 06/12/2019 17:48, Christopher Schultz wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Mark,
>
> On 12/6/19 12:12, Mark Thomas wrote:
>> On 06/12/2019 16:52, Christopher Schultz wrote:
>>
>> <snip/>
>>
>>> Let me know if that's all good.
>>
>> Thanks.
>>
>> Looks good to me from a quick scan.
>>
>> I'll let the CI system run as it does a Maven deploy of a snapshot
>> so we should be able to use that to check the Maven artefacts.
>>
>> Scratch that. The CI has already run. Looks like it built. Woot!
>>
>> Only query is the POM correct for dependencies? The OSGI
>> import/export package info BND added to the manifest doesn't agree
>> with the POM.
>
> Which parts? I'm not sure what I'm looking for.
>
> tomcat-ssi.pom contains the wrong <description> -- I copied from
> tomcat-tribes and forgot to change that, so I'll fix that.
Thanks. I didn;'t even see that.
> BND contains:
>
> Bundle-Name: tomcat-ssi
> Bundle-SymbolicName: org.apache.tomcat-ssi
> Bundle-Version: @VERSION@
> Export-Package: \
> org.apache.catalina.ssi
More stuff gets added to that during the build and placed in the manifest.
> POM contains:
>
> <artifactId>tomcat-ssi</artifactId>
>
> Oh. My POM looks like it's missing a bunch of things such as a
> dependency on Tomcat itself. I believe we need:
>
> tomcat-catalina
> tomcat-util
> tomcat-coyote
>
> (I'd like to work to remove that last one soon if possible.)
>
> Just add those to the POM?
Correct. There is a dependency on the servlet API too but we'll get that
via the deps you've already listed.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate
JAR file.
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Mark,
On 12/6/19 12:12, Mark Thomas wrote:
> On 06/12/2019 16:52, Christopher Schultz wrote:
>
> <snip/>
>
>> Let me know if that's all good.
>
> Thanks.
>
> Looks good to me from a quick scan.
>
> I'll let the CI system run as it does a Maven deploy of a snapshot
> so we should be able to use that to check the Maven artefacts.
>
> Scratch that. The CI has already run. Looks like it built. Woot!
>
> Only query is the POM correct for dependencies? The OSGI
> import/export package info BND added to the manifest doesn't agree
> with the POM.
Which parts? I'm not sure what I'm looking for.
tomcat-ssi.pom contains the wrong <description> -- I copied from
tomcat-tribes and forgot to change that, so I'll fix that.
BND contains:
Bundle-Name: tomcat-ssi
Bundle-SymbolicName: org.apache.tomcat-ssi
Bundle-Version: @VERSION@
Export-Package: \
org.apache.catalina.ssi
POM contains:
<artifactId>tomcat-ssi</artifactId>
Oh. My POM looks like it's missing a bunch of things such as a
dependency on Tomcat itself. I believe we need:
tomcat-catalina
tomcat-util
tomcat-coyote
(I'd like to work to remove that last one soon if possible.)
Just add those to the POM?
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl3qlIEACgkQHPApP6U8
pFjOiBAAyd8FOqWSPAiXAnaz3p28MUNFpMJsq5TH9QIBz8DHJChXDbs5QjjsKMT+
hlNsqfYF28wmy1JVBPuDrbN/XDCkWnm84cDIqNcvrUEgngWjEwoz8zbDYT/bQgBz
RqAEKG8Oh5nWsaO4qjXSFltyrp8IG2p+m+RaoOx9l8vhG6jsZYaRY+DJfgBj6l3m
h4rLOmvQ2XTDpd3RWAeM+3+UoqZ7e74SQbtCuEAgC9e1lAyU65yq3o9hivoUeuHi
xrMptzE+ldrcccLJHqOhvXYovMxLOFs2Rv/iuz3cQ7qJoFrM5MNJAgEg6IMEF7R2
hZEivFNsjwtF/EfBXqsyy+apD6TyE7sG72hA7Sl9xMud01Gb98FU8PJjEWGZ4BDy
t97yAs02g18L6Dnd+PF4MNsCMwevbB/2Jvwn3rW3U3vQbEk2km7EaB2eUb6s2mRF
4pee3iZUqJ3fhpVRNpgQkIurtWxlrBHNyLTgj94Onx+53oUwcvFFwh6peq3FIuMr
JggvXSarEASMr0iLMsMLAsuMN2a1cPnVa9rHCBgnZMHh4YHA+E5meOXGueDbr7Nr
PnCEMvm17xQhhZNqGBsEOKniV39dtxd7i2MoS5RjEQrxTlH9Dy558gIsLthRDfN4
11D5LVD5APKBk8A598Ts5nD5U6wdoD1IJnI39S72nDsiW6Gh9HY=
=HkYW
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate
JAR file.
Posted by Mark Thomas <ma...@apache.org>.
On 06/12/2019 16:52, Christopher Schultz wrote:
<snip/>
> Let me know if that's all good.
Thanks.
Looks good to me from a quick scan.
I'll let the CI system run as it does a Maven deploy of a snapshot so we
should be able to use that to check the Maven artefacts.
Scratch that. The CI has already run. Looks like it built. Woot!
Only query is the POM correct for dependencies? The OSGI import/export
package info BND added to the manifest doesn't agree with the POM.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate
JAR file.
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Mark,
On 12/5/19 18:51, Mark Thomas wrote:
> On 05/12/2019 23:03, Christopher Schultz wrote:
>> Mark,
>>
>> On 12/5/19 11:46, Mark Thomas wrote:
>>> On 05/12/2019 16:40, schultz@apache.org wrote:
>>>> This is an automated email from the ASF dual-hosted git
>>>> repository.
>>>>
>>>> schultz pushed a commit to branch master in repository
>>>> https://gitbox.apache.org/repos/asf/tomcat.git
>>>>
>>>>
>>>> The following commit(s) were added to refs/heads/master by
>>>> this push: new 3554723 Move SSI component into separate JAR
>>>> file. 3554723 is described below
>>>>
>>>> commit 3554723117122fb520c72b6c4a828d5f146d8c40 Author:
>>>> Christopher Schultz <ch...@christopherschultz.net>
>>>> AuthorDate: Thu Dec 5 11:39:36 2019 -0500
>>>>
>>>> Move SSI component into separate JAR file. --- build.xml | 18
>>>> ++++++++++++++++++ res/bnd/catalina-ssi.jar.tmp.bnd | 19
>>>> +++++++++++++++++++
>>
>>> You need a pom in res/maven as well.
>>
>> Okay, thanks.
>>
>> Time to dive into what that will take as well.
>>
>> So, like res/maven/tomcat-ssi.pom? How do I wire that into
>> whatever process kicks off e.g. tomcat-tribes.pom? In
>> mvn-pub.xml? Something like this?
>>
>> <doMavenInstall artifactId="tomcat-ssi"
>> jarFileName="catalina-ssi.jar"
>> srcJarFileName="catalina-ssi-src.jar"/>
>>
>> ... <doMavenDeploy artifactId="tomcat-ssi"
>> jarFileName="catalina-ssi.jar"
>> srcJarFileName="catalina-ssi-src.jar"/>
>
> Looks about right.
Done.
> You'll also need to add to: - list of JARs in
> conf/catalina.properties
Done.
> - list of JARs in org/apache/catalina/startup/catalina.properties
> (one of those may be copied from the other - I forget)
This is the copy.
> - webapps/docs/class-loader-howto.xml
Done.
> - RELEASE-NOTES
Done.
Also, changelog :)
Let me know if that's all good.
Thanks,
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl3qhzIACgkQHPApP6U8
pFiY8A/9HxOpy7TCs+Y/nJBNuOArnR4dByXJ1u0iFe8OfFvhgGQ47GMfs4iksZKB
CV5tNi1YwB7R23QVA7cYfYr7eXBhrgQuZ4hWfyqNgg6Qq05lz+TYiW2EOPPv+CeI
l29kWo0R+TvdlRj2O/VlKphtpvYzUajkpSmN6PjeSL1Nm5ZCF2VNzF+emEK7PfLN
CurSjcVGbzOWOlyzLSO0BIsa/xkoRGd3G8NLWHzqn3CnKGmbimOaDv5MP4seqN29
BFFombeU0a+hKfDpNTdXsUf7fo2Nox+bCcuIVtnrd2dGK59FgOl/lIzT0waajDdk
GdKPySgAWBOzG0W6KcbGUt1odxuJcI/JryjcQMXVBSbB6YNVShWFOJfTZ7Cg0EUC
KIOm6oUy2CGNsmFG0FTyxLZRfy4IyW4xJsCq3ainwRBMbE5xmCM87KTozii6+uAY
HiBkDL+y52/6CzZwPeLREbG0uiSYd/GKaJy0J5+0hsCOxiznSKZ5w6fSIyv3hNoX
mqWcMmK6Amxyg+uicODPrB1wEVFAWF3PcsYureum9h1SwYjFB7pyT/MDgKW5VpkD
qi+X/Vb3XJ6kS2eWHGCM8c9rM/GbBOw2zah5AuYaPa2cnb+sa8Gy7W045xDqv9lq
j+DWJ0ysf9CFyERneu3mdTEIGzQb1lQZ/2xNjYHM9vwMVSDWfdI=
=T2Uy
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate
JAR file.
Posted by Mark Thomas <ma...@apache.org>.
On 05/12/2019 23:03, Christopher Schultz wrote:
> Mark,
>
> On 12/5/19 11:46, Mark Thomas wrote:
>> On 05/12/2019 16:40, schultz@apache.org wrote:
>>> This is an automated email from the ASF dual-hosted git
>>> repository.
>>>
>>> schultz pushed a commit to branch master in repository
>>> https://gitbox.apache.org/repos/asf/tomcat.git
>>>
>>>
>>> The following commit(s) were added to refs/heads/master by this
>>> push: new 3554723 Move SSI component into separate JAR file.
>>> 3554723 is described below
>>>
>>> commit 3554723117122fb520c72b6c4a828d5f146d8c40 Author:
>>> Christopher Schultz <ch...@christopherschultz.net> AuthorDate:
>>> Thu Dec 5 11:39:36 2019 -0500
>>>
>>> Move SSI component into separate JAR file. --- build.xml
>>> | 18 ++++++++++++++++++ res/bnd/catalina-ssi.jar.tmp.bnd | 19
>>> +++++++++++++++++++
>
>> You need a pom in res/maven as well.
>
> Okay, thanks.
>
> Time to dive into what that will take as well.
>
> So, like res/maven/tomcat-ssi.pom? How do I wire that into whatever
> process kicks off e.g. tomcat-tribes.pom? In mvn-pub.xml? Something
> like this?
>
> <doMavenInstall artifactId="tomcat-ssi"
> jarFileName="catalina-ssi.jar"
> srcJarFileName="catalina-ssi-src.jar"/>
>
> ...
> <doMavenDeploy artifactId="tomcat-ssi"
> jarFileName="catalina-ssi.jar"
> srcJarFileName="catalina-ssi-src.jar"/>
Looks about right.
You'll also need to add to:
- list of JARs in conf/catalina.properties
- list of JARs in org/apache/catalina/startup/catalina.properties
(one of those may be copied from the other - I forget)
- webapps/docs/class-loader-howto.xml
- RELEASE-NOTES
(I did a global search for "tomcat-api" which I expected to be similar
in terms of where it appears.)
Mark
>
> ?
>
> -chris
>
>>> 2 files changed, 37 insertions(+)
>>>
>>> diff --git a/build.xml b/build.xml index 3d1318e..fbe0311 100644
>>> --- a/build.xml +++ b/build.xml @@ -110,6 +110,7 @@ <property
>>> name="tomcat-websocket.jar"
>>> value="${tomcat.build}/lib/tomcat-websocket.jar"/> <property
>>> name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
>>> <property name="catalina-tribes.jar"
>>> value="${tomcat.build}/lib/catalina-tribes.jar"/> + <property
>>> name="catalina-ssi.jar"
>>> value="${tomcat.build}/lib/catalina-ssi.jar"/> <property
>>> name="catalina-ha.jar"
>>> value="${tomcat.build}/lib/catalina-ha.jar"/> <property
>>> name="catalina-ant.jar"
>>> value="${tomcat.build}/lib/catalina-ant.jar"/> <property
>>> name="catalina-storeconfig.jar"
>>> value="${tomcat.build}/lib/catalina-storeconfig.jar"/> @@ -136,6
>>> +137,7 @@ <property name="tomcat-websocket-src.jar"
>>> value="${tomcat.src.jars}/tomcat-websocket-src.jar"/> <property
>>> name="catalina-src.jar"
>>> value="${tomcat.src.jars}/catalina-src.jar"/> <property
>>> name="catalina-tribes-src.jar"
>>> value="${tomcat.src.jars}/catalina-tribes-src.jar"/> + <property
>>> name="catalina-ssi-src.jar"
>>> value="${tomcat.src.jars}/catalina-ssi-src.jar"/> <property
>>> name="catalina-ha-src.jar"
>>> value="${tomcat.src.jars}/catalina-ha-src.jar"/> <property
>>> name="catalina-ant-src.jar"
>>> value="${tomcat.src.jars}/catalina-ant-src.jar"/> <property
>>> name="catalina-storeconfig-src.jar"
>>> value="${tomcat.src.jars}/catalina-storeconfig-src.jar"/> @@
>>> -420,12 +422,17 @@ <exclude name="org/apache/catalina/ha/**" />
>>> <exclude name="org/apache/catalina/tribes/**" /> <exclude
>>> name="org/apache/catalina/storeconfig/**" /> + <exclude
>>> name="org/apache/catalina/ssi/**" /> </patternset>
>>>
>>> <patternset id="files.catalina-tribes"> <include
>>> name="org/apache/catalina/tribes/**" /> </patternset>
>>>
>>> + <patternset id="files.catalina-ssi"> + <include
>>> name="org/apache/catalina/ssi/**" /> + </patternset> +
>>> <patternset id="files.catalina-ha"> <include
>>> name="org/apache/catalina/ha/**" /> </patternset> @@ -834,6
>>> +841,12 @@ filesId="files.catalina-tribes" addOSGi="true" />
>>>
>>> + <!-- Server-Side Includes (SSI) --> + <jarIt
>>> jarfile="${catalina-ssi.jar}" +
>>> filesDir="${tomcat.classes}" + filesId="files.catalina-ssi"
>>> + addOSGi="true" /> + <!-- Catalina Cluster/HA JAR File -->
>>> <jarIt jarfile="${catalina-ha.jar}" filesDir="${tomcat.classes}"
>>> @@ -2644,6 +2657,11 @@ skip.installer property in
>>> build.properties" /> filesDir="java"
>>> filesId="files.catalina-tribes" />
>>>
>>> + <!-- Catalina SSI JAR File --> + <jarIt
>>> jarfile="${catalina-ssi-src.jar}" + filesDir="java" +
>>> filesId="files.catalina-ssi" /> + <!-- Catalina Cluster/HA JAR
>>> File --> <jarIt jarfile="${catalina-ha-src.jar}" filesDir="java"
>>> diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd
>>> b/res/bnd/catalina-ssi.jar.tmp.bnd new file mode 100644 index
>>> 0000000..c17840d --- /dev/null +++
>>> b/res/bnd/catalina-ssi.jar.tmp.bnd @@ -0,0 +1,19 @@ +# Licensed
>>> to the Apache Software Foundation (ASF) under one or more +#
>>> contributor license agreements. See the NOTICE file distributed
>>> with +# this work for additional information regarding copyright
>>> ownership. +# The ASF licenses this file to You under the Apache
>>> License, Version 2.0 +# (the "License"); you may not use this
>>> file except in compliance with +# the License. You may obtain a
>>> copy of the License at +# +#
>>> http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required
>>> by applicable law or agreed to in writing, software +#
>>> distributed under the License is distributed on an "AS IS"
>>> BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
>>> express or implied. +# See the License for the specific language
>>> governing permissions and +# limitations under the License.
>>> +Bundle-Name: tomcat-ssi +Bundle-SymbolicName:
>>> org.apache.tomcat-ssi +Bundle-Version: @VERSION@ +Export-Package:
>>> \ + org.apache.catalina.ssi
>>>
>>>
>>> ---------------------------------------------------------------------
>>>
>>>
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>>
>
>
>> ---------------------------------------------------------------------
>
>
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate
JAR file.
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Mark,
On 12/5/19 11:46, Mark Thomas wrote:
> On 05/12/2019 16:40, schultz@apache.org wrote:
>> This is an automated email from the ASF dual-hosted git
>> repository.
>>
>> schultz pushed a commit to branch master in repository
>> https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/master by this
>> push: new 3554723 Move SSI component into separate JAR file.
>> 3554723 is described below
>>
>> commit 3554723117122fb520c72b6c4a828d5f146d8c40 Author:
>> Christopher Schultz <ch...@christopherschultz.net> AuthorDate:
>> Thu Dec 5 11:39:36 2019 -0500
>>
>> Move SSI component into separate JAR file. --- build.xml
>> | 18 ++++++++++++++++++ res/bnd/catalina-ssi.jar.tmp.bnd | 19
>> +++++++++++++++++++
>
> You need a pom in res/maven as well.
Okay, thanks.
Time to dive into what that will take as well.
So, like res/maven/tomcat-ssi.pom? How do I wire that into whatever
process kicks off e.g. tomcat-tribes.pom? In mvn-pub.xml? Something
like this?
<doMavenInstall artifactId="tomcat-ssi"
jarFileName="catalina-ssi.jar"
srcJarFileName="catalina-ssi-src.jar"/>
...
<doMavenDeploy artifactId="tomcat-ssi"
jarFileName="catalina-ssi.jar"
srcJarFileName="catalina-ssi-src.jar"/>
?
- -chris
>> 2 files changed, 37 insertions(+)
>>
>> diff --git a/build.xml b/build.xml index 3d1318e..fbe0311 100644
>> --- a/build.xml +++ b/build.xml @@ -110,6 +110,7 @@ <property
>> name="tomcat-websocket.jar"
>> value="${tomcat.build}/lib/tomcat-websocket.jar"/> <property
>> name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
>> <property name="catalina-tribes.jar"
>> value="${tomcat.build}/lib/catalina-tribes.jar"/> + <property
>> name="catalina-ssi.jar"
>> value="${tomcat.build}/lib/catalina-ssi.jar"/> <property
>> name="catalina-ha.jar"
>> value="${tomcat.build}/lib/catalina-ha.jar"/> <property
>> name="catalina-ant.jar"
>> value="${tomcat.build}/lib/catalina-ant.jar"/> <property
>> name="catalina-storeconfig.jar"
>> value="${tomcat.build}/lib/catalina-storeconfig.jar"/> @@ -136,6
>> +137,7 @@ <property name="tomcat-websocket-src.jar"
>> value="${tomcat.src.jars}/tomcat-websocket-src.jar"/> <property
>> name="catalina-src.jar"
>> value="${tomcat.src.jars}/catalina-src.jar"/> <property
>> name="catalina-tribes-src.jar"
>> value="${tomcat.src.jars}/catalina-tribes-src.jar"/> + <property
>> name="catalina-ssi-src.jar"
>> value="${tomcat.src.jars}/catalina-ssi-src.jar"/> <property
>> name="catalina-ha-src.jar"
>> value="${tomcat.src.jars}/catalina-ha-src.jar"/> <property
>> name="catalina-ant-src.jar"
>> value="${tomcat.src.jars}/catalina-ant-src.jar"/> <property
>> name="catalina-storeconfig-src.jar"
>> value="${tomcat.src.jars}/catalina-storeconfig-src.jar"/> @@
>> -420,12 +422,17 @@ <exclude name="org/apache/catalina/ha/**" />
>> <exclude name="org/apache/catalina/tribes/**" /> <exclude
>> name="org/apache/catalina/storeconfig/**" /> + <exclude
>> name="org/apache/catalina/ssi/**" /> </patternset>
>>
>> <patternset id="files.catalina-tribes"> <include
>> name="org/apache/catalina/tribes/**" /> </patternset>
>>
>> + <patternset id="files.catalina-ssi"> + <include
>> name="org/apache/catalina/ssi/**" /> + </patternset> +
>> <patternset id="files.catalina-ha"> <include
>> name="org/apache/catalina/ha/**" /> </patternset> @@ -834,6
>> +841,12 @@ filesId="files.catalina-tribes" addOSGi="true" />
>>
>> + <!-- Server-Side Includes (SSI) --> + <jarIt
>> jarfile="${catalina-ssi.jar}" +
>> filesDir="${tomcat.classes}" + filesId="files.catalina-ssi"
>> + addOSGi="true" /> + <!-- Catalina Cluster/HA JAR File -->
>> <jarIt jarfile="${catalina-ha.jar}" filesDir="${tomcat.classes}"
>> @@ -2644,6 +2657,11 @@ skip.installer property in
>> build.properties" /> filesDir="java"
>> filesId="files.catalina-tribes" />
>>
>> + <!-- Catalina SSI JAR File --> + <jarIt
>> jarfile="${catalina-ssi-src.jar}" + filesDir="java" +
>> filesId="files.catalina-ssi" /> + <!-- Catalina Cluster/HA JAR
>> File --> <jarIt jarfile="${catalina-ha-src.jar}" filesDir="java"
>> diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd
>> b/res/bnd/catalina-ssi.jar.tmp.bnd new file mode 100644 index
>> 0000000..c17840d --- /dev/null +++
>> b/res/bnd/catalina-ssi.jar.tmp.bnd @@ -0,0 +1,19 @@ +# Licensed
>> to the Apache Software Foundation (ASF) under one or more +#
>> contributor license agreements. See the NOTICE file distributed
>> with +# this work for additional information regarding copyright
>> ownership. +# The ASF licenses this file to You under the Apache
>> License, Version 2.0 +# (the "License"); you may not use this
>> file except in compliance with +# the License. You may obtain a
>> copy of the License at +# +#
>> http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required
>> by applicable law or agreed to in writing, software +#
>> distributed under the License is distributed on an "AS IS"
>> BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
>> express or implied. +# See the License for the specific language
>> governing permissions and +# limitations under the License.
>> +Bundle-Name: tomcat-ssi +Bundle-SymbolicName:
>> org.apache.tomcat-ssi +Bundle-Version: @VERSION@ +Export-Package:
>> \ + org.apache.catalina.ssi
>>
>>
>> ---------------------------------------------------------------------
>>
>>
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>
>
> ---------------------------------------------------------------------
>
>
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl3pjNEACgkQHPApP6U8
pFiPYg/8C8EH4WLVpnZLpUddaOA/3gA2NoHuPjrUt1CBRSYWxYH4KxVzwKOT0yJP
0ianHLH4z9rysvFORd6rbUczpHgLAj1yWKlkcs3d/cJNvFv87anochFPxX5e6Ida
FuqAUjs9Lg2R4pZ0+SMomcQCvP+CpJTdc3WYl7dfH8jMUYN5e7450svb/PGGSbaF
cuAgpf3YxGF+SgJpaNuqPd67tVQyUgjgLilVUHv9ibRIW9j6Fq0QxXxYK9TT3UUB
wYywtD2NJlHADK65aX6vSr5CBzVW4fErDUr9Xu+9XxhfUvegv/iCi9EsyyNyE3TS
9MkpcEv7r/Kkvqd3kRt3Fowi+OxdOiIq/ZmogZE+LZye716pr3q82Da9S4i9z72v
2bYS0VPRWkRm6TYQxzhx6ZUb3cg0odizYFplHopphEm56Y9X/bR0dbovPnDBujw1
/fO4FJd2KniUif2kws81z8QlVl08uVWd194FPtE6eFw6De/JMeEm/79Bkb1+Votp
DwSJgVOIeOVMiXN3OjPdJy3C/yaswE1YqkO6ckb1JqggGUEge9BmKOhYeeGboaKZ
Cxvk9MEa2Pw+kjvMuyBOGOPsyVDospBhhNRmWEXORJzQfIDwk5JV1xIDHEwf2kFG
5i23KK50U71Ebm0ogIC468u+AQaZwE3kBxYSfVFZcWd31gIoDXk=
=2IIz
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate
JAR file.
Posted by Mark Thomas <ma...@apache.org>.
On 05/12/2019 16:40, schultz@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> schultz pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new 3554723 Move SSI component into separate JAR file.
> 3554723 is described below
>
> commit 3554723117122fb520c72b6c4a828d5f146d8c40
> Author: Christopher Schultz <ch...@christopherschultz.net>
> AuthorDate: Thu Dec 5 11:39:36 2019 -0500
>
> Move SSI component into separate JAR file.
> ---
> build.xml | 18 ++++++++++++++++++
> res/bnd/catalina-ssi.jar.tmp.bnd | 19 +++++++++++++++++++
You need a pom in res/maven as well.
Mark
> 2 files changed, 37 insertions(+)
>
> diff --git a/build.xml b/build.xml
> index 3d1318e..fbe0311 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -110,6 +110,7 @@
> <property name="tomcat-websocket.jar" value="${tomcat.build}/lib/tomcat-websocket.jar"/>
> <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
> <property name="catalina-tribes.jar" value="${tomcat.build}/lib/catalina-tribes.jar"/>
> + <property name="catalina-ssi.jar" value="${tomcat.build}/lib/catalina-ssi.jar"/>
> <property name="catalina-ha.jar" value="${tomcat.build}/lib/catalina-ha.jar"/>
> <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/>
> <property name="catalina-storeconfig.jar" value="${tomcat.build}/lib/catalina-storeconfig.jar"/>
> @@ -136,6 +137,7 @@
> <property name="tomcat-websocket-src.jar" value="${tomcat.src.jars}/tomcat-websocket-src.jar"/>
> <property name="catalina-src.jar" value="${tomcat.src.jars}/catalina-src.jar"/>
> <property name="catalina-tribes-src.jar" value="${tomcat.src.jars}/catalina-tribes-src.jar"/>
> + <property name="catalina-ssi-src.jar" value="${tomcat.src.jars}/catalina-ssi-src.jar"/>
> <property name="catalina-ha-src.jar" value="${tomcat.src.jars}/catalina-ha-src.jar"/>
> <property name="catalina-ant-src.jar" value="${tomcat.src.jars}/catalina-ant-src.jar"/>
> <property name="catalina-storeconfig-src.jar" value="${tomcat.src.jars}/catalina-storeconfig-src.jar"/>
> @@ -420,12 +422,17 @@
> <exclude name="org/apache/catalina/ha/**" />
> <exclude name="org/apache/catalina/tribes/**" />
> <exclude name="org/apache/catalina/storeconfig/**" />
> + <exclude name="org/apache/catalina/ssi/**" />
> </patternset>
>
> <patternset id="files.catalina-tribes">
> <include name="org/apache/catalina/tribes/**" />
> </patternset>
>
> + <patternset id="files.catalina-ssi">
> + <include name="org/apache/catalina/ssi/**" />
> + </patternset>
> +
> <patternset id="files.catalina-ha">
> <include name="org/apache/catalina/ha/**" />
> </patternset>
> @@ -834,6 +841,12 @@
> filesId="files.catalina-tribes"
> addOSGi="true" />
>
> + <!-- Server-Side Includes (SSI) -->
> + <jarIt jarfile="${catalina-ssi.jar}"
> + filesDir="${tomcat.classes}"
> + filesId="files.catalina-ssi"
> + addOSGi="true" />
> +
> <!-- Catalina Cluster/HA JAR File -->
> <jarIt jarfile="${catalina-ha.jar}"
> filesDir="${tomcat.classes}"
> @@ -2644,6 +2657,11 @@ skip.installer property in build.properties" />
> filesDir="java"
> filesId="files.catalina-tribes" />
>
> + <!-- Catalina SSI JAR File -->
> + <jarIt jarfile="${catalina-ssi-src.jar}"
> + filesDir="java"
> + filesId="files.catalina-ssi" />
> +
> <!-- Catalina Cluster/HA JAR File -->
> <jarIt jarfile="${catalina-ha-src.jar}"
> filesDir="java"
> diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
> new file mode 100644
> index 0000000..c17840d
> --- /dev/null
> +++ b/res/bnd/catalina-ssi.jar.tmp.bnd
> @@ -0,0 +1,19 @@
> +# Licensed to the Apache Software Foundation (ASF) under one or more
> +# contributor license agreements. See the NOTICE file distributed with
> +# this work for additional information regarding copyright ownership.
> +# The ASF licenses this file to You under the Apache License, Version 2.0
> +# (the "License"); you may not use this file except in compliance with
> +# the License. You may obtain a copy of the License at
> +#
> +# http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing, software
> +# distributed under the License is distributed on an "AS IS" BASIS,
> +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +# See the License for the specific language governing permissions and
> +# limitations under the License.
> +Bundle-Name: tomcat-ssi
> +Bundle-SymbolicName: org.apache.tomcat-ssi
> +Bundle-Version: @VERSION@
> +Export-Package: \
> + org.apache.catalina.ssi
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org