Author: hiranya
Date: Fri Jul 12 18:57:16 2013
New Revision: 1502655
URL: http://svn.apache.org/r1502655
Log:
Temporarily reverting SYNAPSE-913 fix. This will be superceded by the
SYNAPSE-920.
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/relay/
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/
synapse/trunk/java/repository/conf/axis2_server.xml
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategyFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategySerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/proxy/Sample155.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
synapse/trunk/java/repository/conf/axis2.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_156.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_5.xml
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportFactory.java
Fri Jul 12 18:57:16 2013
@@ -1,18 +1,20 @@
/*
- * Copyright 2013 Apache Software Foundation
- *
- * Licensed 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.
- */
+* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+*
+* WSO2 Inc. 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.
+*/
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMAttribute;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseImportSerializer.java
Fri Jul 12 18:57:16 2013
@@ -1,18 +1,20 @@
/*
- * Copyright 2013 Apache Software Foundation
- *
- * Licensed 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.
- */
+* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+*
+* WSO2 Inc. 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.
+*/
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMAbstractFactory;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ClassEndpointFactory.java
Fri Jul 12 18:57:16 2013
@@ -1,18 +1,20 @@
/*
- * Copyright 2013 Apache Software Foundation
- *
- * Licensed 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.
- */
+* Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+*
+* WSO2 Inc. 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.
+*/
package org.apache.synapse.config.xml.endpoints;
import org.apache.axiom.om.OMElement;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategyFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategyFactory.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategyFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategyFactory.java
Fri Jul 12 18:57:16 2013
@@ -1,18 +1,20 @@
/*
- * Copyright 2013 Apache Software Foundation
- *
- * Licensed 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.
- */
+* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+*
+* WSO2 Inc. 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.
+*/
package org.apache.synapse.config.xml.rest;
import org.apache.axiom.om.OMAttribute;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategySerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategySerializer.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategySerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/rest/VersionStrategySerializer.java
Fri Jul 12 18:57:16 2013
@@ -1,18 +1,20 @@
/*
- * Copyright 2013 Apache Software Foundation
- *
- * Licensed 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.
- */
+* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+*
+* WSO2 Inc. 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.
+*/
package org.apache.synapse.config.xml.rest;
import org.apache.axiom.om.OMAbstractFactory;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Fri Jul 12 18:57:16 2013
@@ -30,9 +30,9 @@ import org.apache.axis2.description.Tran
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
-import org.apache.synapse.core.relay.RelayUtils;
import org.apache.synapse.rest.RESTRequestHandler;
import org.apache.synapse.task.SynapseTaskManager;
+import org.apache.synapse.transport.passthru.util.RelayUtils;
import org.apache.synapse.aspects.statistics.StatisticsCollector;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
@@ -265,7 +265,7 @@ public class Axis2SynapseEnvironment imp
ProxyService proxyService =
synapseConfig.getProxyService(proxyName);
if (proxyService.isModuleEngaged()) {
try {
- RelayUtils.buildMessage(synCtx);
+ RelayUtils.buildMessage(((Axis2MessageContext)
synCtx).getAxis2MessageContext(),false);
} catch (Exception e) {
handleException("Error building message", e);
}
@@ -288,7 +288,7 @@ public class Axis2SynapseEnvironment imp
synCtx.setProperty(SynapseConstants.SENDING_REQUEST, true);
if (endpoint == null) {
try {
- RelayUtils.buildMessage(synCtx);
+ RelayUtils.buildMessage(((Axis2MessageContext)
synCtx).getAxis2MessageContext(),false);
} catch (Exception e) {
handleException("Error while building message", e);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ImportDeployer.java
Fri Jul 12 18:57:16 2013
@@ -1,18 +1,20 @@
/*
- * Copyright 2013 Apache Software Foundation
- *
- * Licensed 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.
- */
+* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+*
+* WSO2 Inc. 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.
+*/
package org.apache.synapse.deployers;
import org.apache.axiom.om.OMElement;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java
Fri Jul 12 18:57:16 2013
@@ -1,18 +1,20 @@
/*
- * Copyright 2013 Apache Software Foundation
- *
- * Licensed 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.
- */
+* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights
Reserved.
+*
+* WSO2 Inc. 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.
+*/
package org.apache.synapse.deployers;
import org.apache.axiom.om.OMElement;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
Fri Jul 12 18:57:16 2013
@@ -34,10 +34,10 @@ import org.apache.synapse.commons.jmx.MB
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
-import org.apache.synapse.core.relay.RelayConstants;
-import org.apache.synapse.core.relay.RelayUtils;
import org.apache.synapse.mediators.MediatorFaultHandler;
import org.apache.synapse.mediators.MediatorProperty;
+import org.apache.synapse.transport.passthru.util.RelayConstants;
+import org.apache.synapse.transport.passthru.util.RelayUtils;
import java.util.*;
@@ -289,7 +289,7 @@ public abstract class AbstractEndpoint e
if (contentAware) {
try {
- RelayUtils.buildMessage(synCtx);
+ RelayUtils.buildMessage(((Axis2MessageContext)
synCtx).getAxis2MessageContext(),false);
axis2Ctx.setProperty(RelayConstants.FORCE_RESPONSE_EARLY_BUILD, Boolean.TRUE);
} catch (Exception e) {
handleException("Error while building message", e);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/SALoadbalanceEndpoint.java
Fri Jul 12 18:57:16 2013
@@ -23,13 +23,14 @@ import org.apache.axis2.context.Configur
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
-import org.apache.synapse.core.relay.RelayUtils;
import org.apache.synapse.endpoints.dispatch.Dispatcher;
import org.apache.synapse.endpoints.dispatch.HttpSessionDispatcher;
import org.apache.synapse.endpoints.dispatch.SALSessions;
import org.apache.synapse.endpoints.dispatch.SessionInformation;
import org.apache.synapse.mediators.MediatorProperty;
+import org.apache.synapse.transport.passthru.util.RelayUtils;
import javax.xml.stream.XMLStreamException;
import java.io.IOException;
@@ -108,7 +109,7 @@ public class SALoadbalanceEndpoint exten
if (!(dispatcher instanceof HttpSessionDispatcher)) {
try {
- RelayUtils.buildMessage(synCtx);
+ RelayUtils.buildMessage(((Axis2MessageContext)
synCtx).getAxis2MessageContext(),false);
} catch (Exception e) {
handleException("Error while building message", e);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java
Fri Jul 12 18:57:16 2013
@@ -24,7 +24,8 @@ import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.core.relay.RelayUtils;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.transport.passthru.util.RelayUtils;
import java.util.ArrayList;
import java.util.List;
@@ -58,7 +59,7 @@ public abstract class AbstractListMediat
if (contentAware) {
try {
- RelayUtils.buildMessage(synCtx);
+ RelayUtils.buildMessage(((Axis2MessageContext)
synCtx).getAxis2MessageContext(),false);
} catch (Exception e) {
handleException("Error while building message", e, synCtx);
}
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
(original)
+++
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
Fri Jul 12 18:57:16 2013
@@ -188,8 +188,8 @@ public class TestSamplesHandlerSuite ext
sampleClassRepo.put("59", Sample59.class);
//QoS
- sampleClassRepo.put("100", Sample100.class);
- //sampleClassRepo.put("101", Sample101.class);
+ //sampleClassRepo.put("100", Sample100.class);
+ sampleClassRepo.put("101", Sample101.class);
//Proxy Service
sampleClassRepo.put("150", Sample150.class);
@@ -198,7 +198,7 @@ public class TestSamplesHandlerSuite ext
//sampleClassRepo.put("153", Sample153.class); // unable to load the
JKS files
sampleClassRepo.put("154", Sample154.class);
sampleClassRepo.put("155", Sample155.class);
- sampleClassRepo.put("156", Sample156.class);
+ //sampleClassRepo.put("156", Sample156.class);
sampleClassRepo.put("157", Sample157.class);
//Advanced
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
(original)
+++
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
Fri Jul 12 18:57:16 2013
@@ -170,8 +170,6 @@ public class StockQuoteSampleClient {
payload = StockQuoteHandler.createStandardQuoteRequest(
symbol, 1);
serviceClient.getOptions().setAction("urn:getQuote");
- serviceClient.getOptions().setUseSeparateListener(true);
- serviceClient.engageModule("addressing");
setCompleted(false);
serviceClient.sendReceiveNonBlocking(payload, new
StockQuoteCallback(this));
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/proxy/Sample155.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/proxy/Sample155.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/proxy/Sample155.java
(original)
+++
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/proxy/Sample155.java
Fri Jul 12 18:57:16 2013
@@ -42,7 +42,7 @@ public class Sample155 extends SynapseTe
log.info("Running test: Dual channel invocation on both client side
and server " +
"side of Synapse with Proxy Services");
SampleClientResult result = client.requestDualQuote(addUrl, null,
null, "IBM");
- assertTrue("Client did not run successfully ",
result.responseReceived());
+ assertTrue("Client did not get run successfully ",
result.responseReceived());
}
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
Fri Jul 12 18:57:16 2013
@@ -153,4 +153,14 @@ public class NhttpConstants {
*/
public static final String SO_TIMEOUT_RECEIVER =
"http.socket.timeout.receiver";
public static final String SO_TIMEOUT_SENDER =
"http.socket.timeout.sender";
+
+ /** This property can be used to set the HOST header sent from the client
to synapse */
+ public static final String REQUEST_HOST_HEADER = "REQUEST_HOST_HEADER";
+
+
+ /** The name of the system property used to specify/override the nhttp
properties location */
+ public static final String NHTTP_PROPERTIES = "nhttp.properties";
+
+ //property name of nhttp log directory
+ public static final String NHTTP_LOG_DIRECTORY = "nhttp.log.directory";
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
Fri Jul 12 18:57:16 2013
@@ -22,13 +22,19 @@ package org.apache.synapse.transport.nht
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisBindingOperation;
+import org.apache.axis2.description.AxisEndpoint;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.WSDL20DefaultValueHolder;
import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher;
import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIOperationDispatcher;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.util.URIEncoderDecoder;
@@ -287,4 +293,32 @@ public class RESTUtil {
msgContext.setAxisService(axisService);
}
}
+
+ public static void dispatchAndVerify(MessageContext msgContext) throws
AxisFault {
+ RequestURIBasedDispatcher requestDispatcher = new
RequestURIBasedDispatcher();
+ requestDispatcher.invoke(msgContext);
+ AxisService axisService = msgContext.getAxisService();
+ if (axisService != null) {
+ HTTPLocationBasedDispatcher httpLocationBasedDispatcher =
+ new HTTPLocationBasedDispatcher();
+ httpLocationBasedDispatcher.invoke(msgContext);
+ if (msgContext.getAxisOperation() == null) {
+ RequestURIOperationDispatcher requestURIOperationDispatcher =
+ new RequestURIOperationDispatcher();
+ requestURIOperationDispatcher.invoke(msgContext);
+ }
+
+ AxisOperation axisOperation;
+ if ((axisOperation = msgContext.getAxisOperation()) != null) {
+ AxisEndpoint axisEndpoint =
+ (AxisEndpoint)
msgContext.getProperty(WSDL2Constants.ENDPOINT_LOCAL_NAME);
+ if (axisEndpoint != null) {
+ AxisBindingOperation axisBindingOperation =
(AxisBindingOperation) axisEndpoint
+ .getBinding().getChild(axisOperation.getName());
+ msgContext.setProperty(Constants.AXIS_BINDING_OPERATION,
axisBindingOperation);
+ }
+ msgContext.setAxisOperation(axisOperation);
+ }
+ }
+ }
}
Modified: synapse/trunk/java/repository/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/axis2.xml?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/axis2.xml (original)
+++ synapse/trunk/java/repository/conf/axis2.xml Fri Jul 12 18:57:16 2013
@@ -507,7 +507,6 @@
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
<order phase="Transport"/>
</handler>
- <handler name="EarlyBuilder"
class="org.apache.synapse.core.relay.ServiceRequestEarlyBuilder"/>
</phase>
<phase name="Addressing">
<handler name="AddressingBasedDispatcher"
Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_156.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_156.xml?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_156.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_156.xml Fri Jul 12
18:57:16 2013
@@ -59,7 +59,6 @@
<source type="property" property="REQUEST"/>
<target type="body"/>
</enrich>
- <header name="Action" value="urn:getQuote"/>
<send receive="ClientOutSeq">
<endpoint name="SimpleStockQuoteService">
<address
uri="http://localhost:9000/services/SimpleStockQuoteService"/>
Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_5.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_5.xml?rev=1502655&r1=1502654&r2=1502655&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_5.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_5.xml Fri Jul 12
18:57:16 2013
@@ -22,6 +22,9 @@
<definitions xmlns="http://ws.apache.org/ns/synapse";>
<sequence name="myFaultHandler">
+ <log level="custom">
+ <property name="******ERROR"
expression="get-property('ERROR_MESSAGE')"/>
+ </log>
<makefault response="true">
<code xmlns:tns="http://www.w3.org/2003/05/soap-envelope";
value="tns:Receiver"/>
<reason expression="get-property('ERROR_MESSAGE')"/>
