leosutic 2003/08/10 15:21:59
Modified: attributes project.xml
attributes/site project.xml
attributes/api/src/test/org/apache/avalon/attributes/test
Sample.java
Log:
1. Moved all build stuff into Maven.
2. Wrote a proper test case.
3. Included support for attributes attached to fields and constructors.
4. Slight code cleanups.
Revision Changes Path
1.2 +138 -138 avalon-sandbox/attributes/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/attributes/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Aug 2003 13:45:20 -0000 1.1
+++ project.xml 10 Aug 2003 22:21:59 -0000 1.2
@@ -1,142 +1,142 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
-
- <pomVersion>3</pomVersion>
- <groupId>avalon-attributes</groupId>
- <name>Avalon Attributes</name>
-
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://avalon.apache.org/</url>
- <logo>http://avalon.apache.org/images/apache-avalon-logo.png</logo>
- </organization>
-
- <inceptionYear>2003</inceptionYear>
-
- <package></package>
- <gumpRepositoryId>avalon-sandbox</gumpRepositoryId>
-
- <url>http://avalon.apache.org/sandbox/attributes/index.html</url>
- <issueTrackingUrl>http://nagoya.apache.org/</issueTrackingUrl>
-
- <siteAddress>avalon.apache.org</siteAddress>
- <siteDirectory>${root.site.directory}/attributes</siteDirectory>
- <distributionDirectory></distributionDirectory>
-
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:avalon-sandbox/attributes</connection>
- <url>http://cvs.apache.org/viewcvs/avalon-sandbox/attributes/</url>
- </repository>
-
- <mailingLists>
- <mailingList>
- <name>Avalon Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
- </mailingList>
- <mailingList>
- <name>Avalon User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- <name>Leo Sutic</name>
- <id>leosutic</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Inspire Infrastructure</organization>
- <roles>
- <role>All of them.</role>
- </roles>
- </developer>
- </developers>
-
- <contributors>
- </contributors>
-
- <build>
-
- <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <integrationUnitTestSourceDirectory/>
- <aspectSourceDirectory/>
-
- <unitTest>
- <includes>
- <include>**/*TestCase*</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*</exclude>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.dtd</include>
- <include>**/*.properties</include>
- <include>**/*.xinfo</include>
- <include>**/*.xtype</include>
- <include>**/*.xprofile</include>
- <include>**/*.xconfig</include>
- <include>**/*.xml</include>
- <include>**/*.xservice</include>
- <include>**/*.mf</include>
- <include>**/*.jar</include>
- </includes>
- </resource>
- <resource>
- <directory>${maven.conf.dir}</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/test/conf</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <integrationUnitTestPatterns></integrationUnitTestPatterns>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <includes>
- <include>**/*.dtd</include>
- <include>**/*.properties</include>
- <include>**/*.xinfo</include>
- <include>**/*.xtype</include>
- <include>**/*.xprofile</include>
- <include>**/*.xconfig</include>
- <include>**/*.xml</include>
- <include>**/*.xservice</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../</directory>
- <includes>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>${maven.conf.dir}</directory>
- <targetPath>BLOCK-INF</targetPath>
- <includes>
- <include>block.xml</include>
- </includes>
- </resource>
- </resources>
-
- <jars></jars>
- </build>
-
+
+ <pomVersion>3</pomVersion>
+ <groupId>avalon-attributes</groupId>
+ <name>Avalon Attributes</name>
+
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://avalon.apache.org/</url>
+ <logo>http://avalon.apache.org/images/apache-avalon-logo.png</logo>
+ </organization>
+
+ <inceptionYear>2003</inceptionYear>
+
+ <package></package>
+ <gumpRepositoryId>avalon-sandbox</gumpRepositoryId>
+
+ <url>http://avalon.apache.org/sandbox/attributes/index.html</url>
+ <issueTrackingUrl>http://nagoya.apache.org/</issueTrackingUrl>
+
+ <siteAddress>avalon.apache.org</siteAddress>
+ <siteDirectory>${root.site.directory}/attributes</siteDirectory>
+ <distributionDirectory></distributionDirectory>
+
+ <repository>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:avalon-sandbox/attributes</connection>
+ <url>http://cvs.apache.org/viewcvs/avalon-sandbox/attributes/</url>
+ </repository>
+
+ <mailingLists>
+ <mailingList>
+ <name>Avalon Developer List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
+ </mailingList>
+ <mailingList>
+ <name>Avalon User List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
+ </mailingList>
+ </mailingLists>
+
+ <developers>
+ <developer>
+ <name>Leo Sutic</name>
+ <id>leosutic</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Inspire Infrastructure</organization>
+ <roles>
+ <role>All of them.</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ </contributors>
+
+ <build>
+
+ <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <integrationUnitTestSourceDirectory/>
+ <aspectSourceDirectory/>
+
+ <unitTest>
+ <includes>
+ <include>**/*TestCase*</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*</exclude>
+ </excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.xinfo</include>
+ <include>**/*.xtype</include>
+ <include>**/*.xprofile</include>
+ <include>**/*.xconfig</include>
+ <include>**/*.xml</include>
+ <include>**/*.xservice</include>
+ <include>**/*.mf</include>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/test/conf</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <integrationUnitTestPatterns></integrationUnitTestPatterns>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.xinfo</include>
+ <include>**/*.xtype</include>
+ <include>**/*.xprofile</include>
+ <include>**/*.xconfig</include>
+ <include>**/*.xml</include>
+ <include>**/*.xservice</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <targetPath>BLOCK-INF</targetPath>
+ <includes>
+ <include>block.xml</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <jars></jars>
+ </build>
+
</project>
1.2 +41 -41 avalon-sandbox/attributes/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/attributes/site/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Aug 2003 13:46:08 -0000 1.1
+++ project.xml 10 Aug 2003 22:21:59 -0000 1.2
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
- <extend>${basedir}/../project.xml</extend>
- <package>org.apache.avalon.meta</package>
-
- <dependencies>
-
- <!-- avalon dependecies -->
-
+ <extend>${basedir}/../project.xml</extend>
+ <package>org.apache.avalon.meta</package>
+
+ <dependencies>
+
+ <!-- avalon dependecies -->
+
+ <dependency>
+ <id>ant</id>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <id>qdox</id>
+ <version>1.1</version>
+ </dependency>
+
+ <!-- pre JDK 1.4 dependencies -->
+
+ <dependency>
+ <id>xml-apis</id>
+ <version>1.0.b2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
+ </dependency>
+ <dependency>
+ <id>xerces</id>
+ <version>2.2.1</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
+ </dependency>
+
+ </dependencies>
+
+
+ <packageGroups>
+ </packageGroups>
+
+ <reports>
+ <report>maven-changelog-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-changelog-plugin</report>
+ </reports>
- <dependency>
- <id>ant</id>
- <version>1.5</version>
- </dependency>
- <dependency>
- <id>qdox</id>
- <version>1.1</version>
- </dependency>
-
- <!-- pre JDK 1.4 dependencies -->
-
- <dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
- <dependency>
- <id>xerces</id>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/</url>
- </dependency>
-
- </dependencies>
-
-
- <packageGroups>
- </packageGroups>
-
- <reports>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- </reports>
-
</project>
1.3 +4 -14
avalon-sandbox/attributes/api/src/test/org/apache/avalon/attributes/test/Sample.java
Index: Sample.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/attributes/api/src/test/org/apache/avalon/attributes/test/Sample.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Sample.java 10 Aug 2003 15:05:24 -0000 1.2
+++ Sample.java 10 Aug 2003 22:21:59 -0000 1.3
@@ -10,21 +10,8 @@
* @ThreadSafe ()
*/
public Object field;
-
- /**
- * @Dependency ( SampleService.class, "sample-ctor1" )
- */
- public Sample () {
-
- }
-
- /**
- * @Dependency ( SampleService.class, "sample-ctor2" )
- */
- public Sample (String input, String[][] array) {
-
- }
+ public Object noAttributesInSubClass;
/**
* @Dependency ( SampleService.class, "sample-some-method1" )
@@ -38,5 +25,8 @@
*/
public void someMethod (int parameter) {
+ }
+
+ public void methodWithNoAttributes () {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
