Author: chamikara
Date: Thu Aug 25 06:11:15 2005
New Revision: 240067

URL: http://svn.apache.org/viewcvs?rev=240067&view=rev
Log:
Added maven.xml and project.xml

Added:
    webservices/sandesha/trunk/maven.xml
    webservices/sandesha/trunk/project.xml
Modified:
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java

Added: webservices/sandesha/trunk/maven.xml
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/maven.xml?rev=240067&view=auto
==============================================================================
--- webservices/sandesha/trunk/maven.xml (added)
+++ webservices/sandesha/trunk/maven.xml Thu Aug 25 06:11:15 2005
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven" 
xmlns:deploy="deploy" xmlns:ant="jelly:ant">
+    <j:set var="dist.name" value="${pom.artifactId}-${pom.currentVersion}"/>
+    <j:set var="dist.dir" value="target/dist"/>
+
+    <goal name="module.jar" prereqs="java:compile">
+        <ant:property name="module.jar.name" value="sandesha.jar"/>
+        <ant:copy file="src/META-INF/module.xml" 
todir="${maven.build.dir}/classes/META-INF"/>
+        <ant:mkdir dir="${basedir}/target/dist"/>
+        <ant:jar jarfile="${basedir}/target/dist/${module.jar.name}" 
basedir="${maven.build.dir}/classes"/>
+    </goal>
+
+    <goal name="sample:compile">
+        <ant:property name="dir.samples" value="samples"/>
+        <ant:mkdir dir="${basedir}/target/classes/samples"/>
+        <ant:javac srcdir="${dir.samples}" 
destdir="${basedir}/target/classes/samples" debug="on">
+            <ant:classpath refid="maven.dependency.classpath"/>
+        </ant:javac>
+    </goal>
+
+    <goal name="service.jar" prereqs="sample:compile">
+        <ant:property name="dir.samples" value="samples"/>
+        <ant:property name="service.jar.name" value="echo.jar"/>
+        <ant:copy file="${dir.samples}/META-INF/service.xml" 
todir="${basedir}/target/classes/samples/META-INF"/>
+        <ant:mkdir dir="${basedir}/target/dist"/>
+        <ant:jar jarfile="${basedir}/target/dist/${service.jar.name}" 
basedir="${maven.build.dir}/classes/samples"/>
+    </goal>
+
+    <goal name="jar.copy" prereqs="module.jar,service.jar">
+        <property environment="env1"/>
+        <property name="webapps" value="${env1.CATALINA_HOME}/webapps"/>
+        <ant:copy file="${basedir}/target/dist/sandesha.jar" 
todir="${webapps}/axis2/WEB-INF/modules"/>
+        <ant:copy file="${basedir}/target/dist/echo.jar" 
todir="${webapps}/axis2/WEB-INF/services"/>
+    </goal>
+
+    <!--    <preGoal name="java:compile">-->
+    <!--        <copy file="config/sandesha.properties" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/log4j.properties" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/commons-logging.properties" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/WSRMPolicy.xml" 
todir="${maven.build.dir}/classes"/>-->
+    <!--    </preGoal>-->
+
+    <!--    <postGoal name="java:compile">-->
+    <!--        <ant:property name="dir.samples" value="samples"/>-->
+    <!--        <ant:javac srcdir="${dir.samples}" 
destdir="${basedir}/target/classes" debug="on">-->
+    <!--            <ant:classpath refid="maven.dependency.classpath"/>-->
+    <!--        </ant:javac>-->
+    <!--    </postGoal>-->
+
+    <!--    <postGoal name="jar">-->
+    <!--        <ant:mkdir dir="${basedir}/target/lib"/>-->
+    <!--        <deploy:copy-deps todir="${basedir}/target/lib"/>-->
+    <!--        <copy file="lib/xerces.jar" todir="${basedir}/target/lib"/>-->
+    <!--    </postGoal>-->
+
+    <!--    <preGoal name="interop.jar">-->
+    <!--        <copy file="config/sandesha.properties" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/client-config.wsdd" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/server-config.wsdd" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/log4j.properties" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/commons-logging.properties" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <copy file="config/WSRMPolicy.xml" 
todir="${maven.build.dir}/classes"/>-->
+    <!--        <ant:javac srcdir="interop" 
destdir="${maven.build.dir}/classes" includes="**/*.java" 
debug="${maven.compile.debug}" optimize="${optimize}" 
deprecation="${maven.compile.deprecation}">-->
+    <!--            <classpath>-->
+    <!--                <pathelement location="${maven.build.dest}"/>-->
+    <!--                <path refid="maven.dependency.classpath"/>-->
+    <!--            </classpath>-->
+    <!--        </ant:javac>-->
+    <!--    </preGoal>-->
+
+    <!-- to transforme htmls to xdocs -->
+    <preGoal name="xdoc:jelly-transform">
+        <attainGoal name="html2xdoc"/>
+    </preGoal>
+
+    <!--    <goal name="interop.jar" prereqs="java:compile">-->
+    <!--        <ant:property name="sandesha.jar.name" 
value="Sandesha-interop.jar"/>-->
+    <!--        <ant:mkdir dir="${basedir}/dist/jar"/>-->
+    <!--        <ant:jar basedir="${maven.build.dir}/classes" 
destfile="${sandesha.jar.name}"/>-->
+    <!--    </goal>-->
+
+    <!-- ================================================================ -->
+    <!--- Create the Java Docs -->
+    <!-- ================================================================ -->
+
+    <!--    <goal name="javadoc-gen">-->
+    <!--        <ant:javadoc packagenames="org.apache.sandesha.*" 
defaultexcludes="yes" destdir="target/apidocs" author="true" version="true" 
use="true" windowtitle="Sandesha API">-->
+    <!--            <ant:sourcepath>-->
+    <!--                <ant:pathelement location="src"/>-->
+    <!--            </ant:sourcepath>-->
+    <!--        </ant:javadoc>-->
+    <!--    </goal>-->
+
+    <goal name="clean">
+        <delete dir="target"/>
+        <ant:delete>
+            <ant:fileset dir=".">
+                <ant:include name="**/axis.log"/>
+                <ant:include name="**/junit*.properties"/>
+                <ant:include name="**/temp.properties"/>
+            </ant:fileset>
+        </ant:delete>
+    </goal>
+
+    <!-- ================================================================ -->
+    <!--- Create the Binary Distribution -->
+    <!-- ================================================================ -->
+
+    <!--    <goal name="dist-bin" 
prereqs="clean,java:compile,javadoc-gen,jar">-->
+    <!--        <property name="bin.dist.dir" 
value="target/dist-bin/Sandesha-${pom.currentVersion}-bin"/>-->
+    <!--        <ant:mkdir dir="${bin.dist.dir}"/>-->
+    <!--        <ant:mkdir dir="${bin.dist.dir}/docs"/>-->
+    <!--        <ant:mkdir dir="${bin.dist.dir}/lib"/>-->
+    <!--        <ant:mkdir dir="${bin.dist.dir}/samples"/>-->
+    <!--        <ant:mkdir dir="${bin.dist.dir}/docs/api"/>-->
+    <!---->
+    <!--        <ant:copy todir="${bin.dist.dir}/docs/api">-->
+    <!--            <ant:fileset dir="target/apidocs/">-->
+    <!--                <ant:include name="**"/>-->
+    <!--            </ant:fileset>-->
+    <!--        </ant:copy>-->
+    <!---->
+    <!--        <ant:copy todir="${bin.dist.dir}/docs">-->
+    <!--            <ant:fileset dir="xdocs">-->
+    <!--                <ant:include name="**"/>-->
+    <!--            </ant:fileset>-->
+    <!--        </ant:copy>-->
+    <!---->
+    <!--        <ant:copy todir="${bin.dist.dir}/lib" flatten="true">-->
+    <!--            <ant:fileset dir="target/lib">-->
+    <!--                <ant:include name="*.jar"/>-->
+    <!--            </ant:fileset>-->
+    <!--        </ant:copy>-->
+    <!---->
+    <!--        <ant:copy file="target/Sandesha-${pom.currentVersion}.jar" 
todir="${bin.dist.dir}"/>-->
+    <!---->
+    <!--        <ant:copy todir="${bin.dist.dir}/samples">-->
+    <!--            <ant:fileset dir="samples">-->
+    <!--                <ant:include name="*.xml"/>-->
+    <!--                <ant:include name="*.wsdd"/>-->
+    <!--                <ant:include name="*.properties"/>-->
+    <!--            </ant:fileset>-->
+    <!--        </ant:copy>-->
+    <!---->
+    <!--        <ant:copy todir="${bin.dist.dir}/samples">-->
+    <!--            <ant:fileset dir="samples"/>-->
+    <!--        </ant:copy>-->
+    <!---->
+    <!--        <ant:copy todir="${bin.dist.dir}/">-->
+    <!--            <ant:fileset dir=".">-->
+    <!--                <ant:include name="*.html"/>-->
+    <!--                <ant:include name="*.txt"/>-->
+    <!--            </ant:fileset>-->
+    <!--         </ant:copy>-->
+    <!---->
+    <!--        <mkdir dir="target/dist"/>-->
+    <!---->
+    <!--        <ant:zip file="${dist.dir}/${dist.name}-bin.zip" 
basedir="target/dist-bin"/>-->
+    <!--        <ant:tar tarfile="target/${dist.name}-bin.tar" 
basedir="target/dist-bin"/>-->
+    <!--        <gzip src="target/${dist.name}-bin.tar" 
zipfile="${dist.dir}/${dist.name}-bin.tar.gz"/>-->
+    <!--        <ant:delete dir="target/dist-bin"/>-->
+    <!--        <ant:delete file="target/${dist.name}-bin.tar"/>-->
+    <!--    </goal>-->
+
+
+    <!-- ================================================================ -->
+    <!--- Create the Source Distribution -->
+    <!-- ================================================================ -->
+
+    <!--    <goal name="dist-src">-->
+    <!--        <mkdir dir="target/dist"/>-->
+    <!--        <ant:zip file="${dist.dir}/${dist.name}-src.zip">-->
+    <!--            <ant:fileset dir=".">-->
+    <!--                <ant:include name="**"/>-->
+    <!--                <ant:exclude name="**/target/**"/>-->
+    <!--                <ant:exclude name="**/.cvs/**"/>-->
+    <!--                <ant:exclude name="**/bin/**"/>-->
+    <!--                <ant:exclude name=".*"/>-->
+    <!--                <ant:exclude name="**/*.license"/>-->
+    <!--            </ant:fileset>-->
+    <!--        </ant:zip>-->
+    <!--        <ant:tar tarfile="target/${dist.name}-src.tar" 
longfile="gnu">-->
+    <!--            <ant:tarfileset dir=".">-->
+    <!--                <ant:include name="**"/>-->
+    <!--                <ant:exclude name="**/target/**"/>-->
+    <!--                <ant:exclude name="**/.cvs/**"/>-->
+    <!--                <ant:exclude name="**/bin/**"/>-->
+    <!--                <ant:exclude name=".*"/>-->
+    <!--                <ant:exclude name="**/*.license"/>-->
+    <!--            </ant:tarfileset>-->
+    <!--        </ant:tar>-->
+    <!--        <gzip src="target/${dist.name}-src.tar" 
zipfile="${dist.dir}/${dist.name}-src.tar.gz"/>-->
+    <!--        <ant:delete file="target/${dist.name}-src.tar"/>-->
+    <!--    </goal>-->
+
+
+</project>

Added: webservices/sandesha/trunk/project.xml
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.xml?rev=240067&view=auto
==============================================================================
--- webservices/sandesha/trunk/project.xml (added)
+++ webservices/sandesha/trunk/project.xml Thu Aug 25 06:11:15 2005
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<project>

+    <!-- the version of maven's project object model -->

+    <pomVersion>3</pomVersion>

+

+    <!-- a unique name for this project -->

+    <id>Sandesha2</id>

+

+    <!-- a short but descriptive name for the project -->

+    <name>Apache Sandesha2</name>

+

+    <!-- The version of the project under development, e.g.

+           1.1, 1.2, 2.0-SNAPSHOT -->

+    <currentVersion>beta</currentVersion>

+

+    <!-- details about the organization that 'owns' the project -->

+    <organization>

+        <name>Apache Web Services</name>

+        <url>http://ws.apache.org/</url>

+        <logo>http://www.apache.org/images/asf-logo.gif</logo>

+    </organization>

+

+    <!-- the year the project started -->

+    <inceptionYear>2005</inceptionYear>

+

+    <package>org.apache.sandesha</package>

+

+    <logo>http://ws.apache.org/ws-fx/sandesha/images/Sandesha.jpg</logo>

+    <description>Apache Sandesha2 is an implementation of the Web Services 
ReliableMessaging (WS-ReliableMessaging), published by the IBM, Microsoft, BEA 
and TIBCO Software as a joint specification, on top of Apache Axis2. Apache 
Sandesha provides; An implementation for WS-ReliableMessaging with the support 
to WS-Policy and WS- Addressing. Interoperability with other 
WS-ReliableMessaging implementations.   Sandesha provides a complete support 
for WS-ReliableMessaging  specification allowing a reliable communication 
between web services as well as web services and clients. It also provides the 
INORDER message delivery assurance for the users.

+    </description>

+    <!-- a short description of what the project does -->

+    <shortDescription>WS-ReliableMessaging implementation for Apache 
Axis2</shortDescription>

+

+    <!-- the project home page -->

+    <url>http://ws.apache.org/ws-fx/sandesha/</url>

+

+    
<issueTrackingUrl>http://nagoya.apache.org/jira/browse/WSFX</issueTrackingUrl>

+    <siteAddress>ws.apache.org</siteAddress>

+

+    <siteDirectory>/ws-fx/sandesha/</siteDirectory>

+

+    <distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>

+

+    <!-- the version control repository and http url for online access

+           the connection element has the form:

+           scm:<system>:<system specific connection string> -->

+    <repository>

+        <connection>scm:cvs:pserver:[EMAIL 
PROTECTED]:/home/cvspublic:ws-fx/sandesha/</connection>

+        <url>http://cvs.apache.org/viewcvs.cgi/ws-fx/sandesha/</url>

+    </repository>

+

+    <!-- any mailing lists for the project -->

+    <mailingLists>

+        <mailingList>

+            <name>WS-FX Developer List</name>

+            <subscribe>[EMAIL PROTECTED]</subscribe>

+            <unsubscribe>[EMAIL PROTECTED]</unsubscribe>

+            
<archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listId=221</archive>

+        </mailingList>

+    </mailingLists>

+

+    <!-- who the developers are for the project -->

+    <developers>

+

+        <developer>

+            <name>Sanjiva Weerawarana</name>

+            <id>sanjiva</id>

+            <email>[EMAIL PROTECTED]</email>

+            <organization>

+            </organization>

+        </developer>

+

+        <developer>

+            <name>Davanum Srinivas</name>

+            <id>dims</id>

+            <email>[EMAIL PROTECTED]</email>

+            <organization>

+            </organization>

+        </developer>

+

+        <developer>

+            <name>Jaliya Ekanayake</name>

+            <id>jaliya</id>

+            <email>[EMAIL PROTECTED]</email>

+            <organization>

+            </organization>

+        </developer>

+

+        <developer>

+            <name>Chamikara Jayalath</name>

+            <id>chamikara</id>

+            <email>[EMAIL PROTECTED]</email>

+            <organization>

+            </organization>

+        </developer>

+

+    </developers>

+

+    <licenses>

+        <license>

+            <name>The Apache Software License, Version 2.0</name>

+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>

+            <distribution>repo</distribution>

+        </license>

+    </licenses>

+

+    <!-- build information for the project -->

+    <build>

+        <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>

+        <sourceDirectory>src</sourceDirectory>

+        <unitTestSourceDirectory>test</unitTestSourceDirectory>

+

+<!--        <resources>-->

+<!--            <resource>-->

+<!--                <directory>${basedir}/config</directory>-->

+<!--                <includes>-->

+<!--                    <include>*.properties</include>-->

+<!--                    <include>*.wsdd</include>-->

+<!--                </includes>-->

+<!--            </resource>-->

+<!--        </resources>-->

+

+        <unitTest>

+            <includes>

+                <include>**/*TC*.java</include>

+                <include>**/*.wsdd</include>

+            </includes>

+            <excludes>

+                <!--       <exclude>**/*TCScenarioTest.java</exclude>-->

+                <!--                
<exclude>**/*TCServerStorageManager.java</exclude>-->

+            </excludes>

+            <resources>

+                <resource>

+                    <directory>test-resources</directory>

+                    <includes>

+                        <include>**/*.xml</include>

+                        <include>**/*.wsdd</include>

+                    </includes>

+                </resource>

+            </resources>

+

+        </unitTest>

+

+    </build>

+

+    <!-- ============ -->

+    <!-- Dependencies -->

+    <!-- ============ -->

+

+    <dependencies>

+        <dependency>

+            <groupId>commons-logging</groupId>

+            <artifactId>commons-logging</artifactId>

+            <version>1.0.3</version>

+        </dependency>

+

+        <dependency>

+               <groupId>axis</groupId>

+                <artifactId>axis-wsdl4j</artifactId>

+            <version>1.2</version>

+        </dependency>

+

+        <dependency>

+            <groupId>stax</groupId>

+            <artifactId>stax</artifactId>

+            <version>1.1.1-dev</version>

+            <url>http://dist.codehaus.org/stax/jars/</url>

+        </dependency>

+        <dependency>

+            <groupId>log4j</groupId>

+            <artifactId>log4j</artifactId>

+            <version>1.2.8</version>

+            <url>http://dist.codehaus.org/stax/jars/</url>

+        </dependency>

+

+           <dependency>

+            <groupId>axis</groupId>

+            <artifactId>axis2</artifactId>

+            <version>0.91</version>

+            </dependency>

+

+        <dependency>

+            <groupId>stax</groupId>

+            <artifactId>stax-api</artifactId>

+            <version>1.0</version>

+            <url>http://dist.codehaus.org/stax/jars/</url>

+        </dependency>

+        <dependency>

+            <groupId>geronimo-spec</groupId>

+            <artifactId>geronimo-spec-javamail</artifactId>

+            <version>1.3.1-rc3</version>

+        </dependency>

+        <dependency>

+            <groupId>geronimo-spec</groupId>

+            <artifactId>geronimo-spec-activation</artifactId>

+            <version>1.0.2-rc3</version>

+        </dependency>

+    </dependencies>

+

+

+    <!-- ======= -->

+    <!-- Reports -->

+    <!-- ======= -->

+    <!-- reports>

+       <report>maven-license-plugin</report>

+       <report>maven-checkstyle-plugin</report>

+       <report>maven-pmd-plugin</report>

+       <report>maven-jdepend-plugin</report>

+       <report>maven-changelog-plugin</report>

+

+       <report>maven-file-activity-plugin</report>

+

+       <report>maven-developer-activity-plugin</report>

+

+       <report>maven-jxr-plugin</report>

+

+       <report>maven-javadoc-plugin</report>

+

+       <report>maven-junit-report-plugin</report>

+

+       <report>maven-clover-plugin</report>

+    </reports -->

+</project>

+


Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java?rev=240067&r1=240066&r2=240067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java Thu 
Aug 25 06:11:15 2005
@@ -42,7 +42,7 @@
        }

        

        public Object fromSOAPEnvelope(SOAPEnvelope envelope) throws 
OMException {

-               acksTo = new AcksTo(new EndpointReference("",""));

+               acksTo = new AcksTo(new EndpointReference(""));

                acksTo.fromSOAPEnvelope(envelope);

                return this;

        }


Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java?rev=240067&r1=240066&r2=240067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java 
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java Thu 
Aug 25 06:11:15 2005
@@ -58,7 +58,7 @@
                                OMElement omElement = (OMElement)omNode;

                                if 
(omElement.getLocalName().equals(Constants.WSRM.ACKS_TO)){

                                        String uri = omElement.getText();

-                                       EPR = new EndpointReference("",uri);

+                                       EPR = new EndpointReference(uri);

                                        return true;

                                }else{

                                        readEPRElement(omElement);


Modified: 
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java
URL: 
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java?rev=240067&r1=240066&r2=240067&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java 
(original)
+++ 
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java 
Thu Aug 25 06:11:15 2005
@@ -48,7 +48,7 @@
 

        public Object fromSOAPEnvelope(SOAPEnvelope envelope) throws 
OMException {

                sequenceOffer = new SequenceOffer();

-               acksTo = new AcksTo(new EndpointReference("",""));

+               acksTo = new AcksTo(new EndpointReference(""));

                sequenceOffer.fromSOAPEnvelope(envelope);

                acksTo.fromSOAPEnvelope(envelope);              

                return this;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to