You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by "Mark Thomas (Confluence)" <no...@apache.org> on 2019/06/25 13:40:07 UTC
[CONF] Apache Tomcat > Tomcat Native - Java code
There's **1 new edit** on this page
---
|
---
| | [](https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Native+-+Java+code?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1561470007877&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa9809569d423cd016a0413306f00db&src.mail.action=view
"page icon")
---
[Tomcat Native - Java
code](https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Native+-+Java+code?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1561470007877&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa9809569d423cd016a0413306f00db&src.mail.action=view
"Tomcat Native - Java code")
| | | | |  | | Mark
Thomas edited this page
---
|
| | Here's the version comment
---
|
---
| | |  | | Mark Thomas
edited at [01:34
PM](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=119540730)
---
| | | Add Java test code
---
|
| | Here's what changed:
---
|
...
# Start in the root of the Tomcat Native repo
git remote add -f -t master --no-tags 9.0.x <https://gitbox.apache.org/repos/asf/tomcat.git>
git merge -s ours --no-commit 9.0.x/master
git read-tree --prefix=java/org/apache/tomcat/jni/ -u 9.0.x/master:java/org/apache/tomcat/jni
git read-tree --prefix=test/org/apache/tomcat/jni/ -u 9.0.x/master:test/org/apache/tomcat/jni
git commit
The Java code in Tomcat Native is updated using:
# Start in the root of the Tomcat Native repo
git mergerm -s ours --no-commit rf java/org/apache/tomcat/jni
git read-tree --prefix=java/org/apache/tomcat/jni/ -u 9.0.x/master:java/org/apache/tomcat/jni
git rm -rf javatest/org/apache/tomcat/jni
git read-tree --prefix=javatest/org/apache/tomcat/jni/ -u 9.0.x/master:javatest/org/apache/tomcat/jni
git commit
---
| | | [Go to page
history](https://cwiki.apache.org/confluence/pages/viewpreviousversions.action?pageId=119540730&src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1561470007877&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa9809569d423cd016a0413306f00db "Go to page
history")
---
---
| [View
page](https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Native+-+Java+code?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1561470007877&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa9809569d423cd016a0413306f00db&src.mail.action=view)
---
| | [Stop watching
space](https://cwiki.apache.org/confluence/users/removespacenotification.action?spaceKey=TOMCAT&src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1561470007877&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa9809569d423cd016a0413306f00db&src.mail.action=stop-
watching&jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ4c3JmOjhhYTk4MDk1NjlkNDIzY2QwMTZhMDQxMzMwNmYwMGRiIiwicXNoIjoiOTdhMGRkMjFlMGRmYjcxMTZlNjdkOWE4OGI5MjE0MGVjYmY1MTY1MTE3ZWQ2ODZjNjFlNmExNDk3MTJiOTY5MSIsImlzcyI6ImNvbmZsdWVuY2Vfbm90aWZpY2F0aW9uc0FSRUgtWFVEMS1QT1FHLUNTQU8iLCJleHAiOjE1NjIwNzQ4MDcsImlhdCI6MTU2MTQ3MDAwN30.JrhEBjbqGCeGA1f7vjr-
GUq536S7ePWewhCKEtS3BWI) | •
---|---
[Manage
notifications](https://cwiki.apache.org/confluence/users/editmyemailsettings.action?src=mail&src.mail.product=confluence-
server&src.mail.timestamp=1561470007877&src.mail.notification=com.atlassian.confluence.plugins.confluence-
notifications-batch-plugin%3Abatching-
notification&src.mail.recipient=8aa9809569d423cd016a0413306f00db&src.mail.action=manage)
---
| 
---
This message was sent by Atlassian Confluence 6.15.2
---