You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/08/28 14:23:11 UTC
svn commit: r689800 - in /servicemix/smx4/features/trunk:
camel/servicemix-camel/
camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/
camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/
camel/servicemix-camel/src/main/re...
Author: ffang
Date: Thu Aug 28 05:23:07 2008
New Revision: 689800
URL: http://svn.apache.org/viewvc?rev=689800&view=rev
Log:
[SMX4-88]camel-nmr example doesn't work
Added:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixExchange.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixMessage.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/camel-nmr.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/CxfMessageTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloService.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloServiceImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
- copied, changed from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/
- copied from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/
- copied from r689792, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/addressing/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/
- copied from r689792, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/policy/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/
- copied from r689792, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/rm/
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/
- copied from r689792, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/security/
Removed:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/camel-nmr.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/CxfMessageTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloService.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloServiceImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ws/
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Thu Aug 28 05:23:07 2008
@@ -168,7 +168,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
- <Export-Package>org.apache.servicemix.camel*</Export-Package>
+ <Export-Package>org.apache.servicemix.camel.nmr*</Export-Package>
</instructions>
</configuration>
</plugin>
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixComponent.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixComponent.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import java.util.Map;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixEndpoint.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixEndpoint.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.ExchangePattern;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixExchange.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixExchange.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixExchange.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixExchange.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixExchange.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import org.apache.camel.ExchangePattern;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixMessage.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixMessage.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixMessage.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixMessage.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixMessage.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import org.apache.camel.Message;
import org.apache.camel.Exchange;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixProducer.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import org.apache.camel.component.cxf.CxfConstants;
import org.apache.camel.impl.DefaultProducer;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/nmr Thu Aug 28 05:23:07 2008
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.servicemix.camel.ServiceMixComponent
+class=org.apache.servicemix.camel.nmr.ServiceMixComponent
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/META-INF/services/org/apache/camel/component/smx Thu Aug 28 05:23:07 2008
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.servicemix.camel.ServiceMixComponent
+class=org.apache.servicemix.camel.nmr.ServiceMixComponent
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/camel-nmr.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/camel-nmr.xml&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/camel-nmr.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/resources/org/apache/servicemix/camel/nmr/camel-nmr.xml Thu Aug 28 05:23:07 2008
@@ -26,7 +26,7 @@
http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
http://activemq.apache.org/camel/schema/osgi http://activemq.apache.org/camel/schema/osgi/camel-osgi.xsd">
- <bean id="nmr" class="org.apache.servicemix.camel.ServiceMixComponent">
+ <bean id="nmr" class="org.apache.servicemix.camel.nmr.ServiceMixComponent">
<property name="nmr">
<osgi:reference interface="org.apache.servicemix.nmr.api.NMR" />
</property>
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/AttachmentTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AttachmentTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import java.io.InputStream;
import java.lang.reflect.InvocationHandler;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/CxfMessageTest.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/CxfMessageTest.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/CxfMessageTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import java.net.URL;
@@ -100,4 +100,4 @@
-}
\ No newline at end of file
+}
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import java.net.URL;
import java.util.Map;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloService.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloService.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloService.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloService.java Thu Aug 28 05:23:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
public interface HelloService {
String sayHello();
@@ -23,4 +23,4 @@
void ping();
String echo(String text);
-}
\ No newline at end of file
+}
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloServiceImpl.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloServiceImpl.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/HelloServiceImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/HelloServiceImpl.java Thu Aug 28 05:23:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
public class HelloServiceImpl implements HelloService {
public String echo(String text) {
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/MtomImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MtomImpl.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import java.io.IOException;
import java.io.InputStream;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfSpringTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfSpringTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
Copied: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java (from r689778, servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java?p2=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java&p1=servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java&r1=689778&r2=689800&rev=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/SmxToCxfTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel;
+package org.apache.servicemix.camel.nmr;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.SpringTestSupport;
@@ -32,7 +32,7 @@
public class SmxToCxfTest extends SpringTestSupport {
protected static final String ROUTER_ADDRESS = "http://localhost:9000/router";
protected static final String SERVICE_ADDRESS = "local://smx/helloworld";
- protected static final String SERVICE_CLASS = "serviceClass=org.apache.servicemix.camel.HelloService";
+ protected static final String SERVICE_CLASS = "serviceClass=org.apache.servicemix.camel.nmr.HelloService";
private String routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS + "&dataFormat=POJO&setDefaultBus=true";
private String serviceEndpointURI = "cxf://" + SERVICE_ADDRESS + "?" + SERVICE_CLASS + "&dataFormat=POJO&setDefaultBus=true";
@@ -101,4 +101,4 @@
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/GreeterImpl.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.addressing;
+package org.apache.servicemix.camel.nmr.ws.addressing;
import java.util.concurrent.Future;
import java.util.logging.Level;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/HeaderVerifier.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.addressing;
+package org.apache.servicemix.camel.nmr.ws.addressing;
import java.util.ArrayList;
import java.util.Iterator;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/MAPVerifier.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.addressing;
+package org.apache.servicemix.camel.nmr.ws.addressing;
import java.util.ArrayList;
import java.util.HashMap;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/VerificationCache.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.addressing;
+package org.apache.servicemix.camel.nmr.ws.addressing;
public interface VerificationCache {
void put(String verification);
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.addressing;
+package org.apache.servicemix.camel.nmr.ws.addressing;
import java.lang.reflect.UndeclaredThrowableException;
import java.util.HashMap;
@@ -48,7 +48,7 @@
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.apache.hello_world_soap_http.SOAPService;
-import org.apache.servicemix.camel.ServiceMixComponent;
+import org.apache.servicemix.camel.nmr.ServiceMixComponent;
import org.apache.servicemix.nmr.api.NMR;
import org.apache.servicemix.nmr.core.ServiceMix;
import org.springframework.context.support.AbstractXmlApplicationContext;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/ConnectionHelper.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.policy;
+package org.apache.servicemix.camel.nmr.ws.policy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/GreeterImpl.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.policy;
+package org.apache.servicemix.camel.nmr.ws.policy;
import javax.jws.WebService;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.policy;
+package org.apache.servicemix.camel.nmr.ws.policy;
import java.net.URL;
import java.util.logging.Logger;
@@ -39,7 +39,7 @@
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.servicemix.camel.ServiceMixComponent;
+import org.apache.servicemix.camel.nmr.ServiceMixComponent;
import org.apache.servicemix.nmr.api.NMR;
import org.apache.servicemix.nmr.core.ServiceMix;
import org.springframework.context.support.AbstractXmlApplicationContext;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/GreeterImpl.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.rm;
+package org.apache.servicemix.camel.nmr.ws.rm;
import java.util.concurrent.Future;
import java.util.logging.Logger;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/TwowayThread.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.rm;
+package org.apache.servicemix.camel.nmr.ws.rm;
import org.apache.cxf.greeter_control.Greeter;
@@ -35,4 +35,4 @@
return response;
}
-}
\ No newline at end of file
+}
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/rm/WSRMTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.rm;
+package org.apache.servicemix.camel.nmr.ws.rm;
import java.net.URL;
import java.util.logging.Logger;
@@ -36,8 +36,8 @@
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.servicemix.camel.ServiceMixComponent;
-import org.apache.servicemix.camel.ws.policy.ConnectionHelper;
+import org.apache.servicemix.camel.nmr.ServiceMixComponent;
+import org.apache.servicemix.camel.nmr.ws.policy.ConnectionHelper;
import org.apache.servicemix.nmr.api.NMR;
import org.apache.servicemix.nmr.core.ServiceMix;
import org.springframework.context.support.AbstractXmlApplicationContext;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/GreeterImpl.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.security;
+package org.apache.servicemix.camel.nmr.ws.security;
@javax.jws.WebService(
serviceName = "SOAPServiceWSSecurity",
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/KeystorePasswordCallback.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.security;
+package org.apache.servicemix.camel.nmr.ws.security;
import java.io.IOException;
import java.util.HashMap;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java?rev=689800&r1=689792&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/security/WSSecurityTest.java Thu Aug 28 05:23:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.camel.ws.security;
+package org.apache.servicemix.camel.nmr.ws.security;
import java.util.logging.Logger;
@@ -32,7 +32,7 @@
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.hello_world_soap_http.Greeter;
-import org.apache.servicemix.camel.ServiceMixComponent;
+import org.apache.servicemix.camel.nmr.ServiceMixComponent;
import org.apache.servicemix.nmr.api.NMR;
import org.apache.servicemix.nmr.core.ServiceMix;
import org.springframework.context.support.AbstractXmlApplicationContext;
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml Thu Aug 28 05:23:07 2008
@@ -27,7 +27,7 @@
<cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9000/router"
- serviceClass="org.apache.servicemix.camel.HelloService">
+ serviceClass="org.apache.servicemix.camel.nmr.HelloService">
<cxf:properties>
<entry key="setDefaultBus" value="true"/>
</cxf:properties>
@@ -35,7 +35,7 @@
<cxf:cxfEndpoint id="serviceEndpoint" address="local://smx/helloworld"
- serviceClass="org.apache.servicemix.camel.HelloService">
+ serviceClass="org.apache.servicemix.camel.nmr.HelloService">
<cxf:properties>
<entry key="setDefaultBus" value="true"/>
</cxf:properties>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/server.xml Thu Aug 28 05:23:07 2008
@@ -38,8 +38,8 @@
<bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
<bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>
- <bean class="org.apache.servicemix.camel.ws.addressing.MAPVerifier" id="mapVerifier"/>
- <bean class="org.apache.servicemix.camel.ws.addressing.HeaderVerifier" id="headVerifier"/>
+ <bean class="org.apache.servicemix.camel.nmr.ws.addressing.MAPVerifier" id="mapVerifier"/>
+ <bean class="org.apache.servicemix.camel.nmr.ws.addressing.HeaderVerifier" id="headVerifier"/>
<cxf:cxfEndpoint id="routerEndpoint" name="test:GreeterPort" address="camel://jetty:http://localhost:9008/SoapContext/SoapPort" serviceClass="org.apache.hello_world_soap_http.Greeter">
<cxf:properties>
<entry key="dataFormat" value="POJO"/>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/client.xml Thu Aug 28 05:23:07 2008
@@ -56,7 +56,7 @@
<entry key="encryptionPropFile" value="org/apache/servicemix/camel/ws/security/bob.properties"/>
<entry key="encryptionUser" value="Bob"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
- <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.ws.security.KeystorePasswordCallback"/>
+ <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
<entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
<!-- -->
<!-- Recommendation: signatures should be encrypted -->
@@ -81,7 +81,7 @@
<entry key="action" value="Timestamp Signature Encrypt"/>
<entry key="signaturePropFile" value="org/apache/servicemix/camel/ws/security/bob.properties"/>
<entry key="decryptionPropFile" value="org/apache/servicemix/camel/ws/security/alice.properties"/>
- <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.ws.security.KeystorePasswordCallback"/>
+ <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
</map>
</constructor-arg>
</bean>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml Thu Aug 28 05:23:07 2008
@@ -73,7 +73,7 @@
<entry key="encryptionPropFile" value="org/apache/servicemix/camel/ws/security/alice.properties"/>
<entry key="encryptionUser" value="Alice"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
- <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.ws.security.KeystorePasswordCallback"/>
+ <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
<entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
<!-- -->
<!-- Recommendation: signatures should be encrypted -->
@@ -96,7 +96,7 @@
-->
<entry key="signaturePropFile" value="org/apache/servicemix/camel/ws/security/alice.properties"/>
<entry key="decryptionPropFile" value="org/apache/servicemix/camel/ws/security/bob.properties"/>
- <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.ws.security.KeystorePasswordCallback"/>
+ <entry key="passwordCallbackClass" value="org.apache.servicemix.camel.nmr.ws.security.KeystorePasswordCallback"/>
</map>
</constructor-arg>
</bean>
Modified: servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml Thu Aug 28 05:23:07 2008
@@ -50,7 +50,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>org.apache.servicemix.camel,org.apache.servicemix.nmr.api,*</Import-Package>
+ <Import-Package>org.apache.servicemix.camel.nmr,org.apache.servicemix.nmr.api,*</Import-Package>
<Private-Package>org.apache.servicemix.examples.camel</Private-Package>
</instructions>
</configuration>
Modified: servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml?rev=689800&r1=689799&r2=689800&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/src/main/resources/META-INF/spring/beans.xml Thu Aug 28 05:23:07 2008
@@ -26,7 +26,7 @@
http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
http://activemq.apache.org/camel/schema/osgi http://activemq.apache.org/camel/schema/osgi/camel-osgi.xsd">
- <import resource="classpath:org/apache/servicemix/camel/camel-nmr.xml" />
+ <import resource="classpath:org/apache/servicemix/camel/nmr/camel-nmr.xml" />
<camel-osgi:camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<!-- Route periodically sent events into the NMR -->