[
https://issues.apache.org/activemq/browse/SMX4-107?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=45971#action_45971
]
Guillaume Nodet commented on SMX4-107:
--------------------------------------
Here is what happens when I apply the patch:
{code}
gnodet:(svn)servicemix[servicemix:697778]/smx4/features/trunk$ patch -p0 -i
my.osgi.patch
(Stripping trailing CRs from patch.)
patching file examples/cxf-osgi/client.html
The next patch would empty out the file
examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java.rej
The next patch would empty out the file
examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java.rej
The next patch would empty out the file
examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml.rej
(Stripping trailing CRs from patch.)
patching file examples/cxf-osgi/pom.xml
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file examples/cxf-osgi/pom.xml.rej
(Stripping trailing CRs from patch.)
patching file examples/cxf-osgi/README.txt
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-osgi/README.txt.rej
The next patch would empty out the file
examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/GreeterImpl.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/GreeterImpl.java.rej
The next patch would empty out the file
examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/ConciseFormatter.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/ConciseFormatter.java.rej
The next patch would empty out the file
examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml.rej
The next patch would empty out the file
examples/cxf-ws-addressing/src/main/resources/wsdl/cxf-servlet.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-ws-addressing/src/main/resources/wsdl/cxf-servlet.xml.rej
The next patch would empty out the file
examples/cxf-ws-addressing/src/main/resources/wsdl/hello_world_addr.wsdl,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-ws-addressing/src/main/resources/wsdl/hello_world_addr.wsdl.rej
The next patch would empty out the file examples/cxf-ws-addressing/pom.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-ws-addressing/pom.xml.rej
The next patch would empty out the file
examples/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/AddNumbersImpl.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/AddNumbersImpl.java.rej
The next patch would empty out the file
examples/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/ModifyNumberHandler.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/ModifyNumberHandler.java.rej
The next patch would empty out the file
examples/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml.rej
The next patch would empty out the file
examples/cxf-handler-cfg/src/main/resources/wsdl/addNumbers.wsdl,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-handler-cfg/src/main/resources/wsdl/addNumbers.wsdl.rej
The next patch would empty out the file examples/cxf-handler-cfg/pom.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-handler-cfg/pom.xml.rej
The next patch would empty out the file
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/SmallNumberHandler.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/SmallNumberHandler.java.rej
The next patch would empty out the file
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/LoggingHandler.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/LoggingHandler.java.rej
The next patch would empty out the file
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/AddNumbersImpl.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/AddNumbersImpl.java.rej
The next patch would empty out the file
examples/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml.rej
The next patch would empty out the file
examples/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml.rej
The next patch would empty out the file
examples/cxf-soap-handler-osgi/src/main/resources/wsdl/addNumbers.wsdl,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-soap-handler-osgi/src/main/resources/wsdl/addNumbers.wsdl.rej
The next patch would empty out the file examples/cxf-soap-handler-osgi/pom.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-soap-handler-osgi/pom.xml.rej
(Stripping trailing CRs from patch.)
patching file examples/pom.xml
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file examples/pom.xml.rej
The next patch would empty out the file
examples/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java.rej
The next patch would empty out the file
examples/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml.rej
The next patch would empty out the file
examples/cxf-http-osgi/src/main/resources/wsdl/hello_world.wsdl,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-http-osgi/src/main/resources/wsdl/hello_world.wsdl.rej
The next patch would empty out the file examples/cxf-http-osgi/pom.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/cxf-http-osgi/pom.xml.rej
(Stripping trailing CRs from patch.)
can't find file to patch at input line 2368
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: examples/osgi/cxf-osgi/pom.xml
|===================================================================
|--- examples/osgi/cxf-osgi/pom.xml (revision 695930)
|+++ examples/osgi/cxf-osgi/pom.xml (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
patching file examples/osgi/dependencies/pom.xml
(Stripping trailing CRs from patch.)
patching file
examples/osgi/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/Helper.java
(Stripping trailing CRs from patch.)
patching file
examples/osgi/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/HelperImpl.java
(Stripping trailing CRs from patch.)
can't find file to patch at input line 2884
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|Property changes on:
examples\osgi\cxf-ws-addressing\src\main\java\org\apache\servicemix\examples\cxf\wsaddressing\HelperImpl.java
|___________________________________________________________________
|Name: svn:keywords
| + Rev Date
|Name: svn:eol-style
| + native
|
|Index:
examples/osgi/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
|===================================================================
|---
examples/osgi/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
(revision 695930)
|+++
examples/osgi/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
(working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
(Stripping trailing CRs from patch.)
can't find file to patch at input line 2923
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: examples/osgi/cxf-ws-addressing/pom.xml
|===================================================================
|--- examples/osgi/cxf-ws-addressing/pom.xml (revision 695930)
|+++ examples/osgi/cxf-ws-addressing/pom.xml (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
(Stripping trailing CRs from patch.)
can't find file to patch at input line 2998
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: examples/osgi/cxf-handler-cfg/pom.xml
|===================================================================
|--- examples/osgi/cxf-handler-cfg/pom.xml (revision 695930)
|+++ examples/osgi/cxf-handler-cfg/pom.xml (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
patching file
examples/osgi/jms/src/main/java/com/iona/cxf/sample/GreeterImpl.java
(Stripping trailing CRs from patch.)
patching file examples/osgi/jms/src/main/resources/META-INF/spring/beans.xml
(Stripping trailing CRs from patch.)
patching file examples/osgi/jms/src/main/resources/wsdl/greeter.wsdl
(Stripping trailing CRs from patch.)
patching file examples/osgi/jms/pom.xml
The next patch would delete the file
examples/osgi/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/SmallNumberHandler.java,
which does not exist! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would delete the file
examples/osgi/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/LoggingHandler.java,
which does not exist! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
patching file
examples/osgi/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/ModifyNumberHandler.java
(Stripping trailing CRs from patch.)
can't find file to patch at input line 3738
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|Property changes on:
examples\osgi\cxf-soap-handler-osgi\src\main\java\org\apache\servicemix\examples\cxf\soaphandler\ModifyNumberHandler.java
|___________________________________________________________________
|Name: svn:keywords
| + Rev Date
|Name: svn:eol-style
| + native
|
|Index:
examples/osgi/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml
|===================================================================
|---
examples/osgi/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml
(revision 695930)
|+++
examples/osgi/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml
(working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
can't find file to patch at input line 3751
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: examples/osgi/cxf-soap-handler-osgi/pom.xml
|===================================================================
|--- examples/osgi/cxf-soap-handler-osgi/pom.xml (revision 695930)
|+++ examples/osgi/cxf-soap-handler-osgi/pom.xml (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
patching file examples/osgi/pom.xml
(Stripping trailing CRs from patch.)
can't find file to patch at input line 3832
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|Property changes on: examples\osgi\pom.xml
|___________________________________________________________________
|Name: svn:mime-type
| + text/xml
|Name: svn:keywords
| + Rev Date
|Name: svn:eol-style
| + native
|
|Index:
examples/osgi/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
|===================================================================
|---
examples/osgi/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(revision 695930)
|+++
examples/osgi/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
(Stripping trailing CRs from patch.)
can't find file to patch at input line 4071
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: examples/osgi/itests/pom.xml
|===================================================================
|--- examples/osgi/itests/pom.xml (revision 695930)
|+++ examples/osgi/itests/pom.xml (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch.)
can't find file to patch at input line 4401
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: examples/osgi/cxf-http-osgi/pom.xml
|===================================================================
|--- examples/osgi/cxf-http-osgi/pom.xml (revision 695930)
|+++ examples/osgi/cxf-http-osgi/pom.xml (working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
The next patch would empty out the file
examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java.rej
The next patch would empty out the file
examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF.rej
(Stripping trailing CRs from patch.)
patching file examples/itests/src/test/resources/log4j.properties
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
examples/itests/src/test/resources/log4j.properties.rej
The next patch would empty out the file examples/itests/pom.xml,
which is already empty! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file examples/itests/pom.xml.rej
{code}
And here is the result:
{code}
gnodet:(svn)servicemix[servicemix:697778]/smx4/features/trunk$ svn st
? my.osgi.patch
? examples/osgi
? examples/cxf-osgi/pom.xml.orig
M examples/cxf-osgi/client.html
M
examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorld.java
M
examples/cxf-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
M examples/cxf-osgi/src/main/resources/META-INF/spring/beans.xml
M
examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/GreeterImpl.java
M
examples/cxf-ws-addressing/src/main/java/org/apache/servicemix/examples/cxf/wsaddressing/ConciseFormatter.java
M examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
M examples/cxf-ws-addressing/src/main/resources/wsdl/cxf-servlet.xml
M examples/cxf-ws-addressing/src/main/resources/wsdl/hello_world_addr.wsdl
M examples/cxf-ws-addressing/pom.xml
M
examples/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/AddNumbersImpl.java
M
examples/cxf-handler-cfg/src/main/java/org/apache/servicemix/examples/cxf/springcfghandler/ModifyNumberHandler.java
M examples/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml
M examples/cxf-handler-cfg/src/main/resources/wsdl/addNumbers.wsdl
M examples/cxf-handler-cfg/pom.xml
M examples/pom.xml
M
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/SmallNumberHandler.java
M
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/LoggingHandler.java
M
examples/cxf-soap-handler-osgi/src/main/java/org/apache/servicemix/examples/cxf/soaphandler/AddNumbersImpl.java
M
examples/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml
M
examples/cxf-soap-handler-osgi/src/main/resources/config/demo_handlers.xml
M examples/cxf-soap-handler-osgi/src/main/resources/wsdl/addNumbers.wsdl
M examples/cxf-soap-handler-osgi/pom.xml
M
examples/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
M examples/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
M examples/cxf-http-osgi/src/main/resources/wsdl/hello_world.wsdl
M examples/cxf-http-osgi/pom.xml
M
examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
M examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
M examples/itests/pom.xml
{code}
So unless I miss something in the patch, the patch mainly move files around
into examples/osgi, right ?
Maybe we could dissociate the two problems ? First fix / enhance the tests,
then move things around ...
> Restructure osgi tests with much cleaner osgi environment
> ----------------------------------------------------------
>
> Key: SMX4-107
> URL: https://issues.apache.org/activemq/browse/SMX4-107
> Project: ServiceMix 4
> Issue Type: Bug
> Affects Versions: 4.0-m2
> Reporter: Daisy Li
> Assignee: Freeman Fang
> Fix For: 4.0-m1
>
> Attachments: my.osgi.patch
>
>
> Create a dependency module which contains all osgi tests' dependencies, so
> osgi tests' dependencies jars won't be included in traditional classpath.
> Having osgi depencies jars in classpath causes many testing issues now. The
> purpose of this clean work is to make osgi tests running in ralative pure
> osgi enviroment. I also move jms tests from tandoori to apache.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
