You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Violeta Georgieva <mi...@gmail.com> on 2012/12/03 09:51:36 UTC
Re: Offline generation of effective web.xml
Hi Mark,
> OK. First question. How did you create your git repo? I am trying to add
> your repo as a remote repo to my own but there are no common ancestors.
> I think I can hack around this but I'd like to understand how it
> happened in the first place.
>
I'm using "git svn".
The last rebase that I made was 11 days ago. Commit id
8f6de1068cd1299f34ae4171e941998b9752c07a
Fix
<https://github.com/violetagg/apache-tomcat-8.0/commit/8f6de1068cd1299f34ae4171e941998b9752c07a>
https://issues.apache.org/bugzilla/show_bug.cgi?id=54170… <javascript:;>
Ensure correct registration of Filters and Servlets in the JMX
registry if the Filter or Servlet name includes a character that must
be quoted if used in an ObjectName value.
git-svn-id: http://svn.apache.org/repos/asf/tomcat/trunk@1412575
13f79535-47bb-0310-9956-ffa450edef68
This migth be the problem - if your repo contains the newest commits.
Isn't it easier to clone the repo?
I also can update it to the latest revision.
Thanks and Regards
Violeta
Re: Offline generation of effective web.xml
Posted by Mark Thomas <ma...@apache.org>.
On 03/12/2012 14:51, Violeta Georgieva wrote:
>>
>> From which git repository? I couldn't find that commit ID in the ASF git
>> repo for Tomcat trunk nor the GitHub mirror.
>
>
> Ok I understood where the missunderstanding is.
> That repo (in my github profile) is my own git-to-svn repo and is not a
> fork from the one available in github.
> Having my own git-to-svn repo I can control when I can do a rebase from svn.
That explains that then.
> In order to escape such problems in the future I forked the official Tomcat
> git repo in github and applied my changes there.
> Here is the new link: https://github.com/violetagg/tomcat.git
> Hope this time it will work without issues.
Thanks. That should make things a little easier moving forwards.
> Unfortunately not all tests are passing now on this repo. I have
>
> java.lang.NullPointerException
> at
> org.apache.tomcat.websocket.ServerContainerImpl.addWsServletMapping(ServerContainerImpl.java:162)
> at
> org.apache.tomcat.websocket.ServerContainerImpl.publishServer(ServerContainerImpl.java:119)
> at
> websocket.echo.WsConfigListener.contextInitialized(WsConfigListener.java:33)
> ...
>
> I don't know whether we should discuss it here or to start a new thread
New thread please.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Offline generation of effective web.xml
Posted by Violeta Georgieva <mi...@gmail.com>.
>
> From which git repository? I couldn't find that commit ID in the ASF git
> repo for Tomcat trunk nor the GitHub mirror.
Ok I understood where the missunderstanding is.
That repo (in my github profile) is my own git-to-svn repo and is not a
fork from the one available in github.
Having my own git-to-svn repo I can control when I can do a rebase from svn.
> I have already fixed it on my local machine with git replace to graft
> your changes onto my local fork of the ASF git repo for Tomcat trunk. It
> should be easy to merge in your changes from there.
>
In order to escape such problems in the future I forked the official Tomcat
git repo in github and applied my changes there.
Here is the new link: https://github.com/violetagg/tomcat.git
Hope this time it will work without issues.
Unfortunately not all tests are passing now on this repo. I have
java.lang.NullPointerException
at
org.apache.tomcat.websocket.ServerContainerImpl.addWsServletMapping(ServerContainerImpl.java:162)
at
org.apache.tomcat.websocket.ServerContainerImpl.publishServer(ServerContainerImpl.java:119)
at
websocket.echo.WsConfigListener.contextInitialized(WsConfigListener.java:33)
...
I don't know whether we should discuss it here or to start a new thread
because I think that in
org.apache.tomcat.websocket.ServerContainerImpl.publishServer(Class<?
extends Endpoint> clazz)
We should have the same check for ServletContext availability as in
org.apache.tomcat.websocket.ServerContainerImpl.publishServer(Class<?>
pojo, ServletContext ctxt, String path)
Regards
Violeta
Re: Offline generation of effective web.xml
Posted by Mark Thomas <ma...@apache.org>.
On 03/12/2012 08:51, Violeta Georgieva wrote:
> Hi Mark,
>
>> OK. First question. How did you create your git repo? I am trying to add
>> your repo as a remote repo to my own but there are no common ancestors.
>> I think I can hack around this but I'd like to understand how it
>> happened in the first place.
>>
>
> I'm using "git svn".
> The last rebase that I made was 11 days ago. Commit id
> 8f6de1068cd1299f34ae4171e941998b9752c07a
>From which git repository? I couldn't find that commit ID in the ASF git
repo for Tomcat trunk nor the GitHub mirror.
> git-svn-id: http://svn.apache.org/repos/asf/tomcat/trunk@1412575
> 13f79535-47bb-0310-9956-ffa450edef68
It is the problem. Hence why I am trying to understand how it happened.
Me not knowing git very well, there could be a perfectly simple
explanation for this.
> This migth be the problem - if your repo contains the newest commits.
> Isn't it easier to clone the repo?
> I also can update it to the latest revision.
I have already fixed it on my local machine with git replace to graft
your changes onto my local fork of the ASF git repo for Tomcat trunk. It
should be easy to merge in your changes from there.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org