Author: asankha
Date: Thu Nov 16 03:04:14 2006
New Revision: 475681
URL: http://svn.apache.org/viewvc?view=rev&rev=475681
Log:
binary distribution - take 2
Added:
incubator/synapse/branches/MVN2/modules/core/src/main/resources/
incubator/synapse/branches/MVN2/modules/core/src/main/resources/log4j.properties
- copied unchanged from r475402,
incubator/synapse/branches/MVN2/modules/core/conf/log4j.properties
incubator/synapse/branches/MVN2/modules/core/src/main/resources/metrics_module.xml
- copied unchanged from r475402,
incubator/synapse/branches/MVN2/modules/core/conf/metrics_module.xml
incubator/synapse/branches/MVN2/modules/core/src/main/resources/module.xml
- copied unchanged from r475402,
incubator/synapse/branches/MVN2/modules/core/conf/module.xml
incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_7.xml
incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_8.xml
incubator/synapse/branches/MVN2/src/main/release/docs/endorsed_libs.txt
Removed:
incubator/synapse/branches/MVN2/modules/core/conf/log4j.properties
incubator/synapse/branches/MVN2/modules/core/conf/metrics_module.xml
incubator/synapse/branches/MVN2/modules/core/conf/module.xml
Modified:
incubator/synapse/branches/MVN2/modules/core/pom.xml
incubator/synapse/branches/MVN2/modules/core/src/main/java/org/apache/synapse/SynapseHTTPServer.java
incubator/synapse/branches/MVN2/modules/samples/src/main/scripts/userguide/build.xml
incubator/synapse/branches/MVN2/pom.xml
incubator/synapse/branches/MVN2/src/main/assembly/bin.xml
incubator/synapse/branches/MVN2/src/main/assembly/src.xml
incubator/synapse/branches/MVN2/src/main/bin/synapse.bat
incubator/synapse/branches/MVN2/src/main/bin/synapse.sh
incubator/synapse/branches/MVN2/src/site/site.xml
Modified: incubator/synapse/branches/MVN2/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/modules/core/pom.xml?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
--- incubator/synapse/branches/MVN2/modules/core/pom.xml (original)
+++ incubator/synapse/branches/MVN2/modules/core/pom.xml Thu Nov 16 03:04:14
2006
@@ -34,7 +34,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<version>${addressing.version}</version>
<type>mar</type>
@@ -64,7 +64,7 @@
<echo message="*** Creating synapse.mar ***"/>
<mkdir dir="target/modules/synapse/META-INF"/>
- <copy file="conf/module.xml"
tofile="target/modules/synapse/META-INF/module.xml"/>
+ <copy file="src/main/resources/module.xml"
tofile="target/modules/synapse/META-INF/module.xml"/>
<jar jarfile="target/synapse-${version}.mar">
<fileset dir="target/modules/synapse">
<include name="**"/>
Modified:
incubator/synapse/branches/MVN2/modules/core/src/main/java/org/apache/synapse/SynapseHTTPServer.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/modules/core/src/main/java/org/apache/synapse/SynapseHTTPServer.java?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
---
incubator/synapse/branches/MVN2/modules/core/src/main/java/org/apache/synapse/SynapseHTTPServer.java
(original)
+++
incubator/synapse/branches/MVN2/modules/core/src/main/java/org/apache/synapse/SynapseHTTPServer.java
Thu Nov 16 03:04:14 2006
@@ -31,31 +31,22 @@
public class SynapseHTTPServer {
public static void printUsage() {
- System.out.println("Usage: SynapseHTTPServer [options] <repository>");
+ System.out.println("Usage: SynapseHTTPServer <repository>");
System.out.println(" Opts: -? this message");
- System.out.println();
- System.out.println(" -p port to listen on (default is 8080)");
System.exit(1);
}
public static void main(String[] args) throws Exception {
- int port = 8080;
OptionsParser optionsParser = new OptionsParser(args);
args = optionsParser.getRemainingArgs();
// first check if we should print usage
if ((optionsParser.isFlagSet('?') > 0) ||
(optionsParser.isFlagSet('h') > 0) ||
- args == null || args.length == 0 || args.length > 2) {
+ args == null || args.length == 0 || args.length > 1) {
printUsage();
}
- String paramPort = optionsParser.isValueSet('p');
- if (paramPort != null) {
- port = Integer.parseInt(paramPort);
- }
- args = optionsParser.getRemainingArgs();
- System.out.println("[SynapseHTTPServer] Starting on port " + port +
"...");
System.out.println("[SynapseHTTPServer] Using the Axis2 Repository "
+ new File(args[0]).getAbsolutePath());
Modified:
incubator/synapse/branches/MVN2/modules/samples/src/main/scripts/userguide/build.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/modules/samples/src/main/scripts/userguide/build.xml?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
---
incubator/synapse/branches/MVN2/modules/samples/src/main/scripts/userguide/build.xml
(original)
+++
incubator/synapse/branches/MVN2/modules/samples/src/main/scripts/userguide/build.xml
Thu Nov 16 03:04:14 2006
@@ -184,7 +184,7 @@
</target>
<target name="compile" depends="init" description="Compile all Java">
- <javac srcdir="src" destdir="${class.dir}">
+ <javac srcdir="." destdir="${class.dir}">
<classpath refid="javac.classpath"/>
</javac>
</target>
Modified: incubator/synapse/branches/MVN2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/pom.xml?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
--- incubator/synapse/branches/MVN2/pom.xml (original)
+++ incubator/synapse/branches/MVN2/pom.xml Thu Nov 16 03:04:14 2006
@@ -71,29 +71,30 @@
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
-
<!--<descriptor>src/main/assembly/src.xml</descriptor>-->
+
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<finalName>synapse-${synapse.version}</finalName>
</configuration>
</plugin>
<!--<plugin>-->
- <!--<artifactId>maven-site-plugin</artifactId>-->
- <!--<inherited>false</inherited>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>jar</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--<configuration>-->
- <!--<attach>true</attach>-->
- <!--</configuration>-->
+ <!--<artifactId>maven-site-plugin</artifactId>-->
+ <!--<inherited>false</inherited>-->
<!--</plugin>-->
+ <!---->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
</plugins>
</build>
<activation>
@@ -116,32 +117,6 @@
</configuration>
</plugin>
-
- <!--
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
- -->
</plugins>
</build>
@@ -199,12 +174,35 @@
</dependencyManagement>
<dependencies>
+ <!-- core Axis2 -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
+ <artifactId>axis2-codegen</artifactId>
<version>${axis2.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+
+ <!-- core Axiom -->
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>${axiom.version}</version>
@@ -223,7 +221,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-rahas</artifactId>
- <version>${axis2.version}</version>
+ <version>${axis2.security.version}</version>
</dependency>
<dependency>
@@ -233,7 +231,7 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.neethi</groupId>
+ <groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${neethi.version}</version>
</dependency>
@@ -247,13 +245,13 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-secpolicy</artifactId>
- <version>${axis2.version}</version>
+ <version>${axis2.security.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-security</artifactId>
- <version>${axis2.version}</version>
+ <version>${axis2.security.version}</version>
</dependency>
<dependency>
@@ -270,7 +268,7 @@
<!-- external MARs -->
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<version>${addressing.version}</version>
<type>mar</type>
@@ -284,9 +282,9 @@
</dependency>
<dependency>
- <groupId>axis2</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.version}</version>
+ <version>${axis2.security.version}</version>
<type>mar</type>
</dependency>
@@ -338,11 +336,6 @@
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- </dependency>
- <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
@@ -384,49 +377,17 @@
<version>${jakarta.httpcore.version}</version>
</dependency>
- <!-- For nhttp -->
- <!--<dependency>-->
- <!--<groupId>directory-network</groupId>-->
- <!--<artifactId>mina</artifactId>-->
- <!--<version>${mina.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>concurrent</groupId>-->
- <!--<artifactId>concurrent</artifactId>-->
- <!--<version>1.3.4</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-simple</artifactId>-->
- <!--<version>${slf4j.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>asyncweb</groupId>-->
- <!--<artifactId>asyncWeb</artifactId>-->
- <!--<version>${asyncWeb.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>asyncweb</groupId>-->
- <!--<artifactId>asyncWeb_API</artifactId>-->
- <!--<version>${asyncWeb.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>asyncweb</groupId>-->
- <!--<artifactId>asyncWeb_CommonCodecs</artifactId>-->
- <!--<version>${asyncWeb.version}</version>-->
- <!--</dependency>-->
-
</dependencies>
- <!--<reporting>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<inherited>false</inherited>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<aggregate>true</aggregate>-->
- <!--</configuration>-->
- <!--</plugin>-->
+ <reporting>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
<!--<plugin>-->
<!--<artifactId>maven-changes-plugin</artifactId>-->
<!--<reportSets>-->
@@ -454,8 +415,8 @@
<!--<artifactId>maven-site-plugin</artifactId>-->
<!--<inherited>false</inherited>-->
<!--</plugin>-->
- <!--</plugins>-->
- <!--</reporting>-->
+ </plugins>
+ </reporting>
<distributionManagement>
<!--
@@ -477,99 +438,90 @@
</distributionManagement>
<repositories>
+ <!--<repository>-->
+ <!--<id>m1-local-repo</id>-->
+ <!--<url>file://${user.home}/.maven/repository</url>-->
+ <!--<layout>legacy</layout>-->
+ <!--<snapshots>-->
+ <!--<enabled>true</enabled>-->
+ <!--</snapshots>-->
+ <!--<releases>-->
+ <!--<enabled>true</enabled>-->
+ <!--</releases>-->
+ <!--</repository>-->
<repository>
- <id>m1-local-reps</id>
- <url>file://${user.home}/.maven/repository</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>ibiblio</id>
- <name>Ibiblio Maven Repo</name>
- <layout>legacy</layout>
+ <id>ibiblio-m2</id>
+ <name>Ibiblio Maven 2 Repo</name>
<url>http://www.ibiblio.org/maven2</url>
<releases>
<updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
<repository>
- <id>Apache People</id>
- <name>Apache People Repo</name>
+ <id>ibiblio-m1</id>
+ <name>Ibiblio Maven 1 Repo</name>
<layout>legacy</layout>
- <url>http://people.apache.org/repository</url>
+ <url>http://www.ibiblio.org/maven</url>
<releases>
<updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
<repository>
- <id>Apache Dist</id>
- <name>Apache Dist Repo</name>
+ <id>Apache Repo1</id>
+ <name>Apache Repo1</name>
<layout>legacy</layout>
- <url>http://www.apache.org/dist/java-repository</url>
+ <url>http://repo1.maven.org/maven/</url>
<releases>
<updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
<repository>
- <id>openejb</id>
- <name>Openejb Repo</name>
+ <id>Apache Zones</id>
+ <name>Apache Zones</name>
<layout>legacy</layout>
- <url>http://www.openejb.org/maven</url>
+ <url>http://ws.zones.apache.org/repository/</url>
<releases>
<updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
<repository>
- <id>codehaus</id>
- <name>Codehaus Repo</name>
+ <id>Apache People</id>
+ <name>Apache People Repo</name>
<layout>legacy</layout>
- <url>http://dist.codehaus.org</url>
+ <url>http://people.apache.org/repository</url>
<releases>
<updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
<repository>
- <id>sunsite</id>
- <name>Sunsite Repo</name>
+ <id>Apache People Ibiblio RSync</id>
+ <name>Apache People Ibiblio RSync</name>
<layout>legacy</layout>
- <url>http://mirrors.sunsite.dk/maven</url>
+
<url>http://people.apache.org/repo/m1-ibiblio-rsync-repository/</url>
<releases>
<updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
<repository>
- <id>sourceforge</id>
- <name>Sourceforge Repo</name>
+ <id>Jibx</id>
+ <name>Jibx</name>
<layout>legacy</layout>
- <url>http://jibx.sourceforge.net/maven</url>
+ <url>http://jibx.sourceforge.net/maven/</url>
<releases>
<updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
- <!--<repository>-->
- <!--<id>asankha</id>-->
- <!--<name>Asankha Repo</name>-->
- <!--<layout>legacy</layout>-->
- <!--<url>http://people.apache.org/~asankha/maven</url>-->
- <!--<releases>-->
- <!--<updatePolicy>interval:1440</updatePolicy>-->
- <!--</releases>-->
- <!--</repository>-->
<repository>
- <id>maven-snaps</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <id>asankha</id>
+ <name>asankha</name>
+ <layout>legacy</layout>
+ <url>http://people.apache.org/~asankha/maven/</url>
<releases>
- <enabled>false</enabled>
+ <updatePolicy>interval:1440</updatePolicy>
</releases>
</repository>
+
+
</repositories>
<modules>
@@ -581,32 +533,32 @@
<properties>
<synapse.version>0.90-SNAPSHOT</synapse.version>
- <axis2.version>1.1-SNAPSHOT</axis2.version>
- <axiom.version>SNAPSHOT</axiom.version>
+ <axis2.version>1.1</axis2.version>
+ <axis2.security.version>1.1-SNAPSHOT</axis2.security.version>
+ <axiom.version>1.2</axiom.version>
<xml_schema.version>SNAPSHOT</xml_schema.version>
- <neethi.version>SNAPSHOT</neethi.version>
+ <neethi.version>2.0</neethi.version>
<wss4j.version>SNAPSHOT</wss4j.version>
<xmlsec.version>1.3.0</xmlsec.version>
- <woden.version>SNAPSHOT</woden.version>
+ <woden.version>1.0.0M6</woden.version>
- <addressing.version>SNAPSHOT</addressing.version>
+ <addressing.version>1.1</addressing.version>
<sandesha2.version>SNAPSHOT</sandesha2.version>
- <rampart.version>SNAPSHOT</rampart.version>
+ <rampart.version>1.1</rampart.version>
- <commons.logging.version>1.0.4</commons.logging.version>
- <commons.httpclient.version>3.0</commons.httpclient.version>
+ <commons.logging.version>1.1</commons.logging.version>
+ <commons.httpclient.version>3.0.1</commons.httpclient.version>
<commons.codec.version>1.3</commons.codec.version>
- <commons.fileupload.version>1.0</commons.fileupload.version>
+ <commons.fileupload.version>1.1.1</commons.fileupload.version>
<jakarta.httpcore.version>4.0-alpha2</jakarta.httpcore.version>
<log4j.version>1.2.13</log4j.version>
- <junit.version>3.8.1</junit.version>
- <jaxen.version>1.1-beta-8</jaxen.version>
+ <junit.version>3.8.2</junit.version>
+ <jaxen.version>1.1-beta-10</jaxen.version>
<servletapi.version>2.3</servletapi.version>
- <wsdl4j.version>1.5.2</wsdl4j.version>
- <axis.wsdl4j.version>1.2</axis.wsdl4j.version>
+ <wsdl4j.version>1.6.1</wsdl4j.version>
<annogen.version>0.1.0</annogen.version>
-
<backport_util_concurrent.version>2.1</backport_util_concurrent.version>
+
<backport_util_concurrent.version>2.2</backport_util_concurrent.version>
<geronimo.spec.javamail.version>1.3.1-rc5</geronimo.spec.javamail.version>
<geronimo.spec.activation.version>1.0.2-rc4</geronimo.spec.activation.version>
@@ -614,11 +566,7 @@
<stax.impl.groupid>woodstox</stax.impl.groupid>
<stax.impl.artifactid>wstx</stax.impl.artifactid>
- <stax.impl.version>asl-3.0rc1</stax.impl.version>
+ <stax.impl.version>asl-3.0.1</stax.impl.version>
<stax.api.version>1.0.1</stax.api.version>
-
- <mina.version>0.8.0</mina.version>
- <slf4j.version>1.0</slf4j.version>
- <asyncWeb.version>0.8.2</asyncWeb.version>
</properties>
</project>
Added:
incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_7.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_7.xml?view=auto&rev=475681
==============================================================================
--- incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_7.xml
(added)
+++ incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_7.xml
Thu Nov 16 03:04:14 2006
@@ -0,0 +1,58 @@
+<synapse xmlns="http://ws.apache.org/ns/synapse";>
+
+ <-- introduction of static inline XML properties and the validation
mediator -->
+ <definitions>
+
+ <!-- define a static property for an XSD schema resource as an inline
XML fragment -->
+ <set-property name="validate_schema">
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns="http://www.apache-synapse.org/test"; elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://www.apache-synapse.org/test";>
+ <xs:element name="CheckPriceRequest">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Code"
type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:schema>
+ </set-property>
+
+ <endpoint name="stockquote"
address="http://localhost:9000/axis2/services/SimpleStockQuoteService"/>
+
+ <sequence name="customrequest">
+ <!-- is this a valid custom request ? -->
+ <validate>
+ <schema key="validate_schema"/>
+ <on-fail>
+ <!-- if the request does not validate againt schema
throw a fault -->
+ <makefault>
+ <code value="tns:Receiver"
xmlns:tns="http://www.w3.org/2003/05/soap-envelope"/>
+ <reason value="Invalid custom quote request"/>
+ </makefault>
+
+ <!-- send the fault and stop processing -->
+ <send/>
+ </on-fail>
+ </validate>
+
+ <!-- send message to real endpoint referenced by name "stockquote" and
stop -->
+ <send>
+ <endpoint ref="stockquote"/>
+ </send>
+ </sequence>
+
+ </definitions>
+
+ <rules>
+ <in>
+ <!-- is this a custom stock quote message? -->
+ <filter xpath="//m0:CheckPriceRequest"
xmlns:m0="http://www.apache-synapse.org/test";>
+ <sequence ref="customrequest"/>
+ </filter>
+ </in>
+
+ <!-- just let the message flow through -->
+ <send/>
+
+ </rules>
+
+</synapse>
\ No newline at end of file
Added:
incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_8.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_8.xml?view=auto&rev=475681
==============================================================================
--- incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_8.xml
(added)
+++ incubator/synapse/branches/MVN2/repository/conf/sample/synapse_sample_8.xml
Thu Nov 16 03:04:14 2006
@@ -0,0 +1,70 @@
+<synapse xmlns="http://ws.apache.org/ns/synapse";>
+
+ <!-- introduction to URL source properties, registry based properties
and the XSLT mediator -->
+
+ <!-- the SimpleURLRegistry allows access to a URL based resource store
such as the -->
+ <!-- file system (file://) or a web server (http://) -->
+ <registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
+ <!-- the root property of the simple URL registry helps resolve
a resource URL as root + key -->
+ <property name="root"
value="file:repository/conf/sample/resources/"/>
+ <!-- all resources loaded from the URL registry would be cached
for this number of secs -->
+ <property name="cachableDuration" value="15000"/>
+ </registry>
+
+ <definitions>
+
+ <!-- define a static property for the first XSLT resource as an URL
source (could be any URL src) -->
+ <set-property name="xslt-key-req"
src="file:repository/conf/sample/resources/transform/transform.xslt"/>
+
+ <!-- define a dynamic property for the second XSLT resource as a key
reference to the registry -->
+ <!-- the key is just a unique identifier for a resource on the
registry. It is treated as a string literal -->
+ <set-property name="xslt-key-resp" key="transform/transform_back.xslt"/>
+
+ <!-- define a reuseable endpoint definition and use it within config -->
+ <endpoint name="stockquote"
address="http://localhost:9000/axis2/services/SimpleStockQuoteService"/>
+
+ <sequence name="customrequest">
+
+ <!-- set correlation field to custom label -->
+ <set-property name="correlate/label" value="customquote"/>
+
+ <!-- transform the custom quote into a standard quote requst -->
+ <xslt key="xslt-key-req"/>
+
+ <!-- send message to real endpoint referenced by name "stockquote" and
stop -->
+ <send>
+ <endpoint ref="stockquote"/>
+ </send>
+ </sequence>
+
+ <sequence name="customresponse">
+ <!-- transform the custom quote into a standard quote requst -->
+ <xslt key="xslt-key-resp"/>
+
+ <!-- now send the custom response back to the client and stop -->
+ <send/>
+ </sequence>
+
+ </definitions>
+
+ <rules>
+ <in>
+ <!-- is this a custom stock quote message? if so transform to a
standard request -->
+ <filter xpath="//m0:CheckPriceRequest"
xmlns:m0="http://www.apache-synapse.org/test";>
+ <sequence ref="customrequest"/>
+ </filter>
+ </in>
+
+ <out>
+ <!-- is this a standard stock quote reply? if so transform this
back to the custom format -->
+ <filter source="get-property('correlate/label')"
regex="customquote">
+ <sequence ref="customresponse"/>
+ </filter>
+ </out>
+
+ <!-- just let the message flow through -->
+ <send/>
+
+ </rules>
+
+</synapse>
\ No newline at end of file
Modified: incubator/synapse/branches/MVN2/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/src/main/assembly/bin.xml?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
--- incubator/synapse/branches/MVN2/src/main/assembly/bin.xml (original)
+++ incubator/synapse/branches/MVN2/src/main/assembly/bin.xml Thu Nov 16
03:04:14 2006
@@ -48,6 +48,20 @@
<outputDirectory>synapse-${synapse.version}/repository</outputDirectory>
</fileSet>
<fileSet>
+ <directory>repository/conf</directory>
+
<outputDirectory>synapse-${synapse.version}/samples/client_repo/conf</outputDirectory>
+ <includes>
+ <include>axis2.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/core/target</directory>
+
<outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
+ <includes>
+ <include>synapse-${synapse.version}.mar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>src/main/release/docs</directory>
<outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
<includes>
@@ -55,13 +69,18 @@
</includes>
</fileSet>
<fileSet>
- <directory>modules/samples</directory>
+ <directory>modules/samples/src/main/java</directory>
<outputDirectory>synapse-${synapse.version}/samples</outputDirectory>
<excludes>
<exclude>**/target</exclude>
<exclude>**/target/**/*</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>modules/samples/src/main/scripts/userguide</directory>
+
<outputDirectory>synapse-${synapse.version}/samples</outputDirectory>
+ </fileSet>
+
<!--<fileSet>-->
<!--<directory>target/javadoc</directory>-->
<!--<outputDirectory>synapse-${synapse.version}/docs/api</outputDirectory>-->
@@ -83,20 +102,53 @@
<!--<include>synapse-incubator.jar</include>-->
<!--</includes>-->
<!--</fileSet>-->
+
+ <fileSet>
+ <directory>modules/core/target</directory>
+ <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
+ <includes>
+ <include>synapse-core-${synapse.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/extensions/target</directory>
+
<outputDirectory>synapse-${synapse.version}/lib/extensions</outputDirectory>
+ <includes>
+ <include>synapse-extensions-${synapse.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release/docs</directory>
+
<outputDirectory>synapse-${synapse.version}/lib/endorsed</outputDirectory>
+ <includes>
+ <include>endorsed_libs.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
- <!--<unpack>false</unpack>-->
- <!--<excludes>-->
- <!--<exclude>org.apache.synapse</exclude>-->
- <!--</excludes>-->
- <!--<scope>runtime</scope>-->
+ <excludes>
+ <exclude>axis2:addressing:mar</exclude>
+ <exclude>axis2:rampart:mar</exclude>
+ <exclude>sandesha2:sandesha2:mar</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+
<outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
+ <includes>
+ <include>axis2:addressing:mar</include>
+ <include>axis2:rampart:mar</include>
+ <!--<include>sandesha2:sandesha2:mar</include>-->
+ </includes>
+ </dependencySet>
+ <dependencySet>
+
<outputDirectory>synapse-${synapse.version}/samples/client_repo/modules</outputDirectory>
+ <includes>
+ <include>axis2:addressing:mar</include>
+ <!--<include>axis2:rampart:mar</include>-->
+ <!--<include>sandesha2:sandesha2:mar</include>-->
+ </includes>
</dependencySet>
</dependencySets>
- <!--<dependencySets>-->
- <!--<dependencySet>-->
- <!--<outputDirectory>/lib</outputDirectory>-->
- <!--</dependencySet>-->
- <!--</dependencySets>-->
</assembly>
Modified: incubator/synapse/branches/MVN2/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/src/main/assembly/src.xml?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
--- incubator/synapse/branches/MVN2/src/main/assembly/src.xml (original)
+++ incubator/synapse/branches/MVN2/src/main/assembly/src.xml Thu Nov 16
03:04:14 2006
@@ -29,7 +29,7 @@
<fileSets>
<fileSet>
<directory>src/main/release</directory>
- <outputDirectory>synapse-${synapse.version}</outputDirectory>
+ <outputDirectory>synapse-${synapse.version}-src</outputDirectory>
<includes>
<include>DISCLAIMER.txt</include>
<include>LICENSE.txt</include>
@@ -40,10 +40,10 @@
</includes>
</fileSet>
<fileSet>
- <directory>..</directory>
+ <directory>.</directory>
<outputDirectory>synapse-${synapse.version}-src</outputDirectory>
<includes>
- <include>**/*</include>
+ <include>modules/**/*</include>
</includes>
<excludes>
<exclude>build.xml</exclude>
@@ -64,6 +64,7 @@
<exclude>bin/*</exclude>
<exclude>**/var/journal</exclude>
<exclude>**/build.out*</exclude>
+ <exclude>**/*.iml</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: incubator/synapse/branches/MVN2/src/main/bin/synapse.bat
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/src/main/bin/synapse.bat?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
--- incubator/synapse/branches/MVN2/src/main/bin/synapse.bat (original)
+++ incubator/synapse/branches/MVN2/src/main/bin/synapse.bat Thu Nov 16
03:04:14 2006
@@ -52,7 +52,7 @@
:synapseSample
shift
-set
_SYNAPSE_XML=-Dsynapse.xml="%SYNAPSE_HOME%\synapse_repository\conf\sample\synapse_sample_%1.xml"
+set
_SYNAPSE_XML=-Dsynapse.xml="%SYNAPSE_HOME%\repository\conf\sample\synapse_sample_%1.xml"
shift
goto setupArgs
@@ -76,7 +76,7 @@
goto runSynapse
:defaultParams
-set SYNAPSE_CMD_LINE_ARGS=-p8080 "%SYNAPSE_HOME%\synapse_repository"
+set SYNAPSE_CMD_LINE_ARGS="%SYNAPSE_HOME%\repository"
goto runSynapse
:noJavaHome
@@ -90,13 +90,13 @@
set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%\conf";%SYNAPSE_CLASS_PATH%
rem if a sample configuration is not specified, use default
-if "%_SYNAPSE_XML%" == "" set
_SYNAPSE_XML=-Dsynapse.xml="%SYNAPSE_HOME%\synapse_repository\conf\synapse.xml"
+if "%_SYNAPSE_XML%" == "" set
_SYNAPSE_XML=-Dsynapse.xml="%SYNAPSE_HOME%\repository\conf\synapse.xml"
set
SYNAPSE_ENDORSED="%SYNAPSE_HOME%\lib\endorsed";"%JAVA_ENDORSED_DIRS%";"%JAVA_HOME%\lib\endorsed"
@echo on
cd %SYNAPSE_HOME%
-"%_JAVACMD%" %_SYNAPSE_XML%
-Daxis2.xml="%SYNAPSE_HOME%\synapse_repository\conf\axis2.xml"
-Djava.endorsed.dirs=%SYNAPSE_ENDORSED% -cp %SYNAPSE_CLASS_PATH%
org.apache.synapse.SynapseHTTPServer %SYNAPSE_CMD_LINE_ARGS%
+"%_JAVACMD%" %_SYNAPSE_XML%
-Daxis2.xml="%SYNAPSE_HOME%\repository\conf\axis2.xml"
-Djava.endorsed.dirs=%SYNAPSE_ENDORSED% -cp %SYNAPSE_CLASS_PATH%
org.apache.synapse.SynapseHTTPServer %SYNAPSE_CMD_LINE_ARGS%
goto end
:end
Modified: incubator/synapse/branches/MVN2/src/main/bin/synapse.sh
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/src/main/bin/synapse.sh?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
--- incubator/synapse/branches/MVN2/src/main/bin/synapse.sh (original)
+++ incubator/synapse/branches/MVN2/src/main/bin/synapse.sh Thu Nov 16 03:04:14
2006
@@ -85,10 +85,10 @@
SYNAPSE_ENDORSED=$JAVA_HOME/lib/endorsed
# synapse.xml
-SYNAPSE_XML=-Dsynapse.xml=$SYNAPSE_HOME/synapse_repository/conf/synapse.xml
+SYNAPSE_XML=-Dsynapse.xml=$SYNAPSE_HOME/repository/conf/synapse.xml
if [ "$1" == "-sample" ]; then
-SYNAPSE_XML=-Dsynapse.xml=$SYNAPSE_HOME/synapse_repository/conf/sample/synapse_sample_$2.xml
+SYNAPSE_XML=-Dsynapse.xml=$SYNAPSE_HOME/repository/conf/sample/synapse_sample_$2.xml
fi
# ----- Execute The Requested Command -----------------------------------------
@@ -99,4 +99,4 @@
echo "Using JAVA_HOME: $JAVA_HOME"
echo "Using SYNAPSE_XML: $SYNAPSE_XML"
-$JAVA_HOME/bin/java $SYNAPSE_XML
-Daxis2.xml=$SYNAPSE_HOME/synapse_repository/conf/axis2.xml
-Djava.endorsed.dirs=$SYNAPSE_ENDORSED -classpath $SYNAPSE_CLASSPATH
org.apache.synapse.SynapseHTTPServer $SYNAPSE_HOME/synapse_repository -p8080
+$JAVA_HOME/bin/java $SYNAPSE_XML
-Daxis2.xml=$SYNAPSE_HOME/repository/conf/axis2.xml
-Djava.endorsed.dirs=$SYNAPSE_ENDORSED -classpath $SYNAPSE_CLASSPATH
org.apache.synapse.SynapseHTTPServer $SYNAPSE_HOME/repository
Added: incubator/synapse/branches/MVN2/src/main/release/docs/endorsed_libs.txt
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/src/main/release/docs/endorsed_libs.txt?view=auto&rev=475681
==============================================================================
--- incubator/synapse/branches/MVN2/src/main/release/docs/endorsed_libs.txt
(added)
+++ incubator/synapse/branches/MVN2/src/main/release/docs/endorsed_libs.txt Thu
Nov 16 03:04:14 2006
@@ -0,0 +1,3 @@
+Place libraries which should be placed in endorsed directories here.
+
+e.g. Xerces and its dependencies (xercesImpl.jar and xml-apis.jar)
\ No newline at end of file
Modified: incubator/synapse/branches/MVN2/src/site/site.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/branches/MVN2/src/site/site.xml?view=diff&rev=475681&r1=475680&r2=475681
==============================================================================
--- incubator/synapse/branches/MVN2/src/site/site.xml (original)
+++ incubator/synapse/branches/MVN2/src/site/site.xml Thu Nov 16 03:04:14 2006
@@ -6,10 +6,11 @@
<href>incubator.apache.org/synapse/</href>
</bannerLeft>
- <!--<skin>-->
- <!--<groupId>org.apache.maven.skins</groupId>-->
- <!--<artifactId>maven-default-skin</artifactId>-->
- <!--</skin>-->
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-default-skin</artifactId>
+ <version>1.0</version>
+ </skin>
<publishDate format="dd MMM yyyy"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
