You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2006/01/17 04:24:53 UTC
svn commit: r369654 - in /incubator/synapse/trunk/java: ./
src/org/apache/synapse/axis2/ test/org/apache/synapse/environment/
test/org/apache/synapse/spi/injection/ test/org/apache/synapse/util/ xdocs/
Author: saminda
Date: Mon Jan 16 19:24:36 2006
New Revision: 369654
URL: http://svn.apache.org/viewcvs?rev=369654&view=rev
Log:
Cleanup the code
Modified:
incubator/synapse/trunk/java/maven.xml
incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java
incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java
incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java
incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java
incubator/synapse/trunk/java/xdocs/userguide.html
Modified: incubator/synapse/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/maven.xml?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/maven.xml (original)
+++ incubator/synapse/trunk/java/maven.xml Mon Jan 16 19:24:36 2006
@@ -298,6 +298,7 @@
<!-- ================================================================ -->
<goal name="javadocs" prereqs="init">
+ <deploy:copy-deps todir="target/lib"/>
<ant:javadoc packagenames="org.apache.synapse.*"
defaultexcludes="yes"
destdir="target/apidocs"
@@ -346,12 +347,13 @@
<!--- dist-bin -->
<!-- ================================================================ -->
- <goal name="dist-bin" prereqs="war,samples_userguide">
+ <goal name="dist-bin" prereqs="war,samples_userguide,javadocs">
<property name="bin.dist.dir"
value="target/dist-bin/${pom.artifactId}-${pom.currentVersion}-bin"/>
<ant:mkdir dir="${bin.dist.dir}"/>
<ant:mkdir dir="${dist.dir}"/>
<ant:mkdir dir="${bin.dist.dir}/docs"/>
+ <ant:mkdir dir="${bin.dist.dir}/xdocs"/>
<ant:mkdir dir="${bin.dist.dir}/bin"/>
<ant:mkdir dir="${bin.dist.dir}/lib"/>
<ant:mkdir dir="${bin.dist.dir}/synapse_repository"/>
@@ -359,6 +361,11 @@
<ant:copy todir="${bin.dist.dir}/docs">
+ <ant:fileset dir="target/apidocs">
+ <ant:include name="**"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy todir="${bin.dist.dir}/xdocs">
<ant:fileset dir="xdocs">
<ant:include name="**"/>
</ant:fileset>
@@ -414,6 +421,7 @@
<gzip src="target/${dist.name}-bin.tar"
zipfile="${dist.dir}/${dist.name}-bin.tar.gz"/>
<ant:delete dir="target/dist-bin"/>
+ <ant:delete dir="target/samples/"/>
<ant:delete file="target/${dist.name}-bin.tar"/>
</goal>
<!-- ================================================================ -->
Modified: incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java (original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java Mon Jan 16 19:24:36 2006
@@ -33,20 +33,16 @@
import org.apache.synapse.Constants;
/**
-
-
- *
- * <p>
+ * <p/>
* The SynapseEnvironment needs to be set up and then is used by the SynapseMessageReceiver to inject messages.
* This class is used by the SynapseMessageReceiver to find the environment. The env is stored in a Parameter to the Axis2 config
- *
- *
*/
public class Axis2SynapseEnvironmentFinder implements Constants {
- public static synchronized SynapseEnvironment getSynapseEnvironment(
+ public static synchronized SynapseEnvironment getSynapseEnvironment(
MessageContext mc) {
- AxisConfiguration ac = mc.getConfigurationContext().getAxisConfiguration();
+ AxisConfiguration ac =
+ mc.getConfigurationContext().getAxisConfiguration();
Parameter synapseEnvParam = ac.getParameter(SYNAPSE_ENVIRONMENT);
if (synapseEnvParam == null) {
@@ -69,7 +65,6 @@
}
OMElement config = builder.getDocumentElement();
- // todo: ---- following needed to be added.
config.build();
Axis2SynapseEnvironment se = new Axis2SynapseEnvironment(config, mc
.getAxisService().getClassLoader());
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java Mon Jan 16 19:24:36 2006
@@ -45,7 +45,7 @@
// this test case throws exceptions if fail
// exceptions are propergated from Synapes Server
ServiceClient serviceClient = new ServiceClient(
- Axis2EvnSetup.getConfigurationContextFromFileSystem(
+ Axis2EvnSetup.createConfigurationContextFromFileSystem(
"target/synapse-repository-environmentaware"), null);
Options options = new Options();
options.setTo(targetEpr);
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java Mon Jan 16 19:24:36 2006
@@ -48,7 +48,7 @@
public void testFaultPrcessor() throws Exception {
ServiceClient serviceClient = new ServiceClient(
- Axis2EvnSetup.getConfigurationContextFromFileSystem(
+ Axis2EvnSetup.createConfigurationContextFromFileSystem(
"target/synapse-repository-fault"), null);
Options co = new Options();
co.setTo(targetEpr);
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java Mon Jan 16 19:24:36 2006
@@ -51,7 +51,7 @@
public void testSendProcessor() throws Exception {
ServiceClient serviceClient = new ServiceClient(
- Axis2EvnSetup.getConfigurationContextFromFileSystem(
+ Axis2EvnSetup.createConfigurationContextFromFileSystem(
"target/synapse-repository-httptcp"), null);
Options options = new Options();
options.setTo(targetEpr);
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java Mon Jan 16 19:24:36 2006
@@ -42,7 +42,7 @@
public void testSendPrcessor() throws Exception {
ServiceClient serviceClient = new ServiceClient(
- Axis2EvnSetup.getConfigurationContextFromFileSystem(
+ Axis2EvnSetup.createConfigurationContextFromFileSystem(
"target/synapse-repository-send"), null);
Options co = new Options();
co.setTo(targetEpr);
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java Mon Jan 16 19:24:36 2006
@@ -52,7 +52,7 @@
public void testSendProcessor() throws Exception {
ServiceClient serviceClient = new ServiceClient(
- Axis2EvnSetup.getConfigurationContextFromFileSystem(
+ Axis2EvnSetup.createConfigurationContextFromFileSystem(
"target/synapse-repository-sendon"), null);
Options options = new Options();
options.setTo(targetEpr);
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java Mon Jan 16 19:24:36 2006
@@ -53,7 +53,7 @@
public void testSendProcessor() throws Exception {
ServiceClient serviceClient = new ServiceClient(
- Axis2EvnSetup.getConfigurationContextFromFileSystem(
+ Axis2EvnSetup.createConfigurationContextFromFileSystem(
"target/synapse-repository-sendon"), null);
Options options = new Options();
options.setTo(targetEpr);
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java Mon Jan 16 19:24:36 2006
@@ -110,7 +110,7 @@
return method;
}
- public static ConfigurationContext getConfigurationContextFromFileSystem(String repository) throws AxisFault {
+ public static ConfigurationContext createConfigurationContextFromFileSystem(String repository) throws AxisFault {
ConfigurationContextFactory fac = new ConfigurationContextFactory();
ConfigurationContext configContext =
fac.createConfigurationContextFromFileSystem(repository);
Modified: incubator/synapse/trunk/java/xdocs/userguide.html
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/xdocs/userguide.html?rev=369654&r1=369653&r2=369654&view=diff
==============================================================================
--- incubator/synapse/trunk/java/xdocs/userguide.html (original)
+++ incubator/synapse/trunk/java/xdocs/userguide.html Mon Jan 16 19:24:36 2006
@@ -38,17 +38,23 @@
<li><p>A lightweight server which runs with its own HTTP server : This uses
Axis2's SimpleHTTPServer which is a simple lightweight HTTP server option
that does not require a Servlet Engine. First unzip the
- Synapse-M1-SNAPSHOT.zip. In the bin directory you will find a script
+ Synapse-M1.zip. In the bin directory you will find scripts
called:</p>
<pre>synapse [.sh or .bat]</pre>
<p>You should also see a directory called <tt>synapse-repository</tt>.
There you will find the axis2.xml and synapse.xml config files. The
axis2.xml need not be modified, but you can do so if you want to.</p>
<p>The command line for synapse-lightweight takes the repository
- directory and listening port:</p>
- <pre>sh bin/synapse.sh synapse-repository 8080 [Linux]
+ directory and listening port. Change directory to bin/</p>
+ <pre>sh synapse.sh ../synapse-repository -p [Linux]
-bin\synapse synapse-repository 8080 [Win]</pre>
+synapse ../synapse-repository -p [Win]</pre>
+ <p>which will start the SimpleHTTPServer at port 8080. If it's needed
+ to be started at any other port use -p[port_number]. Ex:
+ </p>
+ <pre>
+ ./synapse.sh ../synapse-repository -p5043
+ </pre>
</li>
</ol>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org