incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: incubator-altrmi/server/api/src/java/org/apache/altrmi/server AttributeHelper.java
Date Sun, 06 Jun 2004 23:03:06 GMT
hammant     2004/06/06 16:03:06

  Modified:    integrationtests maven.xml project.properties project.xml
               integrationtests/src/test/org/apache/altrmi/test/async
                        AsyncTest.java
               server/api project.properties project.xml
               server/api/src/java/org/apache/altrmi/server
                        AttributeHelper.java
  Log:
  Start of upgreade to commons-attribute 2.0alpha
  
  Revision  Changes    Path
  1.2       +8 -5      incubator-altrmi/integrationtests/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/integrationtests/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	28 Aug 2003 18:25:55 -0000	1.1
  +++ maven.xml	6 Jun 2004 23:03:06 -0000	1.2
  @@ -37,14 +37,17 @@
   
   
   		<!-- /** Generate ASync attributes for test cases*/ -->
  -		<ant:taskdef name="attributes" classname="org.apache.commons.attributes.task.AttributesCompiler">
  -            <ant:classpath>
  +		<ant:taskdef name="attribute-compiler" classname="org.apache.commons.attributes.compiler.AttributeCompiler">
  +			<ant:classpath>
   				<ant:path refid="maven.dependency.classpath"/>
  -				<ant:pathelement location="${plugin.getDependencyPath('commons-attributes')}"/>
  +				<ant:pathelement location="${plugin.getDependencyPath('commons-attributes-compiler')}"/>
  +				<ant:pathelement location="${plugin.getDependencyPath('commons-attributes-api')}"/>
   			</ant:classpath>
  -        </ant:taskdef>
  +		</ant:taskdef>
   		<!-- TODO: Remove hardcoded test src dir (vinay) -->
  -        <ant:attributes src="${maven.src.dir}/test/" dest="${maven.build.dir}/test-classes"/>
  +		<ant:attribute-compiler destDir="${maven.build.dir}/test-classes">
  +			<ant:fileset dir="${maven.src.dir}/test/" includes="*.java"/>
  +		</ant:attribute-compiler>
   
   
   
  
  
  
  1.4       +2 -1      incubator-altrmi/integrationtests/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/integrationtests/project.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.properties	27 May 2004 23:33:30 -0000	1.3
  +++ project.properties	6 Jun 2004 23:03:06 -0000	1.4
  @@ -1,6 +1,7 @@
   #Jar override
   maven.jar.override=on
  -maven.jar.commons-attributes=${basedir}/../lib/commons-attributes-0.1.jar
  +maven.jar.commons-attributes-api=${basedir}/../lib/commons-attributes-api-2.0alpha.jar
  +maven.jar.commons-attributes-compiler=${basedir}/../lib/commons-attributes-compiler-2.0alpha.jar
   maven.jar.tools=${java.home}/../lib/tools.jar
   
   #JUnit Properties
  
  
  
  1.3       +6 -2      incubator-altrmi/integrationtests/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/integrationtests/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	27 May 2004 23:33:30 -0000	1.2
  +++ project.xml	6 Jun 2004 23:03:06 -0000	1.3
  @@ -50,8 +50,12 @@
   		<version>3.8.1</version>
   	</dependency>
   	<dependency>
  -		<id>commons-attributes</id>
  -		<version>0.1</version>
  +		<id>commons-attributes-api</id>
  +		<version>2.0alpha</version>
  +	</dependency>
  +	<dependency>
  +		<id>commons-attributes-compiler</id>
  +		<version>2.0alpha</version>
   	</dependency>
   	<dependency>
   		<id>qdox</id>
  
  
  
  1.3       +5 -5      incubator-altrmi/integrationtests/src/test/org/apache/altrmi/test/async/AsyncTest.java
  
  Index: AsyncTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/integrationtests/src/test/org/apache/altrmi/test/async/AsyncTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AsyncTest.java	8 Feb 2004 06:06:45 -0000	1.2
  +++ AsyncTest.java	6 Jun 2004 23:03:06 -0000	1.3
  @@ -23,27 +23,27 @@
   {
   
       /**
  -     * @altrmi:method async
  +     * @altrmi:method:async
        */
       void setOne(String one);
   
       /**
  -     * @altrmi:method async
  +     * @altrmi:method:async
        */
       void setTwo(String two);
   
       /**
  -     * @altrmi:method async
  +     * @altrmi:method:async
        */
       void setThree(String three);
   
       /**
  -     * @altrmi:method commit
  +     * @altrmi:method:commit
        */
       void fire();
   
       /**
  -     * @altrmi:method rollback
  +     * @altrmi:method:rollback
        */
       void whoa();
   
  
  
  
  1.2       +1 -1      incubator-altrmi/server/api/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/server/api/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	28 Aug 2003 18:29:06 -0000	1.1
  +++ project.properties	6 Jun 2004 23:03:06 -0000	1.2
  @@ -1,2 +1,2 @@
   maven.jar.override=on
  -maven.jar.commons-attributes=${basedir}/../../lib/commons-attributes-0.1.jar
  \ No newline at end of file
  +maven.jar.commons-attributes-api=${basedir}/../../lib/commons-attributes-api-2.0alpha.jar
  \ No newline at end of file
  
  
  
  1.2       +2 -2      incubator-altrmi/server/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/server/api/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	28 Aug 2003 18:29:06 -0000	1.1
  +++ project.xml	6 Jun 2004 23:03:06 -0000	1.2
  @@ -21,8 +21,8 @@
   		<version>${pom.currentVersion}</version>
   	</dependency>
   	<dependency>
  -		<id>commons-attributes</id>
  -		<version>0.1</version>
  +		<id>commons-attributes-api</id>
  +		<version>2.0alpha</version>
   	</dependency>
     </dependencies>
     
  
  
  
  1.3       +3 -8      incubator-altrmi/server/api/src/java/org/apache/altrmi/server/AttributeHelper.java
  
  Index: AttributeHelper.java
  ===================================================================
  RCS file: /home/cvs/incubator-altrmi/server/api/src/java/org/apache/altrmi/server/AttributeHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AttributeHelper.java	8 Feb 2004 06:06:46 -0000	1.2
  +++ AttributeHelper.java	6 Jun 2004 23:03:06 -0000	1.3
  @@ -17,7 +17,6 @@
   package org.apache.altrmi.server;
   
   import org.apache.commons.attributes.Attributes;
  -import org.apache.commons.attributes.Attribute;
   
   import java.lang.reflect.Method;
   
  @@ -25,21 +24,17 @@
   
       protected boolean isMethodAsync(Method method)
       {
  -        Attribute attr = Attributes.getAttribute(method, "altrmi:method");
  -        return (attr == null ? false : attr.getValue().equals("async"));
  +        return Attributes.hasAttribute(method, "altrmi:method:async");
       }
   
       protected boolean isMethodAsyncCommit(Method method)
       {
  -        Attribute attr = Attributes.getAttribute(method, "altrmi:method");
  -        return (attr == null ? false :attr.getValue().equals("commit"));
  +        return Attributes.hasAttribute(method, "altrmi:method:commit");
       }
   
       protected boolean isMethodAsyncRollback(Method method)
       {
  -        Attribute attr = Attributes.getAttribute(method, "altrmi:method");
  -        return (attr == null ? false : attr.getValue().equals("rollback"));
  +        return Attributes.hasAttribute(method, "altrmi:method:rollback");
       }
  -
   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message